repo
string | commit
string | message
string | diff
string |
|---|---|---|---|
monde/mms2r
|
67f30fdb0b466b565d7458d492a1541c2c9b4b9c
|
md formatting
|
diff --git a/README.md b/README.md
index aa10f18..9979230 100644
--- a/README.md
+++ b/README.md
@@ -1,219 +1,227 @@
# mms2r
https://github.com/monde/mms2r
## DESCRIPTION
MMS2R by Mike Mondragon
-https://github.com/monde/mms2r
-https://rubygems.org/gems/mms2r
-http://peepcode.com/products/mms2r-pdf
+
+* https://github.com/monde/mms2r
+* https://rubygems.org/gems/mms2r
+* http://peepcode.com/products/mms2r-pdf
MMS2R is a library that decodes the parts of a 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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
Contact the author to add additional carriers to be processed by the library.
Suggestions and patches appreciated and welcomed!
[](http://tip4commit.com/projects/198)
### Corpus of carriers currently processed by MMS2R:
* 1nbox/Idea: 1nbox.net
* 3 Ireland: mms.3ireland.ie
* Alltel: mms.alltel.com
* AT&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com, cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com (note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
* Cincinnati Bell: mms.gocbw.com
### Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
### As Seen On The Internets - sites known to be using MMS2R in some fashion
-* twitpic.com[http://www.twitpic.com/]
-* Simplton[http://simplton.com/]
-* fanchatter.com[http://www.fanchatter.com/]
-* camura.com[http://www.camura.com/]
-* eachday.com[http://www.eachday.com/]
-* beenup2.com[http://www.beenup2.com/]
-* snapmylife.com[http://www.snapmylife.com/]
+* twitpic.com - http://www.twitpic.com/
+* Simplton - http://simplton.com/
+* fanchatter.com - http://www.fanchatter.com/
+* camura.com - [http://www.camura.com/
+* eachday.com - [http://www.eachday.com/
+* beenup2.com - [http://www.beenup2.com/
+* snapmylife.com - [http://www.snapmylife.com/
* email the author to be listed here
## FEATURES
* #default_media and #default_text methods return a File that can be used in attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type. Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid, Samsung
## BOOKS
MMS2R, Making email useful
+
http://peepcode.com/products/mms2r-pdf
## SYNOPSIS
+```ruby
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
+```
## REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
## INSTALL
-* sudo gem install mms2r
+```
+sudo gem install mms2r
+```
## SOURCE
+```
git clone git://github.com/monde/mms2r.git
+```
## AUTHORS
-Copyright (c) 2007-2012 by Mike Mondragon blog[http://plasti.cx/]
+Copyright (c) 2007-2012 by Mike Mondragon blog http://plasti.cx/
-MMS2R's {Flickr page}[http://www.flickr.com/photos/8627919@N05/]
+MMS2R's Flickr page http://www.flickr.com/photos/8627919@N05/
## CONTRIBUTORS
-* Luke Francl - blog[http://railspikes.com/]
-* Will Jessup - blog[http://www.willjessup.com/]
-* Shane Vitarana - blog[http://www.shanesbrain.net/]
-* Layton Wedgeworth - company[http://www.beenup2.com/]
-* Jason Haruska - blog[http://software.haruska.com/]
-* Dave Myron - company[http://contentfree.com/]
+* Luke Francl - http://railspikes.com/
+* Will Jessup - http://www.willjessup.com/
+* Shane Vitarana - http://www.shanesbrain.net/
+* Layton Wedgeworth - http://www.beenup2.com/
+* Jason Haruska - http://software.haruska.com/
+* Dave Myron - http://contentfree.com/
* Vijay Yellapragada
-* Jesse Dp - {github profile}[http://github.com/jessedp]
+* Jesse Dp - http://github.com/jessedp
* David Alm
* Jeremy Wilkins
-* Matt Conway - {github profile}[http://github.com/wr0ngway]
+* Matt Conway - http://github.com/wr0ngway
* Kai Kai
* Michael DelGaudio
-* Sai Emrys - blog[http://saizai.com]
-* Brendan Lim - {github profile}[http://github.com/brendanlim]
-* Scott Taylor - {github profile}[http://github.com/smtlaissezfaire]
-* Jaap van der Meer - {github profile}[http://github.com/japetheape]
-* Karl Baum - {github profile}[http://github.com/kbaum]
-* James McGrath - blog[http://jamespmcgrath.com]
+* Sai Emrys - http://saizai.com/
+* Brendan Lim - http://github.com/brendanlim
+* Scott Taylor - http://github.com/smtlaissezfaire
+* Jaap van der Meer - http://github.com/japetheape
+* Karl Baum - http://github.com/kbaum
+* James McGrath - http://jamespmcgrath.com/
|
monde/mms2r
|
8aa36ad9e13b5029a1aac8341713d6e4c16a2e24
|
psych hack is only for ruby 1.9
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 3cf6db1..1aefdba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- mms2r (3.9.1)
+ mms2r (3.9.2)
exifr (>= 1.0.3)
json (>= 1.6.0)
mail (>= 2.4.0)
nokogiri (>= 1.5.0)
rake
GEM
remote: https://rubygems.org/
specs:
exifr (1.1.3)
i18n (0.6.1)
json (1.7.5)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.19)
mocha (0.13.0)
metaclass (~> 0.0.1)
multi_json (1.3.7)
nokogiri (1.5.5)
polyglot (0.3.3)
rake (10.0.1)
rdoc (3.12)
json (~> 1.4)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
test-unit (2.5.2)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
mms2r!
mocha
rdoc
simplecov
test-unit
diff --git a/History.txt b/History.txt
index 97ff367..387267c 100644
--- a/History.txt
+++ b/History.txt
@@ -1,466 +1,471 @@
+### 3.9.2 / 2013-09-15 (Abigail Remeltindrinc - record producer)
+
+* 1 minor enhancement
+ * psych hack is only for ruby 1.9
+
### 3.9.1 / 2012-11-15 (#216 - Klokateer afflicted with dwarfism)
* 1 minor enhancement
* remove rake 0.9.2.2 dependency
### 3.9.0 / 2012-10-18 (Jean-Pierre - A French chef)
* 1 minor enhancement
* refined character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.8.2 / 2012-08-21 (Seth - Pickles The Drummer's brother)
* 2 minor enhancements
* Broadened handling of generic "Sent from" footers in smart phones
* Add ability to process HTC Sensation footer
### 3.8.1 / 2012-07-22 (Calvert - Pickles The Drummer's dad)
* 1 major enhancement
* Support for Cincinnati Bell - mms.gocbw.com - James McGrath
### 3.8.0 / 2012-07-04 (Dr. Donald Gorfield â Comedy specialist)
* 1 major enhancement
* Handle MMS from Sprint that have their media attached rather than CDN'd
### 3.7.1 / 2012-06-04 (Abrigail Remeltindtdrinc - The Record Cleaner)
* 2 minor enhancements
* Improve processing of Sprint media - James McGrath
* RDoc format documentation - James McGrath
### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
* 2 major enhancements
* Improve processing of Sprint media - James McGrath
* Remove Hoe and gemcutter dependencies
### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
* 1 minor enhancement
* strip a variation of the iphone default footer
### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index 1a8b044..b02cb6a 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,131 +1,131 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# Spoof User-Agent, primarily for the Sprint CDN
USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2"
end
##
# Simple convenience function to make it a one-liner:
# MMS2R.parse raw_mail or
# MMS2R.parse File.load(file)
# MMS2R.parse File.load(path_to_file)
# Combined w/ the method_missing delegation, this should behave as an enhanced Mail object, more or less.
def self.parse thing, options = {}
mail = case
when File.exist?(thing); Mail.new(open(thing).read)
when thing.respond_to?(:read); Mail.new(thing.read)
else
Mail.new(thing)
end
MMS2R::Media.new(mail, options)
end
##
# Compare original MMS2R results with original mail values and other metrics.
#
# Takes a file path, mms2r object, mail object, or mail text blob.
def self.debug(thing, options = {})
mms = case thing
when MMS2R::Media; thing
when Mail::Message; MMS2R::Media.new(thing, options)
else
self.parse(thing, options)
end
<<OUT
#{'-' * 80}
original mail
#{'from:'.ljust(15)} #{mms.mail.from}
#{'to:'.ljust(15)} #{mms.mail.to}
#{'subject:'.ljust(15)} #{mms.mail.subject}
mms2r
#{'from:'.ljust(15)} #{mms.from}
#{'to:'.ljust(15)} #{mms.to}
#{'subject:'.ljust(15)} #{mms.subject}
#{'number:'.ljust(15)} #{mms.number}
default media
#{mms.default_media.inspect}
default text
#{mms.default_text.inspect}
#{mms.default_text.read if mms.default_text}
all plain text
#{(mms.media['text/plain']||[]).each {|t| open(t).read}.join("\n\n")}
media hash
#{mms.media.inspect}
OUT
end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
-if RUBY_VERSION >= "1.9"
+if RUBY_VERSION == "1.9" && RUBY_VERSION < "2.0"
begin
require 'psych'
YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
rescue LoadError
end
end
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index c4e42fd..eade85b 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
9
end
def self.patch
- 1
+ 2
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index df698cf..3573adf 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,103 +1,103 @@
if ENV['COVERAGE']
require 'simplecov'
SimpleCov.start do
add_filter 'test'
end
end
# do it like rake http://ozmm.org/posts/do_it_like_rake.html
-%W{ test/unit set net/http net/https pp tempfile mocha }.each do |g|
+%W{ test/unit set net/http net/https pp tempfile mocha/setup }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'mms2r')
module MMS2R
module TestHelper
def assert_file_size(file, size)
assert_not_nil(file, "file was nil")
assert(File::exist?(file), "file #{file} does not exist")
assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
end
def fixture(file)
File.join(File.expand_path(File.dirname(__FILE__)), "fixtures", file)
end
def fixture_data(name)
open(fixture(name)).read
end
def mail_fixture(file)
fixture(file)
end
def mail(name)
Mail.read(mail_fixture(name))
end
def smart_phone_mock(make_text = 'Apple', model_text = 'iPhone', software_text = nil, jpeg = true)
mail = stub('mail',
:from => ['[email protected]'],
:return_path => '<[email protected]>',
:message_id => 'abcd0123',
:multipart? => true,
:header => {})
part = stub('part',
:part_type? => "image/#{jpeg ? 'jpeg' : 'tiff'}",
:body => Mail::Body.new('abc'),
:multipart? => false,
:filename => "foo.#{jpeg ? 'jpg' : 'tif'}" )
mail.stubs(:parts).returns([part])
exif = stub('exif', :make => make_text, :model => model_text, :software => software_text)
if jpeg
EXIFR::JPEG.expects(:new).at_least_once.returns(exif)
else
EXIFR::TIFF.expects(:new).at_least_once.returns(exif)
end
mail
end
end
end
class Hash
def except(*keys)
rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
reject { |key,| rejected.include?(key) }
end
def except!(*keys)
replace(except(*keys))
end
end
# monkey patch Net::HTTP so un caged requests don't go over the wire
module Net #:nodoc:
class HTTP #:nodoc:
alias :old_net_http_request :request
alias :old_net_http_connect :connect
def request(req, body = nil, &block)
uri_cls = use_ssl ? URI::HTTPS : URI::HTTP
query = req.path.split('?',2)
opts = {:host => self.address,
:port => self.port, :path => query[0]}
opts[:query] = query[1] if query[1]
uri = uri_cls.build(opts)
raise ArgumentError.new("#{req.method} method to #{uri} not being handled in testing")
end
def connect
raise ArgumentError.new("connect not being handled in testing")
end
end
end
|
monde/mms2r
|
b8422f7956dee09f4de09dfda277deb5d7852fce
|
Remove hard rake dependency and release version 3.9.1.
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 02c06fd..3cf6db1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- mms2r (3.8.2)
+ mms2r (3.9.1)
exifr (>= 1.0.3)
json (>= 1.6.0)
mail (>= 2.4.0)
nokogiri (>= 1.5.0)
- rake (= 0.9.2.2)
+ rake
GEM
remote: https://rubygems.org/
specs:
exifr (1.1.3)
- i18n (0.6.0)
- json (1.7.3)
+ i18n (0.6.1)
+ json (1.7.5)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.19)
- mocha (0.11.4)
+ mocha (0.13.0)
metaclass (~> 0.0.1)
- multi_json (1.3.5)
+ multi_json (1.3.7)
nokogiri (1.5.5)
polyglot (0.3.3)
- rake (0.9.2.2)
+ rake (10.0.1)
rdoc (3.12)
json (~> 1.4)
- simplecov (0.6.4)
+ simplecov (0.7.1)
multi_json (~> 1.0)
- simplecov-html (~> 0.5.3)
- simplecov-html (0.5.3)
- test-unit (2.4.8)
- treetop (1.4.10)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+ test-unit (2.5.2)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
mms2r!
mocha
rdoc
simplecov
test-unit
diff --git a/History.txt b/History.txt
index 16467a3..97ff367 100644
--- a/History.txt
+++ b/History.txt
@@ -1,461 +1,466 @@
+### 3.9.1 / 2012-11-15 (#216 - Klokateer afflicted with dwarfism)
+
+* 1 minor enhancement
+ * remove rake 0.9.2.2 dependency
+
### 3.9.0 / 2012-10-18 (Jean-Pierre - A French chef)
* 1 minor enhancement
* refined character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.8.2 / 2012-08-21 (Seth - Pickles The Drummer's brother)
* 2 minor enhancements
* Broadened handling of generic "Sent from" footers in smart phones
* Add ability to process HTC Sensation footer
### 3.8.1 / 2012-07-22 (Calvert - Pickles The Drummer's dad)
* 1 major enhancement
* Support for Cincinnati Bell - mms.gocbw.com - James McGrath
### 3.8.0 / 2012-07-04 (Dr. Donald Gorfield â Comedy specialist)
* 1 major enhancement
* Handle MMS from Sprint that have their media attached rather than CDN'd
### 3.7.1 / 2012-06-04 (Abrigail Remeltindtdrinc - The Record Cleaner)
* 2 minor enhancements
* Improve processing of Sprint media - James McGrath
* RDoc format documentation - James McGrath
### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
* 2 major enhancements
* Improve processing of Sprint media - James McGrath
* Remove Hoe and gemcutter dependencies
### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
* 1 minor enhancement
* strip a variation of the iphone default footer
### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index 0a8ef7f..c4e42fd 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
9
end
def self.patch
- 0
+ 1
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
diff --git a/mms2r.gemspec b/mms2r.gemspec
index 23e4244..9a3c56a 100644
--- a/mms2r.gemspec
+++ b/mms2r.gemspec
@@ -1,33 +1,33 @@
$:.unshift File.expand_path("../lib", __FILE__)
require "mms2r/version"
Gem::Specification.new do |gem|
- gem.add_dependency 'rake', ['= 0.9.2.2']
+ gem.add_dependency 'rake'
gem.add_dependency 'nokogiri', ['>= 1.5.0']
gem.add_dependency 'mail', ['>= 2.4.0']
gem.add_dependency 'exifr', ['>= 1.0.3']
gem.add_dependency 'json', ['>= 1.6.0']
gem.add_development_dependency "rdoc"
gem.add_development_dependency "simplecov"
gem.add_development_dependency 'test-unit'
gem.add_development_dependency 'mocha'
gem.name = "mms2r"
gem.version = MMS2R::Version.to_s
gem.platform = Gem::Platform::RUBY
gem.authors = ["Mike Mondragon"]
gem.email = ["[email protected]"]
gem.homepage = "https://github.com/monde/mms2r"
gem.summary = "Extract user media from MMS (and not carrier cruft)"
gem.description = "MMS2R is a library that decodes the parts of a MMS message to disk while stripping out advertising injected by the mobile carriers."
gem.rubyforge_project = "mms2r"
gem.rubygems_version = ">= 1.3.6"
gem.files = `git ls-files`.split("\n")
gem.require_path = ['lib']
gem.rdoc_options = ["--main", "README.rdoc"]
gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.rdoc"]
gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
end
|
monde/mms2r
|
764a62abd845e9c794e159c1565b79e9ab9ae1bb
|
refined character encoding capability with 1.8 rubies and 1.9 rubies.
|
diff --git a/History.txt b/History.txt
index 32744d5..16467a3 100644
--- a/History.txt
+++ b/History.txt
@@ -1,456 +1,461 @@
+### 3.9.0 / 2012-10-18 (Jean-Pierre - A French chef)
+
+* 1 minor enhancement
+ * refined character encoding capability with 1.8 rubies and 1.9 rubies.
+
### 3.8.2 / 2012-08-21 (Seth - Pickles The Drummer's brother)
* 2 minor enhancements
* Broadened handling of generic "Sent from" footers in smart phones
* Add ability to process HTC Sensation footer
### 3.8.1 / 2012-07-22 (Calvert - Pickles The Drummer's dad)
* 1 major enhancement
* Support for Cincinnati Bell - mms.gocbw.com - James McGrath
### 3.8.0 / 2012-07-04 (Dr. Donald Gorfield â Comedy specialist)
* 1 major enhancement
* Handle MMS from Sprint that have their media attached rather than CDN'd
### 3.7.1 / 2012-06-04 (Abrigail Remeltindtdrinc - The Record Cleaner)
* 2 minor enhancements
* Improve processing of Sprint media - James McGrath
* RDoc format documentation - James McGrath
### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
* 2 major enhancements
* Improve processing of Sprint media - James McGrath
* Remove Hoe and gemcutter dependencies
### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
* 1 minor enhancement
* strip a variation of the iphone default footer
### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index 66e9651..1a8b044 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,131 +1,131 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# Spoof User-Agent, primarily for the Sprint CDN
USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2"
end
##
# Simple convenience function to make it a one-liner:
# MMS2R.parse raw_mail or
# MMS2R.parse File.load(file)
# MMS2R.parse File.load(path_to_file)
# Combined w/ the method_missing delegation, this should behave as an enhanced Mail object, more or less.
def self.parse thing, options = {}
mail = case
when File.exist?(thing); Mail.new(open(thing).read)
when thing.respond_to?(:read); Mail.new(thing.read)
else
Mail.new(thing)
end
MMS2R::Media.new(mail, options)
end
##
# Compare original MMS2R results with original mail values and other metrics.
#
# Takes a file path, mms2r object, mail object, or mail text blob.
def self.debug(thing, options = {})
mms = case thing
when MMS2R::Media; thing
when Mail::Message; MMS2R::Media.new(thing, options)
else
self.parse(thing, options)
end
<<OUT
#{'-' * 80}
original mail
#{'from:'.ljust(15)} #{mms.mail.from}
#{'to:'.ljust(15)} #{mms.mail.to}
#{'subject:'.ljust(15)} #{mms.mail.subject}
mms2r
#{'from:'.ljust(15)} #{mms.from}
#{'to:'.ljust(15)} #{mms.to}
#{'subject:'.ljust(15)} #{mms.subject}
#{'number:'.ljust(15)} #{mms.number}
default media
#{mms.default_media.inspect}
default text
#{mms.default_text.inspect}
#{mms.default_text.read if mms.default_text}
all plain text
#{(mms.media['text/plain']||[]).each {|t| open(t).read}.join("\n\n")}
media hash
#{mms.media.inspect}
OUT
end
end
-%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
+%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
if RUBY_VERSION >= "1.9"
begin
require 'psych'
YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
rescue LoadError
end
end
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index 50d86e2..15156df 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -1,860 +1,860 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
##
# = Synopsis
#
# MMS2R is a library to collect media files from MMS messages. MMS messages
# are multipart emails and mobile carriers often inject branding into these
# messages. MMS2R strips the advertising from an MMS leaving the actual user
# generated media.
#
# The Tracker for MMS2R is located at
# http://rubyforge.org/tracker/?group_id=3065
# Please submit bugs and feature requests using the Tracker.
#
# If MMS from a carrier not known by MMS2R is encountered please submit a
# sample to the author for inclusion in this project.
#
# == Stand Alone Example
#
# begin
# require 'mms2r'
# rescue LoadError
# require 'rubygems'
# require 'mms2r'
# end
# mail = Mail.read("sample-MMS.file")
# mms = MMS2R::Media.new(mail)
# subject = mms.subject
# number = mms.number
# file = mms.default_media
# mms.purge
#
# == Rails ActionMailer#receive w/ AttachmentFu Example
#
# def receive(mail)
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
# See the README.rdoc file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
- @body = text_file ? IO.readlines(text_file.path).join.strip : ""
- @body.force_encoding("ISO-8859-1") if RUBY_VERSION >= "1.9" && @body.encoding == "ASCII-8BIT"
- begin
- ic = Iconv.new('UTF-8', 'ISO-8859-1' )
+ if RUBY_VERSION < "1.9"
+ @body = text_file ? IO.read(text_file.path).strip : ""
+ require 'iconv'
+ ic = Iconv.new('UTF-8', 'ISO-8859-1')
@body = ic.iconv(@body)
@body << ic.iconv(nil)
ic.close
- rescue Exception => e
+ else
+ @body = text_file ? IO.read(text_file.path, :mode => "rb").strip : ""
+ @body = @body.chars.select{|i| i.valid_encoding?}.join
end
- if @body.blank? && html_file = default_html
+ if @body.blank? &&
+ html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = self.folded_parts(mail)
parts.each do |part|
if part.part_type? == 'text/html'
process_html_part(part)
else
process_part(part)
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
- mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
- mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
- File.open(file, mode){ |f| f.write(content) }
+ File.open(file, 'wb'){ |f| f.write(content) }
return type, file
end
##
# Helper to decide if a part should be kept or ignored
def process_part(part)
return if ignore_media?(part.part_type?, part)
type, file = process_media(part)
add_file(type, file) unless type.nil? || file.nil?
end
##
# Helper to decide if a html part should be kept or ignored.
# We are defining it here primarily for the benefit so that Sprint
# can override a special case for processing.
def process_html_part(part)
process_part(part)
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
- def transform_text(type, text, original_encoding = 'ISO-8859-1')
+ def transform_text(type, text)
return type, text if !config['transform'] || !(transforms = config['transform'][type])
- begin
- ic = Iconv.new('UTF-8', original_encoding )
- utf_t = ic.iconv(text)
- utf_t << ic.iconv(nil)
+ if RUBY_VERSION < "1.9"
+ require 'iconv'
+ ic = Iconv.new('UTF-8', 'ISO-8859-1')
+ text = ic.iconv(text)
+ text << ic.iconv(nil)
ic.close
- rescue Exception => e
- utf_t = text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
- utf_t = utf_t.gsub(p, r) rescue utf_t
+ text = text.gsub(p, r) rescue text
end
- return type, utf_t
+ return type, text
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :nokia
# * :palm
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header].decoded =~ regex
field = mail.header.fields.detect { |field| field.name == header }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
boundary = mail.boundary
boundaries = config['device_types']['boundary'] rescue {}
boundaries.each do |type, regex|
return type if boundary =~ regex
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
protected
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# Helper to fold all the parts of multipart mail down into a flat array.
# multipart/related and multipart/alternative parts can have child parts.
def folded_parts(parts)
return folded_parts([parts]) unless parts.respond_to?(:each)
result = [] # NOTE could use #tap but want 1.8.7 compat
parts.each do |part|
result << (part.multipart? ? folded_parts(part.parts) : part)
end
result.flatten
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
next unless File.exist?(path)
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index 448c31d..0a8ef7f 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
- 8
+ 9
end
def self.patch
- 2
+ 0
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
diff --git a/test/fixtures/sprint-ajax-response-success.json b/test/fixtures/sprint-ajax-response-success.json
index 8feb749..8344941 100644
--- a/test/fixtures/sprint-ajax-response-success.json
+++ b/test/fixtures/sprint-ajax-response-success.json
@@ -1 +1 @@
-{"totalMediaItems":2,"shareType":"normal","nomediaItem":"false","isOnlyVideo":null,"creationDate":"May 31, 2012","from":"(513)545-0000","offset":null,"externalMessageId":"XXXXXXXXXXXXXXXXXX","Results":[{"elementID":"0","hasVoiceCaption":false,"URL":{"elementID":"0","indexCount":0,"audio":null,"thumb":"\/retailers\/PCSNEXTEL\/ui-refresh\/images\/background\/slide_no_media_90x90.gif","annotationVoiceID":null,"image":"\/retailers\/PCSNEXTEL\/ui-refresh\/images\/background\/slide_no_media_90x90.gif","video":null},"description":"First text content. ","mediaItemNum":0,"isDRMProtected":false,"externalMessageId":"XXXXXXXXXXXXXXXXXX","mediaType":"TEXT","restOperation":"false","folderFullName":"\/RECIPIENT"},{"elementID":"3","hasVoiceCaption":false,"URL":{"elementID":"3","indexCount":1,"audio":"","thumb":"http:\/\/pictures.sprintpcs.com:80\/mmps\/048_0736849c3f1a9d27_1\/3.jpg?partExt=.jpg&&&outquality=90&ext=.jpg&&size=40,40&squareoutput=255,255,255&aspectcrop=0.5,0.5,1.0,1.0,1.0","annotationVoiceID":null,"image":"http:\/\/pictures.sprintpcs.com:80\/mmps\/048_0736849c3f1a9d27_1\/3.jpg?partExt=.jpg&&&outquality=90&ext=.jpg","video":""},"description":"Second text content. ","mediaItemNum":1,"isDRMProtected":false,"externalMessageId":"XXXXXXXXXXXXXXXXXX","mediaType":"IMAGE","restOperation":"false","folderFullName":"\/RECIPIENT"}],"invite":null,"tmemo":null,"toAddress":"[email protected]","mediaIndex":0,"subject":"New Message","isDRMProtected":false,"expirationDate":"Expires in 57 Days","voiceURL":null,"guest":"true","folderFullName":"\/RECIPIENT"}
+{"totalMediaItems":2,"shareType":"normal","nomediaItem":"false","isOnlyVideo":null,"creationDate":"May 31, 2012","from":"(513)545-0000","offset":null,"externalMessageId":"XXXXXXXXXXXXXXXXXX","Results":[{"elementID":"0","hasVoiceCaption":false,"URL":{"elementID":"0","indexCount":0,"audio":null,"thumb":"\/retailers\/PCSNEXTEL\/ui-refresh\/images\/background\/slide_no_media_90x90.gif","annotationVoiceID":null,"image":"\/retailers\/PCSNEXTEL\/ui-refresh\/images\/background\/slide_no_media_90x90.gif","video":null},"description":"First text content.","mediaItemNum":0,"isDRMProtected":false,"externalMessageId":"XXXXXXXXXXXXXXXXXX","mediaType":"TEXT","restOperation":"false","folderFullName":"\/RECIPIENT"},{"elementID":"3","hasVoiceCaption":false,"URL":{"elementID":"3","indexCount":1,"audio":"","thumb":"http:\/\/pictures.sprintpcs.com:80\/mmps\/048_0736849c3f1a9d27_1\/3.jpg?partExt=.jpg&&&outquality=90&ext=.jpg&&size=40,40&squareoutput=255,255,255&aspectcrop=0.5,0.5,1.0,1.0,1.0","annotationVoiceID":null,"image":"http:\/\/pictures.sprintpcs.com:80\/mmps\/048_0736849c3f1a9d27_1\/3.jpg?partExt=.jpg&&&outquality=90&ext=.jpg","video":""},"description":"Second text content. ","mediaItemNum":1,"isDRMProtected":false,"externalMessageId":"XXXXXXXXXXXXXXXXXX","mediaType":"IMAGE","restOperation":"false","folderFullName":"\/RECIPIENT"}],"invite":null,"tmemo":null,"toAddress":"[email protected]","mediaIndex":0,"subject":"New Message","isDRMProtected":false,"expirationDate":"Expires in 57 Days","voiceURL":null,"guest":"true","folderFullName":"\/RECIPIENT"}
diff --git a/test/test_invalid_byte_seq_outlook.rb b/test/test_invalid_byte_seq_outlook.rb
index 75a6b6a..ad91587 100644
--- a/test/test_invalid_byte_seq_outlook.rb
+++ b/test/test_invalid_byte_seq_outlook.rb
@@ -1,27 +1,15 @@
require "test_helper"
class TestInvalidByteSeqOutlook < Test::Unit::TestCase
include MMS2R::TestHelper
def test_bad_outlook
mail = mail('invalid-byte-seq-outlook.mail')
mms = MMS2R::Media.new(mail)
- body = mms.body
-=begin
- assert_equal "+919812345678", mms.number
- assert_equal "1nbox.net", mms.carrier
- assert_equal 2, mms.media.size
-
- assert_not_nil mms.media['text/plain']
- assert_equal 1, mms.media['text/plain'].size
- assert_equal "testing123456789012", open(mms.media['text/plain'].first).read
-
- assert_not_nil mms.media['image/jpeg']
- assert_equal 1, mms.media['text/plain'].size
- assert_match(/@003\.jpg$/, mms.media['image/jpeg'].first)
-=end
+ assert_equal "RE: Issue 14794:Don M. says.. Aaron - I completed RNS Test Question 3, which was done as a 'Cargo Control Number' query. H", mms.subject
+ assert_match /Don Doe said less than a minute ago/im, mms.body
mms.purge
end
end
diff --git a/test/test_messaging_sprintpcs_com.rb b/test/test_messaging_sprintpcs_com.rb
index a967ff7..14fc88b 100644
--- a/test/test_messaging_sprintpcs_com.rb
+++ b/test/test_messaging_sprintpcs_com.rb
@@ -1,22 +1,22 @@
require "test_helper"
class TestMessagingSprintpcsCom < Test::Unit::TestCase
include MMS2R::TestHelper
def test_simple_text
mail = mail('sprint-pcs-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "messaging.sprintpcs.com", mms.carrier
assert_equal 1, mms.media.size
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
+ text = IO.read("#{file}")
assert_match(/hello world/, text)
mms.purge
end
end
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index 54e5317..e4367c5 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,761 +1,757 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
@oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@oldtmpdir)
FileUtils.mkdir_p(@oldconfdir)
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
end
end
def test_faux_user_agent
assert_equal "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2", MMS2R::Media::USER_AGENT
end
def test_class_parse
mms = mail('generic.mail')
assert_equal ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "From my HTC Sensation 4G on T-Mobile. The first nationwide 4G network")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Windows Phone")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent via iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
- text = text_lines.join
-
- # ASCII-8BIT -> D'ici un mois G\xE9orgie
- # UTF-8 -> D'ici un mois Géorgie
-
if RUBY_VERSION < "1.9"
- assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
- assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
+ text = IO.read("#{file}")
else
- assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
- assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
+ text = IO.read("#{file}", :mode => "rb")
end
+ # ASCII-8BIT -> D'ici un mois G\xE9orgie
+ # UTF-8 -> D'ici un mois Géorgie
+
+ assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
duck_file = mms.send(:attachment, ['text'])
assert_equal 1, duck_file.size
assert_equal 'text/plain', duck_file.content_type
assert_equal "a", open(mms.media['text/plain'].first).read
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_folding_with_multipart_alternative_parts
mail = mail('helio-message-01.mail')
mms = MMS2R::Media.new(Mail.new)
assert_equal 5, mms.send(:folded_parts, mail.parts).size
end
def test_process_when_media_is_ignored
# TODO - I'd like to get away from mocks and test on real data, and
# this is covered repeatedly for various samples from the carrier
end
def test_process_when_yielding_to_a_block
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'image/jpeg'
assert_equal true, File.basename(files.first) == 'Photo_12.jpg'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_faux_tiff_iphone_device_type_by_exif
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_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)
assert_equal :dash, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_droid_device_type_by_exif
mail = smart_phone_mock('Motorola', 'Droid')
mms = MMS2R::Media.new(mail)
assert_equal :droid, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_eris_device_type_by_exif
mail = smart_phone_mock('HTC', 'Eris')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
assert_equal true, mms.is_mobile?
diff --git a/test/test_mms_att_net.rb b/test/test_mms_att_net.rb
index 99b47c6..4c13f35 100644
--- a/test/test_mms_att_net.rb
+++ b/test/test_mms_att_net.rb
@@ -1,150 +1,150 @@
require "test_helper"
class TestMmsAttNet < Test::Unit::TestCase
include MMS2R::TestHelper
def test_mms_att_net
# mms.att.net service
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "12068675309", mms.number
assert_equal "mms.att.net", mms.carrier
assert_equal 1, mms.media.size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'].first
assert_match(/Photo_12.jpg$/, mms.media['image/jpeg'][0])
assert_file_size(mms.media['image/jpeg'][0], 337)
mms.purge
end
def test_mms_att_net_subject
# mms.att.net service
mail = mail('att-image-02.mail')
mms = MMS2R::Media.new(mail)
assert_equal "12068675309", mms.number
assert_equal "mms.att.net", mms.carrier
assert_equal "", mms.subject
mms.purge
end
def test_txt_att_net
# txt.att.net service
mail = mail('att-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "txt.att.net", mms.carrier
assert_equal 1, mms.media.size
assert_not_nil(mms.media['text/plain'])
assert_equal "Hello World", IO.read(mms.media['text/plain'][0])
mms.purge
end
def test_cingularme_com
# cingularme.com service
mail = mail('cingularme-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "cingularme.com", mms.carrier
assert_equal 1, mms.media.size
assert_not_nil(mms.media['text/plain'])
assert_equal "hello world", IO.read(mms.media['text/plain'][0])
mms.purge
end
def test_mmode_com
# mmode.com service
mail = mail('mmode-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "12068675309", mms.number
assert_equal "mmode.com", mms.carrier
assert_equal 1, mms.media.size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'].first
assert_match(/picture\(3\).jpg$/, mms.media['image/jpeg'][0])
assert_file_size(mms.media['image/jpeg'][0], 337)
mms.purge
end
def test_mms_mycingular_com
# mms.mycingular.com service
mail = mail('mycingular-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "mms.mycingular.com", mms.carrier
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/plain'][0]
assert_equal 1, mms.media['text/plain'].size
assert_not_nil mms.media['image/jpeg']
assert_not_nil mms.media['image/jpeg'][0]
assert_equal 1, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'].first
assert_match(/04-18-07_1723.jpg$/, mms.media['image/jpeg'][0])
assert_file_size(mms.media['image/jpeg'][0], 337)
assert_equal "Water", IO.read(mms.media['text/plain'][0])
mms.purge
end
def test_image_from_blackberry
mail = mail('att-blackberry.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "example.com", mms.carrier
assert_not_nil mms.media['text/plain']
- assert_equal "Hello world", IO.readlines(mms.media['text/plain'].first).join.strip
+ assert_equal "Hello world", IO.read(mms.media['text/plain'].first).strip
assert_not_nil mms.media['image/jpeg'].first
assert_match(/\/BC-WAKE\.jpg$/, mms.media['image/jpeg'].first)
end
def test_image_from_blackberry2
mail = mail('att-blackberry-02.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "mms.att.net", mms.carrier
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
- assert_match(/^Testing memorymail from my blackberry and at&t.$/, IO.readlines(mms.media['text/plain'].first).join.strip)
+ assert_match(/^Testing memorymail from my blackberry and at&t.$/, IO.read(mms.media['text/plain'].first).strip)
assert_not_nil mms.media['image/jpeg'].first
assert_match(/IMG00367.jpg/, mms.media['image/jpeg'].first)
end
def test_mobile_mycingular_com
# mobile.mycingular.com service
mail = mail('mobile.mycingular.com-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "mobile.mycingular.com", mms.carrier
assert_equal 1, mms.media.size
assert_not_nil(mms.media['text/plain'])
assert_equal "I hate people that send text messages about skateboarding.", IO.read(mms.media['text/plain'][0])
mms.purge
end
def test_pics_cingularme_com
# pics.cingularme.com service
mail = mail('pics.cingularme.com-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "pics.cingularme.com", mms.carrier
mms.purge
end
end
diff --git a/test/test_mms_mycricket_com.rb b/test/test_mms_mycricket_com.rb
index 4b02c1f..7cf467f 100644
--- a/test/test_mms_mycricket_com.rb
+++ b/test/test_mms_mycricket_com.rb
@@ -1,60 +1,60 @@
require "test_helper"
class TestMmsMycricketCom < Test::Unit::TestCase
include MMS2R::TestHelper
def test_subject
# mms.mycricket.com service
mail = mail('mms.mycricket.com-pic.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "mms.mycricket.com", mms.carrier
assert_equal "", mms.subject
mms.purge
end
def test_image
# mms.mycricket.com service
mail = mail('mms.mycricket.com-pic.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "mms.mycricket.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 1, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'].first
assert_match(/10-26-07_1739.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_image_and_text
# mms.mycricket.com service
mail = mail('mms.mycricket.com-pic-and-text.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "mms.mycricket.com", mms.carrier
assert_equal 2, mms.media.size
assert_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['image/jpeg'].size
assert_not_nil mms.media['text/plain'].first
assert_not_nil mms.media['image/jpeg'].first
file = mms.media['text/plain'].first
assert_equal true, File::exist?(file), "file #{file} does not exist"
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_match(/Hello World/, text)
assert_match(/02-14-08_2114.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
end
diff --git a/test/test_mms_uscc_net.rb b/test/test_mms_uscc_net.rb
index 2465e75..7d26146 100644
--- a/test/test_mms_uscc_net.rb
+++ b/test/test_mms_uscc_net.rb
@@ -1,33 +1,33 @@
require "test_helper"
class TestMmsUsccNet < Test::Unit::TestCase
include MMS2R::TestHelper
def test_mms_uscc_net
# mms.uscc.net service
mail = mail('us-cellular-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5418675309", mms.number
assert_equal "mms.uscc.net", mms.carrier
assert_equal "", mms.subject
assert_equal 2, mms.media.size
assert_nil mms.media['text/html']
assert_nil mms.media['image/gif']
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/0315001513.jpg$/, mms.media['image/jpeg'].first)
assert_file_size(mms.media['image/jpeg'].first, 337)
assert_not_nil mms.media['text/plain']
file = mms.media['text/plain'][0]
assert_not_nil file
assert_equal true, File::exist?(file)
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_match(/This is what i do at work most the day/, text)
mms.purge
end
end
diff --git a/test/test_orangemms_net.rb b/test/test_orangemms_net.rb
index b1ef1c4..7cdd0e0 100644
--- a/test/test_orangemms_net.rb
+++ b/test/test_orangemms_net.rb
@@ -1,108 +1,108 @@
require "test_helper"
class TestOrangemmsNet < Test::Unit::TestCase
include MMS2R::TestHelper
def test_orangemms_subject
# orangemms.net service
mail = mail('orange-uk-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "orangemms.net", mms.carrier
assert_equal "", mms.subject
mms.purge
end
def test_orangemms_image
# orangemms.net service
mail = mail('orange-uk-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "orangemms.net", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/picture.jpg$/, mms.media['image/jpeg'][0])
assert_file_size mms.media['image/jpeg'][0], 337
mms.purge
end
def test_orange_france_subject
# orange.fr service
mail = mail('orangefrance-text-and-image.mail')
mms = MMS2R::Media.new(mail)
assert_equal "0688675309", mms.number
assert_equal "orange.fr", mms.carrier
assert_equal "", mms.subject
mms.purge
end
def test_orange_france_processed_content
# orange.fr service
mail = mail('orangefrance-text-and-image.mail')
mms = MMS2R::Media.new(mail)
assert_equal "0688675309", mms.number
assert_equal "orange.fr", mms.carrier
# there should be one text and one image
assert_equal 2, mms.media.size
#text
# there is a text banner that Orange attaches but
# that should be ignored
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert File::exist?(file), "file #{file} does not exist"
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_match(/Test ma poule/, text)
# image
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/IMAGE.jpeg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_orange_poland_subject
# mmsemail.orange.pl service
mail = mail('orangepoland-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "48508675309", mms.number
assert_equal "mmsemail.orange.pl", mms.carrier
assert_equal "", mms.subject
mms.purge
end
def test_orange_poland_non_empty_subject
# mmsemail.orange.pl service
mail = mail('orangepoland-text-02.mail')
mms = MMS2R::Media.new(mail)
assert_equal "48508675309", mms.number
assert_equal "mmsemail.orange.pl", mms.carrier
assert mms.subject, "whazzup"
mms.purge
end
def test_orange_poland_content
# mmsemail.orange.pl service
mail = mail('orangepoland-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "48508675309", mms.number
assert_equal "mmsemail.orange.pl", mms.carrier
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
+ text = IO.read("#{file}")
assert_match(/pozdro600/, text)
mms.purge
end
end
diff --git a/test/test_pm_sprint_com.rb b/test/test_pm_sprint_com.rb
index 8bd31e0..c584717 100644
--- a/test/test_pm_sprint_com.rb
+++ b/test/test_pm_sprint_com.rb
@@ -1,319 +1,319 @@
require "test_helper"
class TestPmSprintCom < Test::Unit::TestCase
include MMS2R::TestHelper
def mock_sprint_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_purged_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_ajax
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-success.json", "rb")
json = file.read
body.expects(:to_str).returns json
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('200')
response.expects(:content_type).twice.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
end
def mock_sprint_ajax_purged
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-failure.html", "rb")
error_html = file.read
body.expects(:to_str).returns error_html
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('500')
response.expects(:content_type).once.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
end
def test_mms_should_have_text
mail = mail('sprint-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068765309", mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert_equal true, File.exist?(file)
assert_match(/\.txt$/, File.basename(file))
assert_equal "Tea Pot", IO.read(file)
mms.purge
end
def test_mms_should_have_a_phone_number
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
mms.purge
end
def test_should_have_simple_video
mail = mail('sprint-video-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).once.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/quicktime']
assert_equal 1, mms.media['video/quicktime'].size
assert_equal "000_259e41e851be9b1d_1-0.mov", File.basename(mms.media['video/quicktime'][0])
mms.purge
end
def test_should_have_simple_image
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/001_2066c7013e7ca833_1-0.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
def test_collect_image_using_block
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
file_array = nil
mms.process do |k, v|
file_array = v if (k == 'image/jpeg')
assert_equal 1, file_array.size
file = file_array.first
assert_not_nil file = file_array.first
assert_equal "001_2066c7013e7ca833_1-0.jpg", File.basename(file)
end
mms.purge
end
def test_process_internals_should_only_be_executed_once
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
# second time through shouldn't go into the was_processed block
mms.mail.expects(:parts).never
mms.process{|k, v| }
mms.purge
end
def test_should_have_two_images
mail = mail('sprint-two-images-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).twice.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 2, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'][0]
assert_not_nil mms.media['image/jpeg'][1]
assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
mms.purge
end
def test_image_should_be_missing
# this test is questionable
mail = mail('sprint-broken-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_message_is_missing_in_mail
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media['text/plain'].size
# test that the message was extracted from the ajax response
- message = IO.readlines(mms.media['text/plain'].first).join("")
+ message = IO.read(mms.media['text/plain'].first)
assert_equal "First text content.", message
# test that the was removed ()
assert message.last.bytes.to_a != [194, 160]
mms.purge
end
def test_message_is_missing_in_mail_purged_from_content_server
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax_purged
mms = MMS2R::Media.new(mail)
assert_equal '5135455555', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_image_should_be_purged_from_content_server
mail = mail('sprint-image-01.mail')
mock_sprint_purged_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_body_should_return_empty_when_there_is_no_user_text
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.body
end
def test_sprint_write_file
mail = mock(:message_id => 'a')
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
mms = MMS2R::Media.new(mail, :process => :lazy)
type = 'text/plain'
content = 'foo'
file = Tempfile.new('sprint')
file.close
type, file = mms.send(:sprint_write_file, type, content, file.path)
assert_equal 'text/plain', type
assert_equal content, IO.read(file)
end
def test_subject
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
def test_new_subject
mail = mail('sprint-new-image-01.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
end
diff --git a/test/test_pxt_vodafone_net_nz.rb b/test/test_pxt_vodafone_net_nz.rb
index 1cb346f..3e9e0ae 100644
--- a/test/test_pxt_vodafone_net_nz.rb
+++ b/test/test_pxt_vodafone_net_nz.rb
@@ -1,33 +1,33 @@
require "test_helper"
class TestPxtVodafoneNetNz < Test::Unit::TestCase
include MMS2R::TestHelper
def setup
mail = mail('pxt-image-01.mail')
@mms = MMS2R::Media.new(mail)
assert_equal '+55512345', @mms.number
assert_equal 'pxt.vodafone.net.nz', @mms.carrier
end
def teardown
@mms.purge
end
def test_pxt_text_returns_text_plain
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
+ text = IO.read("#{file}")
assert_match(/Kia ora ano Luke/, text)
assert_match(/Kia ora ano Luke/, @mms.body)
end
def test_subject_should_clear_default_pxt_message
assert_equal "", @mms.subject
end
end
diff --git a/test/test_tmomail_net.rb b/test/test_tmomail_net.rb
index d0f79e9..f3691f6 100644
--- a/test/test_tmomail_net.rb
+++ b/test/test_tmomail_net.rb
@@ -1,110 +1,110 @@
require "test_helper"
class TestTmomailNet < Test::Unit::TestCase
include MMS2R::TestHelper
def test_ignore_simple_image
mail = mail('tmobile-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "tmomail.net", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/12-01-06_1234.jpg$/, mms.media['image/jpeg'][0])
assert_file_size mms.media['image/jpeg'][0], 337
mms.purge
end
def test_message_with_body_text
mail = mail('tmobile-image-02.mail')
mms = MMS2R::Media.new(mail)
assert_equal "16128675309", mms.number
assert_equal "tmomail.net", mms.carrier
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/07-25-05_0935.jpg$/, mms.media['image/jpeg'][0])
assert_file_size mms.media['image/jpeg'][0], 337
file = mms.media['text/plain'][0]
assert_not_nil file
assert File::exist?(file), "file #{file} does not exist"
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_equal "Lillies", text.strip
mms.purge
end
def test_image_from_blackberry
mail = mail('tmobile-blackberry.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "srs.bis.na.blackberry.com", mms.carrier
assert_nil mms.media['text/plain']
assert_not_nil mms.media['image/jpeg'].first
assert_match(/\/IMG00239\.jpg$/, mms.media['image/jpeg'].first)
mms.purge
end
def test_image_from_blackberry2
mail = mail('tmobile-blackberry-02.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal "example.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_not_nil mms.media['image/jpeg'].first
assert_match(/\/IMG00141\.jpg$/, mms.media['image/jpeg'].first)
mms.purge
end
def test_tmobile_uk_image_and_text_and_number
mail = mail('mmsreply.t-mobile.co.uk-text-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '12345678901', mms.number
assert_equal 'mmsreply.t-mobile.co.uk', mms.carrier
assert_equal 2, mms.media.size
assert_equal 1, mms.media['image/jpeg'].size
assert_equal 1, mms.media['text/plain'].size
assert_equal "Do you know this office? Do you know this office? Do \nyou know this office? Do you know this office?", mms.default_text.read
assert_file_size mms.media['image/jpeg'][0], 337
file = mms.default_media
assert_equal 'Image002.jpg', file.original_filename
mms.purge
end
def test_tmo_blackberry_net
mail = mail('tmo.blackberry.net-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal 'IMG00440.jpg', mms.subject
assert_equal 'tmo.blackberry.net', mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['image/jpeg'].size
assert_file_size mms.media['image/jpeg'][0], 337
file = mms.default_media
assert_equal 'IMG00440.jpg', file.original_filename
mms.purge
end
end
diff --git a/test/test_unicel_com.rb b/test/test_unicel_com.rb
index c4d971e..983babd 100644
--- a/test/test_unicel_com.rb
+++ b/test/test_unicel_com.rb
@@ -1,45 +1,45 @@
require "test_helper"
class TestUnicelCom < Test::Unit::TestCase
include MMS2R::TestHelper
def test_subject_number_image_unicel
mail = mail('unicel-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "joeexample", mms.number
assert_equal "unicel.com", mms.carrier
assert_equal "", mms.subject
assert_equal 2, mms.media.size
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['image/jpeg'].size
image = mms.media['image/jpeg'].detect{|f| /moto_0002\.jpg/ =~ f}
assert_equal 337, File.size(image)
file = mms.media['text/plain'][0]
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_match(/2068675309/, text)
mms.purge
end
def test_subject_number_image_info2go
mail = mail('info2go-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "", mms.subject
assert_equal "2068675309", mms.number
assert_equal "info2go.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['image/jpeg'].size
image = mms.media['image/jpeg'].detect{|f| /Image047\.jpeg/ =~ f}
assert_equal 337, File.size(image)
mms.purge
end
end
diff --git a/test/test_vzwpix_com.rb b/test/test_vzwpix_com.rb
index ba084cc..80ca14b 100644
--- a/test/test_vzwpix_com.rb
+++ b/test/test_vzwpix_com.rb
@@ -1,161 +1,161 @@
require "test_helper"
class TestVzwpixCom < Test::Unit::TestCase
include MMS2R::TestHelper
def setup
@ad_new = fixture_data('ad_new.txt')
@ad_old = %q{This message was sent using PIX-FLIX Messaging service from Verizon Wireless!
To learn how you can snap pictures with your wireless phone visit
www.verizonwireless.com/getitnow/getpix.}
@greet = "This message was sent using PIX-FLIX Messaging service from Verizon Wireless!"
end
def test_simple_video
# vzwpix.com service
mail = mail('verizon-video-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal 'vzwpix.com', mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/3gpp2'][0]
assert_match(/012345_67890.3g2$/, mms.media['video/3gpp2'][0])
assert_file_size mms.media['video/3gpp2'][0], 16553
mms.purge
end
def test_simple_image
# vzwpix.com service
mail = mail('verizon-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal 'vzwpix.com', mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/IMAGE_00004.jpg$/, mms.media['image/jpeg'][0])
assert_file_size mms.media['image/jpeg'][0], 337
mms.purge
end
def test_simple_image_new_message_april_2008
# vzwpix.com service
mail = mail('verizon-image-03.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal 'vzwpix.com', mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/0414082054.jpg$/, mms.media['image/jpeg'][0])
assert_file_size mms.media['image/jpeg'][0], 337
mms.purge
end
def test_simple_text
# vzwpix.com service
mail = mail('verizon-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal 'vzwpix.com', mms.carrier
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
file = mms.media['text/plain'][0]
assert_not_nil file
assert_equal true, File::exist?(file)
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_match(/hello world/, text)
mms.purge
end
def test_image_with_body_text
# vzwpix.com service
mail = mail('verizon-image-02.mail')
mms = MMS2R::Media.new(mail)
assert_equal "7018675309", mms.number
assert_equal 'vzwpix.com', mms.carrier
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/04-09-07_1114.jpg$/, mms.media['image/jpeg'][0])
assert_file_size mms.media['image/jpeg'][0], 337
file = mms.media['text/plain'][0]
assert_not_nil file
assert_equal true, File::exist?(file)
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_no_match(/Regexp.escape(@ad_old)/, text)
assert_no_match(/Regexp.escape@greet/, text)
assert_equal "? Weird", text
mms.purge
end
def test_new_vzpix_com_image_with_body_text
# vzwpix.com service
mail = mail('vzwpix.com-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal 'vzwpix.com', mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/0827092137.jpg$/, mms.media['image/jpeg'][0])
assert_file_size mms.media['image/jpeg'][0], 337
mms.purge
end
def test_simple_text_vtext
# vtext.com service
mail = mail('vtext-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal 'vtext.com', mms.carrier
assert_not_nil mms.media['text/plain']
file = mms.media['text/plain'][0]
assert_not_nil file
assert_equal true, File::exist?(file)
- text = IO.readlines("#{file}").join
+ text = IO.read("#{file}")
assert_match(/hello world/, text)
mms.purge
end
def test_image_from_blackberry
mail = mail('verizon-blackberry.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068675309", mms.number
assert_equal 'yahoo.com', mms.carrier
assert_not_nil mms.media['text/plain']
- assert_equal "Wonderful picture!", IO.readlines(mms.media['text/plain'].first).join.strip
+ assert_equal "Wonderful picture!", IO.read(mms.media['text/plain'].first).strip
assert_not_nil mms.media['image/jpeg'].first
assert_match(/\/IMG00016\.jpg$/, mms.media['image/jpeg'].first)
mms.purge
end
end
|
monde/mms2r
|
a7b2d34867925706bc5c77790f439e53f4b8e228
|
prep for 3.8.2 release
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 16d3b99..02c06fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- mms2r (3.8.1)
+ mms2r (3.8.2)
exifr (>= 1.0.3)
json (>= 1.6.0)
mail (>= 2.4.0)
nokogiri (>= 1.5.0)
rake (= 0.9.2.2)
GEM
remote: https://rubygems.org/
specs:
exifr (1.1.3)
i18n (0.6.0)
json (1.7.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.19)
mocha (0.11.4)
metaclass (~> 0.0.1)
multi_json (1.3.5)
nokogiri (1.5.5)
polyglot (0.3.3)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
simplecov (0.6.4)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
test-unit (2.4.8)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
mms2r!
mocha
rdoc
simplecov
test-unit
diff --git a/History.txt b/History.txt
index 59a6b35..32744d5 100644
--- a/History.txt
+++ b/History.txt
@@ -1,450 +1,456 @@
+### 3.8.2 / 2012-08-21 (Seth - Pickles The Drummer's brother)
+
+* 2 minor enhancements
+ * Broadened handling of generic "Sent from" footers in smart phones
+ * Add ability to process HTC Sensation footer
+
### 3.8.1 / 2012-07-22 (Calvert - Pickles The Drummer's dad)
* 1 major enhancement
* Support for Cincinnati Bell - mms.gocbw.com - James McGrath
### 3.8.0 / 2012-07-04 (Dr. Donald Gorfield â Comedy specialist)
* 1 major enhancement
* Handle MMS from Sprint that have their media attached rather than CDN'd
### 3.7.1 / 2012-06-04 (Abrigail Remeltindtdrinc - The Record Cleaner)
* 2 minor enhancements
* Improve processing of Sprint media - James McGrath
* RDoc format documentation - James McGrath
### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
* 2 major enhancements
* Improve processing of Sprint media - James McGrath
* Remove Hoe and gemcutter dependencies
### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
* 1 minor enhancement
* strip a variation of the iphone default footer
### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index d1d7fa5..448c31d 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
8
end
def self.patch
- 1
+ 2
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
|
monde/mms2r
|
797932b89dd4c94796e0acc1ea26d7d7f1f9095f
|
Process HTC Sensation footers.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 3e69efd..2c74a44 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,70 +1,73 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent (via|(from (my|your))) /im
+ - !ruby/regexp /\AFrom my HTC /im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent (via|(from (my|your))) .*/im
- "\\1"
+ - - !ruby/regexp /\A(.*?)From my HTC .*/im
+ - "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
boundary:
:motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:nokia: !ruby/regexp /^Nokia/i
:pantech: !ruby/regexp /^PANTECH$/i
:palm: !ruby/regexp /Palm/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:centro: !ruby/regexp /^Palm Centro$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/
:video: !ruby/regexp /\.3gp$/
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index 0a7c235..54e5317 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,707 +1,708 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
@oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@oldtmpdir)
FileUtils.mkdir_p(@oldconfdir)
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
end
end
def test_faux_user_agent
assert_equal "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2", MMS2R::Media::USER_AGENT
end
def test_class_parse
mms = mail('generic.mail')
assert_equal ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
+ assert_equal ['text/plain', ''], mms.transform_text('text/plain', "From my HTC Sensation 4G on T-Mobile. The first nationwide 4G network")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Windows Phone")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent via iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
# ASCII-8BIT -> D'ici un mois G\xE9orgie
# UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
else
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
end
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
duck_file = mms.send(:attachment, ['text'])
assert_equal 1, duck_file.size
assert_equal 'text/plain', duck_file.content_type
assert_equal "a", open(mms.media['text/plain'].first).read
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_folding_with_multipart_alternative_parts
mail = mail('helio-message-01.mail')
mms = MMS2R::Media.new(Mail.new)
assert_equal 5, mms.send(:folded_parts, mail.parts).size
end
def test_process_when_media_is_ignored
# TODO - I'd like to get away from mocks and test on real data, and
# this is covered repeatedly for various samples from the carrier
end
def test_process_when_yielding_to_a_block
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'image/jpeg'
assert_equal true, File.basename(files.first) == 'Photo_12.jpg'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_faux_tiff_iphone_device_type_by_exif
|
monde/mms2r
|
2433b3774e2afa745d6626345d4351872ad55fd2
|
Handle a wider range for "Sent from" footers used in smart phones.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 4d78f4e..3e69efd 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,79 +1,70 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- - !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- - !ruby/regexp /\ASent from my Windows Phone.*$/im
- - !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- - !ruby/regexp /\ASent (via|(from (my|your))) iPhone.?$/im
+ - !ruby/regexp /\ASent (via|(from (my|your))) /im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- - "\\1"
- - - !ruby/regexp /\A(.*?)Sent from my Windows Phone.*$/im
- - "\\1"
- - - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- - "\\1"
- - - !ruby/regexp /\A(.*?)Sent (via|(from (my|your))) iPhone.?$/im
+ - - !ruby/regexp /\A(.*?)Sent (via|(from (my|your))) .*/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
boundary:
:motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:nokia: !ruby/regexp /^Nokia/i
:pantech: !ruby/regexp /^PANTECH$/i
:palm: !ruby/regexp /Palm/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:centro: !ruby/regexp /^Palm Centro$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/
:video: !ruby/regexp /\.3gp$/
|
monde/mms2r
|
39d54863c1a48cf12fbfa0b615e2152be941257e
|
prepping 3.8.1 deploy
|
diff --git a/.gitignore b/.gitignore
index 72376a0..0dfe305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
.DS_Store
coverage/
pkg/
email.txt
coverage.info
mkmf.log
doc/
-.redcar/
diff --git a/Gemfile.lock b/Gemfile.lock
index b09dde5..16d3b99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- mms2r (3.8.0)
+ mms2r (3.8.1)
exifr (>= 1.0.3)
json (>= 1.6.0)
mail (>= 2.4.0)
nokogiri (>= 1.5.0)
rake (= 0.9.2.2)
GEM
remote: https://rubygems.org/
specs:
exifr (1.1.3)
i18n (0.6.0)
json (1.7.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.19)
mocha (0.11.4)
metaclass (~> 0.0.1)
multi_json (1.3.5)
nokogiri (1.5.5)
polyglot (0.3.3)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
simplecov (0.6.4)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
test-unit (2.4.8)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
mms2r!
mocha
rdoc
simplecov
test-unit
diff --git a/History.txt b/History.txt
index ee0405f..59a6b35 100644
--- a/History.txt
+++ b/History.txt
@@ -1,445 +1,450 @@
+### 3.8.1 / 2012-07-22 (Calvert - Pickles The Drummer's dad)
+
+* 1 major enhancement
+ * Support for Cincinnati Bell - mms.gocbw.com - James McGrath
+
### 3.8.0 / 2012-07-04 (Dr. Donald Gorfield â Comedy specialist)
* 1 major enhancement
* Handle MMS from Sprint that have their media attached rather than CDN'd
### 3.7.1 / 2012-06-04 (Abrigail Remeltindtdrinc - The Record Cleaner)
* 2 minor enhancements
* Improve processing of Sprint media - James McGrath
* RDoc format documentation - James McGrath
### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
* 2 major enhancements
* Improve processing of Sprint media - James McGrath
* Remove Hoe and gemcutter dependencies
### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
* 1 minor enhancement
* strip a variation of the iphone default footer
### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/Manifest.txt b/Manifest.txt
index ea3661f..d1564c2 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,188 +1,194 @@
-.gitignore
-Gemfile
-Gemfile.lock
-History.txt
-LICENSE
-Manifest.txt
-README.TMail.txt
-README.rdoc
-Rakefile
conf/1nbox.net.yml
conf/aliases.yml
conf/bellsouth.net.yml
conf/from.yml
conf/mediamessaging.o2.co.uk.yml
conf/messaging.nextel.com.yml
+conf/mms2r_media.yml
conf/mms.3ireland.ie.yml
conf/mms.ae.yml
conf/mms.alltel.com.yml
conf/mms.att.net.yml
conf/mms.dobson.net.yml
+conf/mms.gocbw.com.yml
conf/mms.luxgsm.lu.yml
conf/mms.mobileiam.ma.yml
conf/mms.mtn.co.za.yml
conf/mms.mycricket.com.yml
conf/mms.myhelio.com.yml
conf/mms.netcom.no.yml
conf/mms.o2online.de.yml
conf/mms.three.co.uk.yml
conf/mms.uscc.net.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/vmpix.com.yml
conf/vzwpix.com.yml
conf/waw.plspictures.com.yml
dev_tools/anonymizer.rb
dev_tools/debug_sprint_nokogiri_parsing.rb
+Gemfile
+Gemfile.lock
+.gitignore
+History.txt
init.rb
lib/ext/mail.rb
lib/ext/object.rb
-lib/mms2r.rb
lib/mms2r/media.rb
-lib/mms2r/version.rb
lib/mms2r/media/sprint.rb
+lib/mms2r.rb
+lib/mms2r/version.rb
+LICENSE
+Manifest.txt
mms2r.gemspec
+Rakefile
+README.rdoc
+README.TMail.txt
test/fixtures/1nbox-2images-01.mail
test/fixtures/1nbox-2images-02.mail
test/fixtures/1nbox-2images-03.mail
test/fixtures/1nbox-2images-04.mail
test/fixtures/3ireland-mms-01.mail
test/fixtures/ad_new.txt
test/fixtures/alltel-image-01.mail
test/fixtures/alltel-mms-01.mail
test/fixtures/alltel-mms-03.mail
test/fixtures/apple-double-image-01.mail
test/fixtures/att-blackberry-02.mail
test/fixtures/att-blackberry.mail
test/fixtures/att-image-01.mail
test/fixtures/att-image-02.mail
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/cincinnati-bell-image-01.mail
test/fixtures/cingularme-text-01.mail
test/fixtures/cingularme-text-02.mail
test/fixtures/dici_un_mois_georgie.txt
test/fixtures/dobson-image-01.mail
test/fixtures/dot.jpg
test/fixtures/generic.mail
test/fixtures/handsets.yml
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/invalid-byte-seq-outlook.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
test/fixtures/mmode-image-01.mail
test/fixtures/mms.ae-image-01.mail
test/fixtures/mms.mycricket.com-pic-and-text.mail
test/fixtures/mms.mycricket.com-pic.mail
test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail
test/fixtures/mobile.mycingular.com-text-01.mail
test/fixtures/mtn-southafrica-mms.mail
test/fixtures/mycingular-image-01.mail
test/fixtures/netcom-image-01.mail
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/o2-de-image-01.mail
-test/fixtures/orange-uk-image-01.mail
test/fixtures/orangefrance-text-and-image.mail
test/fixtures/orangepoland-text-01.mail
test/fixtures/orangepoland-text-02.mail
+test/fixtures/orange-uk-image-01.mail
test/fixtures/pics.cingularme.com-image-01.mail
test/fixtures/pxt-image-01.mail
test/fixtures/rogers-canada-mms-01.mail
test/fixtures/sasktel-image-01.mail
+test/fixtures/sprint-ajax-response-failure.html
+test/fixtures/sprint-ajax-response-success.json
test/fixtures/sprint-blackberry-01.mail
test/fixtures/sprint-broken-image-01.mail
test/fixtures/sprint-image-01.mail
+test/fixtures/sprint-image-missing-message.mail
+test/fixtures/sprint.mov
test/fixtures/sprint-new-image-01.mail
test/fixtures/sprint-pcs-text-01.mail
test/fixtures/sprint-purged-image-01.mail
test/fixtures/sprint-text-01.mail
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/tmo.blackberry.net-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/tmo.blackberry.net-image-01.mail
test/fixtures/unicel-image-01.mail
test/fixtures/us-cellular-image-01.mail
test/fixtures/verizon-blackberry.mail
test/fixtures/verizon-image-01.mail
test/fixtures/verizon-image-02.mail
test/fixtures/verizon-image-03.mail
test/fixtures/verizon-text-01.mail
test/fixtures/verizon-video-01.mail
-test/fixtures/virgin-mobile-image-01.mail
test/fixtures/virgin.ca-text-01.mail
+test/fixtures/virgin-mobile-image-01.mail
test/fixtures/vodacom4me-co-za-01.mail
test/fixtures/vodacom4me-co-za-02.mail
test/fixtures/vodacom4me-southafrica-mms-01.mail
test/fixtures/vodacom4me-southafrica-mms-04.mail
test/fixtures/vtext-text-01.mail
test/fixtures/vzwpix.com-image-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_helper.rb
test/test_invalid_byte_seq_outlook.rb
test/test_mediamessaging_o2_co_uk.rb
test/test_messaging_nextel_com.rb
test/test_messaging_sprintpcs_com.rb
test/test_mms2r_media.rb
test/test_mms_3ireland_ie.rb
test/test_mms_ae.rb
test/test_mms_alltel_com.rb
test/test_mms_att_net.rb
+test/test_mms_cincinnati_bell.rb
test/test_mms_dobson_net.rb
test/test_mms_luxgsm_lu.rb
test/test_mms_mobileiam_ma.rb
test/test_mms_mtn_co_za.rb
test/test_mms_mycricket_com.rb
test/test_mms_myhelio_com.rb
test/test_mms_netcom_no.rb
test/test_mms_o2online_de.rb
test/test_mms_three_co_uk.rb
test/test_mms_uscc_net.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_sprint.rb
test/test_tmomail_net.rb
test/test_unicel_com.rb
test/test_vmpix_com.rb
test/test_vzwpix_com.rb
test/test_waw_plspictures_com.rb
vendor/plugins/mms2r/lib/autotest/discover.rb
vendor/plugins/mms2r/lib/autotest/mms2r.rb
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index 9b2e05a..d1d7fa5 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
8
end
def self.patch
- 0
+ 1
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
|
monde/mms2r
|
5cabc4e5503d827ac6233859014ae52f70d8df02
|
added cincinnati bell to the list.
|
diff --git a/README.rdoc b/README.rdoc
index d44dd12..a2c80e4 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,222 +1,223 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
http://peepcode.com/products/mms2r-pdf
MMS2R is a library that decodes the parts of a 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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
+* Cincinnati Bell: mms.gocbw.com
=== Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
=== As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com[http://www.twitpic.com/]
* Simplton[http://simplton.com/]
* fanchatter.com[http://www.fanchatter.com/]
* camura.com[http://www.camura.com/]
* eachday.com[http://www.eachday.com/]
* beenup2.com[http://www.beenup2.com/]
* snapmylife.com[http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2012 by Mike Mondragon blog[http://plasti.cx/]
MMS2R's {Flickr page}[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl - blog[http://railspikes.com/]
* Will Jessup - blog[http://www.willjessup.com/]
* Shane Vitarana - blog[http://www.shanesbrain.net/]
* Layton Wedgeworth - company[http://www.beenup2.com/]
* Jason Haruska - blog[http://software.haruska.com/]
* Dave Myron - company[http://contentfree.com/]
* Vijay Yellapragada
* Jesse Dp - {github profile}[http://github.com/jessedp]
* David Alm
* Jeremy Wilkins
* Matt Conway - {github profile}[http://github.com/wr0ngway]
* Kai Kai
* Michael DelGaudio
* Sai Emrys - blog[http://saizai.com]
* Brendan Lim - {github profile}[http://github.com/brendanlim]
* Scott Taylor - {github profile}[http://github.com/smtlaissezfaire]
* Jaap van der Meer - {github profile}[http://github.com/japetheape]
* Karl Baum - {github profile}[http://github.com/kbaum]
* James McGrath - blog[http://jamespmcgrath.com]
|
monde/mms2r
|
ba507f5f3d4bd1d94a235b49a808dcc9cd0bf3ea
|
Added support for cincinnati bell (http://www.cincinnatibell.com/) with supporting tests.
|
diff --git a/.gitignore b/.gitignore
index 0dfe305..72376a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
.DS_Store
coverage/
pkg/
email.txt
coverage.info
mkmf.log
doc/
+.redcar/
diff --git a/conf/mms.gocbw.com.yml b/conf/mms.gocbw.com.yml
new file mode 100644
index 0000000..222008a
--- /dev/null
+++ b/conf/mms.gocbw.com.yml
@@ -0,0 +1,5 @@
+---
+transform:
+ text/plain:
+ - - !ruby/regexp /^This is an MMS message. Please go to .* to reply to the message.\n\n/i
+ - "\\1"
\ No newline at end of file
diff --git a/test/fixtures/cincinnati-bell-image-01.mail b/test/fixtures/cincinnati-bell-image-01.mail
new file mode 100644
index 0000000..2cb01a1
--- /dev/null
+++ b/test/fixtures/cincinnati-bell-image-01.mail
@@ -0,0 +1,2408 @@
+Return-Path: <[email protected]>
+Received: by 10.112.55.41 with SMTP id o9csp20103lbp; Sat, 14 Jul 2012 11:04:27 -0700
+Received: by 10.224.208.194 with SMTP id gd2mr10938716qab.96.1342289066653; Sat, 14 Jul 2012 11:04:26 -0700
+Received: from mms2.mms.gocbw.com (mms2.fuse.net. [216.68.79.212]) by mx.google.com with ESMTP id p19si4664151qct.73.2012.07.14.11.04.26; Sat, 14 Jul 2012 11:04:26 -0700
+Received: from opwvsmtp ([192.0.0.75]) by mms2.mms.gocbw.com (InterMail vM.8.00.01.00 201-2244-105-20090324) with SMTP id <20120714180404.JETY17608.mms2.mms.gocbw.com@opwvsmtp> for <[email protected]>; Sat, 14 Jul 2012 14:04:04 -0400
+Date: Sat, 14 Jul 2012 18:04:25 +0000
+From: [email protected]
+Sender: 12223334444 <[email protected]>
+To: [email protected]
+Message-ID: <20120714180404.JETY17608.mms2.mms.gocbw.com@opwvsmtp>
+Mime-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary=5001b4a959bfqwerty_0000;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+Delivered-To: [email protected]
+Received-SPF: neutral (google.com: 216.68.79.212 is neither permitted nor
+ denied by best guess record for domain of [email protected])
+ client-ip=216.68.79.212;
+Authentication-Results: mx.google.com; spf=neutral (google.com: 216.68.79.212
+ is neither permitted nor denied by best guess record for domain of
+ [email protected]) [email protected]
+
+This is a multi-part message in MIME format.
+
+--5001b4a959bfqwerty_0000
+Date: Sat, 14 Jul 2012 18:05:08 +0000
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=utf-8
+Content-Transfer-Encoding: 7bit
+Content-ID: <5001b4d46cb82_8169c261058f2@f5d30a94-bcc8-4419-8e57-cc39cc122f8d.mail>
+
+This is an MMS message. Please go to http://mms.gocbw.com:80/do/legacy/[email protected]&[email protected]&password=AMBGQG to view the message or go to http://mms.gocbw.com:80/do/legacy/[email protected]&[email protected]&password=AMBGQG to reply to the message.
+
+Wow! A facinating caption for the image.
+
+--5001b4a959bfqwerty_0000
+Date: Sat, 14 Jul 2012 18:05:08 +0000
+Mime-Version: 1.0
+Content-Type: image/jpeg;
+ charset=UTF-8;
+ name=test-file.jpg
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+ filename=test-file.jpg
+Content-ID: <test-file>
+
+/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJ
+ChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/
+2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgo
+KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAQAAwADASIAAhEBAxEB/8QA
+HwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUF
+BAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkK
+FhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1
+dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG
+x8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEB
+AQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAEC
+AxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRom
+JygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
+hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU
+1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD2nHFORyMY
+7UwyHG0jNOhj8wnHauo40PaUtVuzbgDtVEQsrkdKuQjaMnk1MikXi2DmnK6t
+VUP1BNKp55qLFl1eMVINp+tVlkBHJxSxsSTzSaGiwFByc0FFx1xVV5CvBOKi
++0Yzk800mFy0cCk3heDVZ5g6jHWm5JGTTsBY3jnFPQ55BxVZTzUoJI4oQEw6
+mkNRI2OtSqQaQEcke7kcGqrR46VoAA8VDJGcmmmIzSpyfSnIp7VZeP1FNGcc
+9adxJEYjycd6kVcGlA5yOtTJHnGaVykgVemPzq3HnbxUSAA88VOnHIqWNKxY
+iY96nB4FVlfJxj8aljzjPYVBa0JG6U0k9ulPHIpCPegbREfegUHHNIKZBMv3
+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
+k+mrOEQsTLI7cAZ9cVz/AMHPCWman4Qkn1CB3eW4fynEjAog+XA5xjINWde+
+IOjv4Z1CPfPDdy27xwxyRHLOw2gAjI6n1rH8FePI9H8G6dY6dAGnWHLSSnCq
+xJJwOp5PtVScLCVzqNd+FtiImnttR8hV+b/SlBA/4GMEV5Fr0FzplxNHHcLc
+2wOPMT95GfcE8/n+ddJq/iC81aTff3ck+OiE4Rfoo4rKkuMqfyrlnyvWKNFf
+qcJqt/JMPLMhERVh5asQpYjGdvTOCefetzTdVLwKrN91QOvboKz/ABDZ2S5l
+85bdic7M8H6DrUNjDcNCfIi2rxh5vlB/DrQ9QsdMt0WOM1WutUtrfiadAx6I
+Dlj+ArIkgSNN1/euyf3VPlp9OOTRbt+7zpWnSOh6yLHtX8WPJqb2AZqlxJeW
+zlbGRo1+YGb5PyHJqsmlIiB7idUGASIxjH4mtGK1ubh2866iUA4MVuQW/wDH
+quWmmafazM1zbLdvkbftbupH4g7f0ojJPqDVjHCWTsBBbyXrqo6Ayf8A1qnS
+PUCp8ixS3j9XYD/x1a6/Tm0m3jkVrGWNS5ckEuoz0HB6Ae1akC6RcEiCO0kP
+93AyPwPNdEaHPtJEOpboeb/ZLlQ5v7iWJDyBAi4/Pk1LBaaczvsMNxKBn53B
+b8nBr0G/SG0tWaC1gE7EJEojAy54Xt+P0BrI0jT7WS9mupY4Xht1NpCzKp8w
+g5kkPHOW4H0NS8PZ2cgVS+qRztzax+aHDiFooyAJIQF5x3HH/wCuoZrCWPfd
+2pEkioA8UaApKPrnORzjiuvurKwdyI42jJHWJto/Lp+lc1rOjXJ/fWcnmFf4
+V+V8fyP6Vg48rsnctO+pLFBGbOC4jmi+zTced5jIE9NwxxzwfQ9auSafcony
+zBuf4bhmB/OuHstRmj+22ku7ZPklWPIfv+f9K37fXY4YFE8ijHQZyTjk8VKV
+tLBcsXemXa5eEOr93Upk/XHJqj/aV7YYFzbrMo6ll2k/jinzeJ49u22hmlz6
+Lx+uKoXmtXzxugijRMcF26/hTUGx8xt2up2Wo27mJVDqPnjdQrL+Hce9WLIx
++SqmNOPauPsLK7uUaSBJ3l3KQbaIn+96DHeum0q01K8gD29i/lgspaZ1TJBw
+eMk9Qe1WsPJvRE866mlIItpwmM91O3+VVp9v8DuMcfez/Orkeham4xLPZwgn
+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
+Skf/2Q==
+
+
+--5001b4a959bfqwerty_0000--
diff --git a/test/test_mms_cincinnati_bell.rb b/test/test_mms_cincinnati_bell.rb
new file mode 100644
index 0000000..8231f5c
--- /dev/null
+++ b/test/test_mms_cincinnati_bell.rb
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class TestMmsCincinnatiBell < Test::Unit::TestCase
+ include MMS2R::TestHelper
+
+ def test_mms_image_cincinnati_bell
+ # sms.sasktel.com service
+ mail = mail('cincinnati-bell-image-01.mail')
+ mms = MMS2R::Media.new(mail)
+ assert_equal "12223334444", mms.number
+ assert_equal "mms.gocbw.com", mms.carrier
+ assert_equal "", mms.subject
+ assert_nil mms.media['text/html']
+ assert_nil mms.media['image/gif']
+ # we have media and text, to 2 media items
+ assert_equal 2, mms.media.size
+ assert_not_nil mms.media['image/jpeg']
+ assert_equal 1, mms.media['image/jpeg'].size
+ assert_match(/test-file.jpg$/, mms.media['image/jpeg'].first)
+ assert_file_size(mms.media['image/jpeg'].first, 106024)
+ mms.purge
+ end
+
+end
|
monde/mms2r
|
be8fdcf8785838400101b6e4dfe42f4f84b91d1a
|
Notes for shipping 3.8.0
|
diff --git a/History.txt b/History.txt
index b6441a9..ee0405f 100644
--- a/History.txt
+++ b/History.txt
@@ -1,440 +1,445 @@
+### 3.8.0 / 2012-07-04 (Dr. Donald Gorfield â Comedy specialist)
+
+* 1 major enhancement
+ * Handle MMS from Sprint that have their media attached rather than CDN'd
+
### 3.7.1 / 2012-06-04 (Abrigail Remeltindtdrinc - The Record Cleaner)
* 2 minor enhancements
* Improve processing of Sprint media - James McGrath
* RDoc format documentation - James McGrath
### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
* 2 major enhancements
* Improve processing of Sprint media - James McGrath
* Remove Hoe and gemcutter dependencies
### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
* 1 minor enhancement
* strip a variation of the iphone default footer
### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index 627ea75..9b2e05a 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
- 7
+ 8
end
def self.patch
- 1
+ 0
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
|
monde/mms2r
|
33ff5daa5acd8fea363eef4e5d549097f59c2ee5
|
Refactor to account for some Sprint messages having attached files and rather than being hosted on their CDN.
|
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index 85290ca..50d86e2 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -1,845 +1,860 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
##
# = Synopsis
#
# MMS2R is a library to collect media files from MMS messages. MMS messages
# are multipart emails and mobile carriers often inject branding into these
# messages. MMS2R strips the advertising from an MMS leaving the actual user
# generated media.
#
# The Tracker for MMS2R is located at
# http://rubyforge.org/tracker/?group_id=3065
# Please submit bugs and feature requests using the Tracker.
#
# If MMS from a carrier not known by MMS2R is encountered please submit a
# sample to the author for inclusion in this project.
#
# == Stand Alone Example
#
# begin
# require 'mms2r'
# rescue LoadError
# require 'rubygems'
# require 'mms2r'
# end
# mail = Mail.read("sample-MMS.file")
# mms = MMS2R::Media.new(mail)
# subject = mms.subject
# number = mms.number
# file = mms.default_media
# mms.purge
#
# == Rails ActionMailer#receive w/ AttachmentFu Example
#
# def receive(mail)
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
# See the README.rdoc file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
@body.force_encoding("ISO-8859-1") if RUBY_VERSION >= "1.9" && @body.encoding == "ASCII-8BIT"
begin
ic = Iconv.new('UTF-8', 'ISO-8859-1' )
@body = ic.iconv(@body)
@body << ic.iconv(nil)
ic.close
rescue Exception => e
end
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
- def process() # :yields: media_type, file
+ def process # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
- parts = mail.multipart? ? mail.parts : [mail]
-
- # Double check for multipart/related, if it exists replace it with its
- # children parts. Do this twice as multipart/alternative can have
- # children and we want to fold everything down
- for i in 1..2
- flat = []
- parts.each do |p|
- if p.multipart?
- p.parts.each {|mp| flat << mp }
- else
- flat << p
- end
- end
- parts = flat.dup
- end
-
- # get to work
- parts.each do |p|
- t = p.part_type?
- unless ignore_media?(t,p)
- t,f = process_media(p)
- add_file(t,f) unless t.nil? || f.nil?
+ parts = self.folded_parts(mail)
+ parts.each do |part|
+ if part.part_type? == 'text/html'
+ process_html_part(part)
+ else
+ process_part(part)
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
+ ##
+ # Helper to decide if a part should be kept or ignored
+
+ def process_part(part)
+ return if ignore_media?(part.part_type?, part)
+
+ type, file = process_media(part)
+ add_file(type, file) unless type.nil? || file.nil?
+ end
+
+ ##
+ # Helper to decide if a html part should be kept or ignored.
+ # We are defining it here primarily for the benefit so that Sprint
+ # can override a special case for processing.
+
+ def process_html_part(part)
+ process_part(part)
+ end
+
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
begin
ic = Iconv.new('UTF-8', original_encoding )
utf_t = ic.iconv(text)
utf_t << ic.iconv(nil)
ic.close
rescue Exception => e
utf_t = text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
- def purge()
+ def purge
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
- def msg_tmp_dir()
+ def msg_tmp_dir
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :nokia
# * :palm
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header].decoded =~ regex
field = mail.header.fields.detect { |field| field.name == header }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
boundary = mail.boundary
boundaries = config['device_types']['boundary'] rescue {}
boundaries.each do |type, regex|
return type if boundary =~ regex
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
- private
+ protected
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
+ ##
+ # Helper to fold all the parts of multipart mail down into a flat array.
+ # multipart/related and multipart/alternative parts can have child parts.
+ def folded_parts(parts)
+ return folded_parts([parts]) unless parts.respond_to?(:each)
+
+ result = [] # NOTE could use #tap but want 1.8.7 compat
+ parts.each do |part|
+ result << (part.multipart? ? folded_parts(part.parts) : part)
+ end
+ result.flatten
+ end
+
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
next unless File.exist?(path)
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index 08cfe94..5e3133d 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,249 +1,222 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
require 'json'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
- ##
- # Override process() because Sprint doesn't attach media (images, video,
- # etc.) to its MMS. Media such as images and videos are hosted on a
- # Sprint content server. MMS2R::Media::Sprint has to pick apart an
- # HTML attachment to find the URL to the media on Sprint's content
- # server and download each piece of content. Any text message part of
- # the MMS if it exists is embedded in the html.
-
- def process
- unless @was_processed
- log("#{self.class} processing", :info)
- #sprint MMS are multipart
- parts = @mail.parts
-
- #find the payload html
- doc = nil
- parts.each do |p|
- next unless p.part_type? == 'text/html'
- d = Nokogiri(p.body.decoded)
- title = d.at('title').inner_html
- if title =~ /You have new Picture Mail!/
- doc = d
- @is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
- end
- end
- return if doc.nil? # it was a dud
- @is_video ||= false
-
- # break it down
- sprint_phone_number(doc)
- sprint_process_text(doc)
- sprint_process_media(doc)
-
- @was_processed = true
- end
-
- # when process acts upon a block
- if block_given?
- media.each do |k, v|
- yield(k, v)
- end
- end
+ protected
+ ##
+ # Helper to process old style media on the Sprint CDN which didn't attach
+ # media (images, video, etc.) to its MMS. Media such as images and
+ # videos are hosted on a Sprint content server. MMS2R::Media::Sprint has
+ # to pick apart an HTML attachment to find the URL to the media on
+ # Sprint's content server and download each piece of content. Any text
+ # message part of the MMS if it exists is embedded in the html.
+
+ def process_html_part(part)
+ doc = Nokogiri(part.body.decoded)
+
+ is_video = (part.body.decoded =~ /type="VIDEO">/m ? true : false)
+ sprint_process_media(doc, is_video)
+ sprint_process_text(doc)
+ sprint_phone_number(doc)
end
- private
-
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
- @number = / name="MDN">(\d+)</.match(t)[1]
+ matched = / name="MDN">(\d+)</.match(t)
+ @number = matched[1] if matched
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
# if there is no text media found in the mail body - then we go to more
# extreme measures.
text_found = false
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
next if text.empty?
text_found = true
type, text = transform_text(type, text)
type, file = sprint_write_file(type, text.strip)
add_file(type, file) unless type.nil? || file.nil?
end
# if no text was found, there still might be a message with images
# that can be seen at the end of the "View Entire Message" link
if !text_found
view_entire_message_link = doc.search("a").find { |link| link.inner_html == "View Entire Message"}
# if we can't find the view entire message link, give up
if view_entire_message_link
# Sprint uses AJAX/json to serve up the content at the end of the link so this is conveluted
url = view_entire_message_link.attr("href")
# extract the "invite" param out of the url - this will be the id we pass to the ajax path below
inviteMessageId = CGI::parse(URI::parse(url).query)["invite"].first
if inviteMessageId
json_url = "http://pictures.sprintpcs.com/ui-refresh/guest/getMessageContainerJSON.do%3FcomponentType%3DmediaDetail&invite=#{inviteMessageId}&externalMessageId=#{inviteMessageId}"
# pull down the json from the url and parse it
uri = URI.parse(json_url)
connection = Net::HTTP.new(uri.host, uri.port)
response = connection.get2(
uri.request_uri,
{ "User-Agent" => MMS2R::Media::USER_AGENT }
)
content = response.body
# if the content has expired, sprint sends back html "content expired page
# json will fail to parse
begin
json = JSON.parse(content)
# there may be multiple "results" in the json - due to multiple images
# cycle through them and extract the "description" which is the text
# message the sender sent with the images
json["Results"].each do |result|
type = 'text/plain'
# remove any chars from the resulting text
text = result["description"] ? result["description"].gsub(/[[:space:]]/, " ").strip : nil
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?
end
rescue JSON::ParserError => e
log("#{self.class} processing error, #{$!}", :error)
end
end
end
end
end
##
# Fetch all the media that is referred to in the doc
- def sprint_process_media(doc)
+ def sprint_process_media(doc, is_video=false)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
- unless @is_video
+ unless is_video
query={}
uri.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
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
+ uri.query = uri.query.gsub(/&/, "&") if is_video
connection = Net::HTTP.new(uri.host, uri.port)
#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
end
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
# force the encoding to be utf-8
content = content.force_encoding("UTF-8") if content.respond_to?(:force_encoding)
File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index d3db314..0a7c235 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,878 +1,808 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
@oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@oldtmpdir)
FileUtils.mkdir_p(@oldconfdir)
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
end
end
def test_faux_user_agent
assert_equal "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2", MMS2R::Media::USER_AGENT
end
def test_class_parse
mms = mail('generic.mail')
assert_equal ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Windows Phone")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent via iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
# ASCII-8BIT -> D'ici un mois G\xE9orgie
# UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
else
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
end
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
- temp_big = temp_text_file("hello world")
- size = File.size(temp_text_file("hello world"))
- temp_small = temp_text_file("hello")
- mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
- assert_not_nil duck_file
- assert_equal true, File::exist?(duck_file)
- assert_equal true, File::exist?(temp_big)
- assert_equal temp_big, duck_file.local_path
- assert_equal File.basename(temp_big), duck_file.original_filename
- assert_equal size, duck_file.size
+ assert_equal 1, duck_file.size
assert_equal 'text/plain', duck_file.content_type
+ assert_equal "a", open(mms.media['text/plain'].first).read
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
- def test_process_with_multipart_alternative_parts
- mail = stub_mail
-
- plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
- plain.stubs(:multipart?).at_least_once.returns(false)
-
- html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
- html.stubs(:multipart?).at_least_once.returns(false)
-
- multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
- multi.stubs(:multipart?).at_least_once.returns(true)
-
- mail.stubs(:multipart?).at_least_once.returns(true)
- mail.stubs(:parts).at_least_once.returns([multi])
-
- # the multipart/alternative should get flattend to text and html
- mms = MMS2R::Media.new(mail)
- assert_equal 2, mms.media.size
- assert_equal 2, mms.media.size
- assert_not_nil mms.media['text/plain']
- assert_not_nil mms.media['text/html']
- assert_equal 1, mms.media['text/plain'].size
- assert_equal 1, mms.media['text/html'].size
- assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
- assert_equal 'message.html', File.basename(mms.media['text/html'].first)
- assert_equal true, File.exist?(mms.media['text/plain'].first)
- assert_equal true, File.exist?(mms.media['text/html'].first)
- assert_equal 1, File.size(mms.media['text/plain'].first)
- assert_equal 1, File.size(mms.media['text/html'].first)
- mms.purge
+ def test_folding_with_multipart_alternative_parts
+ mail = mail('helio-message-01.mail')
+ mms = MMS2R::Media.new(Mail.new)
+ assert_equal 5, mms.send(:folded_parts, mail.parts).size
end
def test_process_when_media_is_ignored
- mail = stub_mail
- plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
- plain.stubs(:multipart?).at_least_once.returns(false)
-
- html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
- html.stubs(:multipart?).at_least_once.returns(false)
-
-
- multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
- multi.stubs(:multipart?).at_least_once.returns(true)
-
- mail.stubs(:multipart?).at_least_once.returns(true)
- mail.stubs(:parts).at_least_once.returns([multi])
-
- mms = MMS2R::Media.new(mail, :process => :lazy)
- mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
- 'text/html' => ['message.html']}})
- assert_nothing_raised { mms.process }
- # the multipart/alternative should get flattend to text and html and then
- # what's flattened is ignored
- assert_equal 0, mms.media.size
- mms.purge
+ # TODO - I'd like to get away from mocks and test on real data, and
+ # this is covered repeatedly for various samples from the carrier
end
def test_process_when_yielding_to_a_block
- mail = stub_mail
-
- plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
- plain.stubs(:multipart?).at_least_once.returns(false)
-
- html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
- html.stubs(:multipart?).at_least_once.returns(false)
-
- multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
- multi.stubs(:multipart?).at_least_once.returns(true)
-
- mail.stubs(:multipart?).at_least_once.returns(true)
- mail.stubs(:parts).at_least_once.returns([multi])
-
- # the multipart/alternative should get flattend to text and html
+ mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
- assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
- assert_equal true, type == 'text/plain' || type == 'text/html'
- assert_equal true, File.basename(files.first) == 'message.txt' ||
- File.basename(files.first) == 'message.html'
+ assert_equal true, type == 'image/jpeg'
+ assert_equal true, File.basename(files.first) == 'Photo_12.jpg'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_faux_tiff_iphone_device_type_by_exif
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_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)
assert_equal :dash, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_droid_device_type_by_exif
mail = smart_phone_mock('Motorola', 'Droid')
mms = MMS2R::Media.new(mail)
assert_equal :droid, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_eris_device_type_by_exif
mail = smart_phone_mock('HTC', 'Eris')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_hero_device_type_by_exif
mail = smart_phone_mock('HTC', 'HERO200')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
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|
mail = smart_phone_mock(handset.first, handset.last)
mms = MMS2R::Media.new(mail)
assert_equal true, mms.is_mobile?, "mms with make #{mms.exif.make}, and model #{mms.exif.model}, should be considered a mobile device"
end
end
def test_blackberry_device_type
berries = ['att-blackberry.mail',
'suncom-blackberry.mail',
'tmobile-blackberry-02.mail',
'tmobile-blackberry.mail',
'tmo.blackberry.net-image-01.mail',
'verizon-blackberry.mail',
'verizon-blackberry.mail']
berries.each do |berry|
mms = MMS2R::Media.new(mail(berry))
assert_equal :blackberry, mms.device_type?, "fixture #{berry} was not a blackberrry"
assert_equal true, mms.is_mobile?
end
end
def test_handset_device_type
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal :handset, mms.device_type?
assert_equal true, mms.is_mobile?
end
end
diff --git a/test/test_mms_myhelio_com.rb b/test/test_mms_myhelio_com.rb
index 6157980..6069179 100644
--- a/test/test_mms_myhelio_com.rb
+++ b/test/test_mms_myhelio_com.rb
@@ -1,66 +1,67 @@
require "test_helper"
class TestMmsMyhelioCom < Test::Unit::TestCase
include MMS2R::TestHelper
def test_only_valid_content_should_be_retained_for_mms_with_image_and_text
mail = mail('helio-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "mms.myhelio.com", mms.carrier
assert_equal 2, mms.media.size
assert_equal 1, mms.media['image/jpeg'].size
assert_equal 1, mms.media['text/plain'].size
mms.purge
end
def test_only_valid_content_should_be_retained_for_mms_with_text
mail = mail('helio-message-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "mms.myhelio.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
+ assert_equal "Test message", open(mms.media['text/plain'].first).read
mms.purge
end
def test_number_should_return_correct_number
mail = mail('helio-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "mms.myhelio.com", mms.carrier
mms.purge
end
def test_subject_should_return_correct_subject
mail = mail('helio-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "mms.myhelio.com", mms.carrier
title = mms.subject()
assert_equal title, "Test image"
mms.purge
end
def test_body_should_return_correct_body
mail = mail('helio-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "mms.myhelio.com", mms.carrier
body = mms.body()
assert_equal body, "Test image"
mms.purge
end
def test_attachment_should_return_jpeg
mail = mail('helio-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "5551234", mms.number
assert_equal "mms.myhelio.com", mms.carrier
image = mms.default_media()
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/0628070005.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
end
diff --git a/test/test_pm_sprint_com.rb b/test/test_pm_sprint_com.rb
index c5a6b23..8bd31e0 100644
--- a/test/test_pm_sprint_com.rb
+++ b/test/test_pm_sprint_com.rb
@@ -1,320 +1,319 @@
require "test_helper"
class TestPmSprintCom < Test::Unit::TestCase
include MMS2R::TestHelper
def mock_sprint_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_purged_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_ajax
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-success.json", "rb")
json = file.read
body.expects(:to_str).returns json
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('200')
response.expects(:content_type).twice.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
end
def mock_sprint_ajax_purged
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-failure.html", "rb")
error_html = file.read
body.expects(:to_str).returns error_html
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('500')
response.expects(:content_type).once.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
end
def test_mms_should_have_text
mail = mail('sprint-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068765309", mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert_equal true, File.exist?(file)
assert_match(/\.txt$/, File.basename(file))
assert_equal "Tea Pot", IO.read(file)
mms.purge
end
def test_mms_should_have_a_phone_number
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
mms.purge
end
def test_should_have_simple_video
mail = mail('sprint-video-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).once.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/quicktime']
assert_equal 1, mms.media['video/quicktime'].size
assert_equal "000_259e41e851be9b1d_1-0.mov", File.basename(mms.media['video/quicktime'][0])
mms.purge
end
def test_should_have_simple_image
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/001_2066c7013e7ca833_1-0.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
def test_collect_image_using_block
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
file_array = nil
mms.process do |k, v|
file_array = v if (k == 'image/jpeg')
assert_equal 1, file_array.size
file = file_array.first
assert_not_nil file = file_array.first
assert_equal "001_2066c7013e7ca833_1-0.jpg", File.basename(file)
end
mms.purge
end
def test_process_internals_should_only_be_executed_once
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
# second time through shouldn't go into the was_processed block
mms.mail.expects(:parts).never
mms.process{|k, v| }
mms.purge
end
def test_should_have_two_images
mail = mail('sprint-two-images-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).twice.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 2, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'][0]
assert_not_nil mms.media['image/jpeg'][1]
assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
mms.purge
end
def test_image_should_be_missing
# this test is questionable
mail = mail('sprint-broken-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_message_is_missing_in_mail
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media['text/plain'].size
# test that the message was extracted from the ajax response
message = IO.readlines(mms.media['text/plain'].first).join("")
assert_equal "First text content.", message
# test that the was removed ()
assert message.last.bytes.to_a != [194, 160]
mms.purge
end
def test_message_is_missing_in_mail_purged_from_content_server
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax_purged
mms = MMS2R::Media.new(mail)
assert_equal '5135455555', mms.number
assert_equal "pm.sprint.com", mms.carrier
-
assert_equal 0, mms.media.size
mms.purge
end
def test_image_should_be_purged_from_content_server
mail = mail('sprint-image-01.mail')
mock_sprint_purged_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_body_should_return_empty_when_there_is_no_user_text
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.body
end
def test_sprint_write_file
mail = mock(:message_id => 'a')
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
mms = MMS2R::Media.new(mail, :process => :lazy)
type = 'text/plain'
content = 'foo'
file = Tempfile.new('sprint')
file.close
type, file = mms.send(:sprint_write_file, type, content, file.path)
assert_equal 'text/plain', type
assert_equal content, IO.read(file)
end
def test_subject
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
def test_new_subject
mail = mail('sprint-new-image-01.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
end
|
monde/mms2r
|
dd48f0a1fa88d8523bebc33503db3b9ab71d3c58
|
Additional rules on what parts to ignore from Sprint
|
diff --git a/conf/pm.sprint.com.yml b/conf/pm.sprint.com.yml
index 616196b..bff55ff 100644
--- a/conf/pm.sprint.com.yml
+++ b/conf/pm.sprint.com.yml
@@ -1,14 +1,16 @@
---
ignore:
text/html:
- !ruby/regexp /We're sorry, this page is not available. We apologize for the inconvenience./mi
text/plain:
- !ruby/regexp /You have new [Picture|Video] Mail!\s+Click Go\/View to see now./mi
+ - !ruby/regexp /You have received a Picture Mail from /mi
+ - !ruby/regexp /Click Go\/View to see/mi
transform:
text/plain:
- - !ruby/regexp /^You have new Picture Mail!$/i
- ""
- - !ruby/regexp /^New Message$/i
- ""
- - !ruby/regexp /^PictureMail$/i
- ""
|
monde/mms2r
|
96d250d656581d15b9988133f9a9d941e536f6b1
|
print debugging info about an mms2r object
|
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index c0a8133..66e9651 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,78 +1,131 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# Spoof User-Agent, primarily for the Sprint CDN
USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2"
end
+ ##
# Simple convenience function to make it a one-liner:
- # MMS2R.parse raw_mail or MMS2R.parse File.load(raw_mail)
+ # MMS2R.parse raw_mail or
+ # MMS2R.parse File.load(file)
+ # MMS2R.parse File.load(path_to_file)
# Combined w/ the method_missing delegation, this should behave as an enhanced Mail object, more or less.
- def self.parse raw_mail, options = {}
- mail = Mail.new raw_mail
+
+ def self.parse thing, options = {}
+ mail = case
+ when File.exist?(thing); Mail.new(open(thing).read)
+ when thing.respond_to?(:read); Mail.new(thing.read)
+ else
+ Mail.new(thing)
+ end
+
MMS2R::Media.new(mail, options)
end
+ ##
+ # Compare original MMS2R results with original mail values and other metrics.
+ #
+ # Takes a file path, mms2r object, mail object, or mail text blob.
+
+ def self.debug(thing, options = {})
+ mms = case thing
+ when MMS2R::Media; thing
+ when Mail::Message; MMS2R::Media.new(thing, options)
+ else
+ self.parse(thing, options)
+ end
+
+ <<OUT
+#{'-' * 80}
+
+ original mail
+ #{'from:'.ljust(15)} #{mms.mail.from}
+ #{'to:'.ljust(15)} #{mms.mail.to}
+ #{'subject:'.ljust(15)} #{mms.mail.subject}
+
+ mms2r
+ #{'from:'.ljust(15)} #{mms.from}
+ #{'to:'.ljust(15)} #{mms.to}
+ #{'subject:'.ljust(15)} #{mms.subject}
+ #{'number:'.ljust(15)} #{mms.number}
+
+ default media
+ #{mms.default_media.inspect}
+
+ default text
+ #{mms.default_text.inspect}
+ #{mms.default_text.read if mms.default_text}
+
+ all plain text
+ #{(mms.media['text/plain']||[]).each {|t| open(t).read}.join("\n\n")}
+
+ media hash
+ #{mms.media.inspect}
+
+OUT
+ end
+
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
if RUBY_VERSION >= "1.9"
begin
require 'psych'
YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
rescue LoadError
end
end
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
|
monde/mms2r
|
b2600aa1a3fe68804f6167d0c1a95fec454cdb40
|
Tidy some grammar.
|
diff --git a/README.rdoc b/README.rdoc
index 07beded..d44dd12 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,222 +1,222 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
http://peepcode.com/products/mms2r-pdf
-MMS2R is a library that decodes the parts of an MMS message to disk while
+MMS2R is a library that decodes the parts of a 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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
=== Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
=== As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com[http://www.twitpic.com/]
* Simplton[http://simplton.com/]
* fanchatter.com[http://www.fanchatter.com/]
* camura.com[http://www.camura.com/]
* eachday.com[http://www.eachday.com/]
* beenup2.com[http://www.beenup2.com/]
* snapmylife.com[http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2012 by Mike Mondragon blog[http://plasti.cx/]
MMS2R's {Flickr page}[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl - blog[http://railspikes.com/]
* Will Jessup - blog[http://www.willjessup.com/]
* Shane Vitarana - blog[http://www.shanesbrain.net/]
* Layton Wedgeworth - company[http://www.beenup2.com/]
* Jason Haruska - blog[http://software.haruska.com/]
* Dave Myron - company[http://contentfree.com/]
* Vijay Yellapragada
* Jesse Dp - {github profile}[http://github.com/jessedp]
* David Alm
* Jeremy Wilkins
* Matt Conway - {github profile}[http://github.com/wr0ngway]
* Kai Kai
* Michael DelGaudio
* Sai Emrys - blog[http://saizai.com]
* Brendan Lim - {github profile}[http://github.com/brendanlim]
* Scott Taylor - {github profile}[http://github.com/smtlaissezfaire]
* Jaap van der Meer - {github profile}[http://github.com/japetheape]
* Karl Baum - {github profile}[http://github.com/kbaum]
* James McGrath - blog[http://jamespmcgrath.com]
diff --git a/mms2r.gemspec b/mms2r.gemspec
index 6525e3e..23e4244 100644
--- a/mms2r.gemspec
+++ b/mms2r.gemspec
@@ -1,33 +1,33 @@
$:.unshift File.expand_path("../lib", __FILE__)
require "mms2r/version"
Gem::Specification.new do |gem|
gem.add_dependency 'rake', ['= 0.9.2.2']
gem.add_dependency 'nokogiri', ['>= 1.5.0']
gem.add_dependency 'mail', ['>= 2.4.0']
gem.add_dependency 'exifr', ['>= 1.0.3']
gem.add_dependency 'json', ['>= 1.6.0']
gem.add_development_dependency "rdoc"
gem.add_development_dependency "simplecov"
gem.add_development_dependency 'test-unit'
gem.add_development_dependency 'mocha'
gem.name = "mms2r"
gem.version = MMS2R::Version.to_s
gem.platform = Gem::Platform::RUBY
gem.authors = ["Mike Mondragon"]
gem.email = ["[email protected]"]
gem.homepage = "https://github.com/monde/mms2r"
gem.summary = "Extract user media from MMS (and not carrier cruft)"
- gem.description = "MMS2R is a library that decodes the parts of an MMS message to disk while stripping out advertising injected by the mobile carriers."
+ gem.description = "MMS2R is a library that decodes the parts of a MMS message to disk while stripping out advertising injected by the mobile carriers."
gem.rubyforge_project = "mms2r"
gem.rubygems_version = ">= 1.3.6"
gem.files = `git ls-files`.split("\n")
gem.require_path = ['lib']
gem.rdoc_options = ["--main", "README.rdoc"]
gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.rdoc"]
gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
end
|
monde/mms2r
|
89521560f2d3589617aa54e5d6ac361ab604688e
|
clean up README refs for gem packaging
|
diff --git a/Manifest.txt b/Manifest.txt
index 87d3878..ea3661f 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,188 +1,188 @@
.gitignore
Gemfile
Gemfile.lock
History.txt
LICENSE
Manifest.txt
README.TMail.txt
-README.txt
+README.rdoc
Rakefile
conf/1nbox.net.yml
conf/aliases.yml
conf/bellsouth.net.yml
conf/from.yml
conf/mediamessaging.o2.co.uk.yml
conf/messaging.nextel.com.yml
conf/mms.3ireland.ie.yml
conf/mms.ae.yml
conf/mms.alltel.com.yml
conf/mms.att.net.yml
conf/mms.dobson.net.yml
conf/mms.luxgsm.lu.yml
conf/mms.mobileiam.ma.yml
conf/mms.mtn.co.za.yml
conf/mms.mycricket.com.yml
conf/mms.myhelio.com.yml
conf/mms.netcom.no.yml
conf/mms.o2online.de.yml
conf/mms.three.co.uk.yml
conf/mms.uscc.net.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/vmpix.com.yml
conf/vzwpix.com.yml
conf/waw.plspictures.com.yml
dev_tools/anonymizer.rb
dev_tools/debug_sprint_nokogiri_parsing.rb
init.rb
lib/ext/mail.rb
lib/ext/object.rb
lib/mms2r.rb
lib/mms2r/media.rb
lib/mms2r/version.rb
lib/mms2r/media/sprint.rb
mms2r.gemspec
test/fixtures/1nbox-2images-01.mail
test/fixtures/1nbox-2images-02.mail
test/fixtures/1nbox-2images-03.mail
test/fixtures/1nbox-2images-04.mail
test/fixtures/3ireland-mms-01.mail
test/fixtures/ad_new.txt
test/fixtures/alltel-image-01.mail
test/fixtures/alltel-mms-01.mail
test/fixtures/alltel-mms-03.mail
test/fixtures/apple-double-image-01.mail
test/fixtures/att-blackberry-02.mail
test/fixtures/att-blackberry.mail
test/fixtures/att-image-01.mail
test/fixtures/att-image-02.mail
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/dici_un_mois_georgie.txt
test/fixtures/dobson-image-01.mail
test/fixtures/dot.jpg
test/fixtures/generic.mail
test/fixtures/handsets.yml
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/invalid-byte-seq-outlook.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
test/fixtures/mmode-image-01.mail
test/fixtures/mms.ae-image-01.mail
test/fixtures/mms.mycricket.com-pic-and-text.mail
test/fixtures/mms.mycricket.com-pic.mail
test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail
test/fixtures/mobile.mycingular.com-text-01.mail
test/fixtures/mtn-southafrica-mms.mail
test/fixtures/mycingular-image-01.mail
test/fixtures/netcom-image-01.mail
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/o2-de-image-01.mail
test/fixtures/orange-uk-image-01.mail
test/fixtures/orangefrance-text-and-image.mail
test/fixtures/orangepoland-text-01.mail
test/fixtures/orangepoland-text-02.mail
test/fixtures/pics.cingularme.com-image-01.mail
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
test/fixtures/sprint-pcs-text-01.mail
test/fixtures/sprint-purged-image-01.mail
test/fixtures/sprint-text-01.mail
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/tmo.blackberry.net-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/us-cellular-image-01.mail
test/fixtures/verizon-blackberry.mail
test/fixtures/verizon-image-01.mail
test/fixtures/verizon-image-02.mail
test/fixtures/verizon-image-03.mail
test/fixtures/verizon-text-01.mail
test/fixtures/verizon-video-01.mail
test/fixtures/virgin-mobile-image-01.mail
test/fixtures/virgin.ca-text-01.mail
test/fixtures/vodacom4me-co-za-01.mail
test/fixtures/vodacom4me-co-za-02.mail
test/fixtures/vodacom4me-southafrica-mms-01.mail
test/fixtures/vodacom4me-southafrica-mms-04.mail
test/fixtures/vtext-text-01.mail
test/fixtures/vzwpix.com-image-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_helper.rb
test/test_invalid_byte_seq_outlook.rb
test/test_mediamessaging_o2_co_uk.rb
test/test_messaging_nextel_com.rb
test/test_messaging_sprintpcs_com.rb
test/test_mms2r_media.rb
test/test_mms_3ireland_ie.rb
test/test_mms_ae.rb
test/test_mms_alltel_com.rb
test/test_mms_att_net.rb
test/test_mms_dobson_net.rb
test/test_mms_luxgsm_lu.rb
test/test_mms_mobileiam_ma.rb
test/test_mms_mtn_co_za.rb
test/test_mms_mycricket_com.rb
test/test_mms_myhelio_com.rb
test/test_mms_netcom_no.rb
test/test_mms_o2online_de.rb
test/test_mms_three_co_uk.rb
test/test_mms_uscc_net.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_sprint.rb
test/test_tmomail_net.rb
test/test_unicel_com.rb
test/test_vmpix_com.rb
test/test_vzwpix_com.rb
test/test_waw_plspictures_com.rb
vendor/plugins/mms2r/lib/autotest/discover.rb
vendor/plugins/mms2r/lib/autotest/mms2r.rb
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index 4fc665a..85290ca 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -1,562 +1,562 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
##
# = Synopsis
#
# MMS2R is a library to collect media files from MMS messages. MMS messages
# are multipart emails and mobile carriers often inject branding into these
# messages. MMS2R strips the advertising from an MMS leaving the actual user
# generated media.
#
# The Tracker for MMS2R is located at
# http://rubyforge.org/tracker/?group_id=3065
# Please submit bugs and feature requests using the Tracker.
#
# If MMS from a carrier not known by MMS2R is encountered please submit a
# sample to the author for inclusion in this project.
#
# == Stand Alone Example
#
# begin
# require 'mms2r'
# rescue LoadError
# require 'rubygems'
# require 'mms2r'
# end
# mail = Mail.read("sample-MMS.file")
# mms = MMS2R::Media.new(mail)
# subject = mms.subject
# number = mms.number
# file = mms.default_media
# mms.purge
#
# == Rails ActionMailer#receive w/ AttachmentFu Example
#
# def receive(mail)
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
-# See the README.txt file for more examples
+# See the README.rdoc file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
@body.force_encoding("ISO-8859-1") if RUBY_VERSION >= "1.9" && @body.encoding == "ASCII-8BIT"
begin
ic = Iconv.new('UTF-8', 'ISO-8859-1' )
@body = ic.iconv(@body)
@body << ic.iconv(nil)
ic.close
rescue Exception => e
end
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
begin
ic = Iconv.new('UTF-8', original_encoding )
utf_t = ic.iconv(text)
utf_t << ic.iconv(nil)
ic.close
rescue Exception => e
utf_t = text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :nokia
# * :palm
# * :pantech
# * :samsung
#
diff --git a/mms2r.gemspec b/mms2r.gemspec
index 81ba18a..6525e3e 100644
--- a/mms2r.gemspec
+++ b/mms2r.gemspec
@@ -1,33 +1,33 @@
$:.unshift File.expand_path("../lib", __FILE__)
require "mms2r/version"
Gem::Specification.new do |gem|
gem.add_dependency 'rake', ['= 0.9.2.2']
gem.add_dependency 'nokogiri', ['>= 1.5.0']
gem.add_dependency 'mail', ['>= 2.4.0']
gem.add_dependency 'exifr', ['>= 1.0.3']
gem.add_dependency 'json', ['>= 1.6.0']
gem.add_development_dependency "rdoc"
gem.add_development_dependency "simplecov"
gem.add_development_dependency 'test-unit'
gem.add_development_dependency 'mocha'
gem.name = "mms2r"
gem.version = MMS2R::Version.to_s
gem.platform = Gem::Platform::RUBY
gem.authors = ["Mike Mondragon"]
gem.email = ["[email protected]"]
gem.homepage = "https://github.com/monde/mms2r"
gem.summary = "Extract user media from MMS (and not carrier cruft)"
gem.description = "MMS2R is a library that decodes the parts of an MMS message to disk while stripping out advertising injected by the mobile carriers."
gem.rubyforge_project = "mms2r"
gem.rubygems_version = ">= 1.3.6"
gem.files = `git ls-files`.split("\n")
gem.require_path = ['lib']
- gem.rdoc_options = ["--main", "README.txt"]
- gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.txt"]
+ gem.rdoc_options = ["--main", "README.rdoc"]
+ gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.rdoc"]
gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
end
|
monde/mms2r
|
5b3ae8db2ace126d77fbf191f61093fd2e01f587
|
prepping 3.7.1 release
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b9c3fe..b860b79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- mms2r (3.7.0)
+ mms2r (3.7.1)
exifr (>= 1.0.3)
json (>= 1.6.0)
mail (>= 2.4.0)
nokogiri (>= 1.5.0)
rake (= 0.9.2.2)
GEM
remote: https://rubygems.org/
specs:
- exifr (1.1.2)
+ exifr (1.1.3)
i18n (0.6.0)
json (1.7.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.18)
mocha (0.11.4)
metaclass (~> 0.0.1)
multi_json (1.3.5)
nokogiri (1.5.2)
polyglot (0.3.3)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
simplecov (0.6.4)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
test-unit (2.4.8)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
mms2r!
mocha
rdoc
simplecov
test-unit
diff --git a/History.txt b/History.txt
index 11810bb..b6441a9 100644
--- a/History.txt
+++ b/History.txt
@@ -1,434 +1,440 @@
+### 3.7.1 / 2012-06-04 (Abrigail Remeltindtdrinc - The Record Cleaner)
+
+* 2 minor enhancements
+ * Improve processing of Sprint media - James McGrath
+ * RDoc format documentation - James McGrath
+
### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
* 2 major enhancements
* Improve processing of Sprint media - James McGrath
* Remove Hoe and gemcutter dependencies
### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
* 1 minor enhancement
* strip a variation of the iphone default footer
### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index ad58e7e..627ea75 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
7
end
def self.patch
- 0
+ 1
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
diff --git a/mms2r.gemspec b/mms2r.gemspec
index 30385bc..81ba18a 100644
--- a/mms2r.gemspec
+++ b/mms2r.gemspec
@@ -1,33 +1,33 @@
$:.unshift File.expand_path("../lib", __FILE__)
require "mms2r/version"
Gem::Specification.new do |gem|
gem.add_dependency 'rake', ['= 0.9.2.2']
gem.add_dependency 'nokogiri', ['>= 1.5.0']
gem.add_dependency 'mail', ['>= 2.4.0']
gem.add_dependency 'exifr', ['>= 1.0.3']
gem.add_dependency 'json', ['>= 1.6.0']
gem.add_development_dependency "rdoc"
gem.add_development_dependency "simplecov"
gem.add_development_dependency 'test-unit'
gem.add_development_dependency 'mocha'
gem.name = "mms2r"
gem.version = MMS2R::Version.to_s
gem.platform = Gem::Platform::RUBY
gem.authors = ["Mike Mondragon"]
gem.email = ["[email protected]"]
gem.homepage = "https://github.com/monde/mms2r"
gem.summary = "Extract user media from MMS (and not carrier cruft)"
- gem.description = open(File.join(File.dirname(__FILE__), 'README.txt')).readlines[6...22].join
+ gem.description = "MMS2R is a library that decodes the parts of an MMS message to disk while stripping out advertising injected by the mobile carriers."
gem.rubyforge_project = "mms2r"
gem.rubygems_version = ">= 1.3.6"
gem.files = `git ls-files`.split("\n")
gem.require_path = ['lib']
gem.rdoc_options = ["--main", "README.txt"]
gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.txt"]
gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
end
|
monde/mms2r
|
f03e21cf772e9e8809d692182ab1c7376fec1fa2
|
Fixed typo for missing bracket.
|
diff --git a/README.rdoc b/README.rdoc
index 4bc7c74..07beded 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,222 +1,222 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
=== Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
=== As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com[http://www.twitpic.com/]
* Simplton[http://simplton.com/]
* fanchatter.com[http://www.fanchatter.com/]
* camura.com[http://www.camura.com/]
* eachday.com[http://www.eachday.com/]
* beenup2.com[http://www.beenup2.com/]
* snapmylife.com[http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2012 by Mike Mondragon blog[http://plasti.cx/]
-MMS2R's {Flickr page}(http://www.flickr.com/photos/8627919@N05/]
+MMS2R's {Flickr page}[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl - blog[http://railspikes.com/]
* Will Jessup - blog[http://www.willjessup.com/]
* Shane Vitarana - blog[http://www.shanesbrain.net/]
* Layton Wedgeworth - company[http://www.beenup2.com/]
* Jason Haruska - blog[http://software.haruska.com/]
* Dave Myron - company[http://contentfree.com/]
* Vijay Yellapragada
* Jesse Dp - {github profile}[http://github.com/jessedp]
* David Alm
* Jeremy Wilkins
* Matt Conway - {github profile}[http://github.com/wr0ngway]
* Kai Kai
* Michael DelGaudio
* Sai Emrys - blog[http://saizai.com]
* Brendan Lim - {github profile}[http://github.com/brendanlim]
* Scott Taylor - {github profile}[http://github.com/smtlaissezfaire]
* Jaap van der Meer - {github profile}[http://github.com/japetheape]
* Karl Baum - {github profile}[http://github.com/kbaum]
* James McGrath - blog[http://jamespmcgrath.com]
|
monde/mms2r
|
8121ee36ecc30eaccb907998218c19abe22a573d
|
formatted one more minor heading.
|
diff --git a/README.rdoc b/README.rdoc
index 2bf8c09..4bc7c74 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,222 +1,222 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
=== Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
-As Seen On The Internets - sites known to be using MMS2R in some fashion
+=== As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com[http://www.twitpic.com/]
* Simplton[http://simplton.com/]
* fanchatter.com[http://www.fanchatter.com/]
* camura.com[http://www.camura.com/]
* eachday.com[http://www.eachday.com/]
* beenup2.com[http://www.beenup2.com/]
* snapmylife.com[http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2012 by Mike Mondragon blog[http://plasti.cx/]
MMS2R's {Flickr page}(http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl - blog[http://railspikes.com/]
* Will Jessup - blog[http://www.willjessup.com/]
* Shane Vitarana - blog[http://www.shanesbrain.net/]
* Layton Wedgeworth - company[http://www.beenup2.com/]
* Jason Haruska - blog[http://software.haruska.com/]
* Dave Myron - company[http://contentfree.com/]
* Vijay Yellapragada
* Jesse Dp - {github profile}[http://github.com/jessedp]
* David Alm
* Jeremy Wilkins
* Matt Conway - {github profile}[http://github.com/wr0ngway]
* Kai Kai
* Michael DelGaudio
* Sai Emrys - blog[http://saizai.com]
* Brendan Lim - {github profile}[http://github.com/brendanlim]
* Scott Taylor - {github profile}[http://github.com/smtlaissezfaire]
* Jaap van der Meer - {github profile}[http://github.com/japetheape]
* Karl Baum - {github profile}[http://github.com/kbaum]
* James McGrath - blog[http://jamespmcgrath.com]
|
monde/mms2r
|
d69d817ecef9fbd0840ee5d9e55a601f55b50be3
|
more fixes to formatting.
|
diff --git a/README.rdoc b/README.rdoc
index 853d698..2bf8c09 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,222 +1,222 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
=== Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
-* (twitpic.com)[http://www.twitpic.com/]
+* twitpic.com[http://www.twitpic.com/]
* Simplton[http://simplton.com/]
-* (fanchatter.com)[http://www.fanchatter.com/]
-* (camura.com)[http://www.camura.com/]
-* (eachday.com)[http://www.eachday.com/]
-* (beenup2.com)[http://www.beenup2.com/]
-* (snapmylife.com)[http://www.snapmylife.com/]
+* fanchatter.com[http://www.fanchatter.com/]
+* camura.com[http://www.camura.com/]
+* eachday.com[http://www.eachday.com/]
+* beenup2.com[http://www.beenup2.com/]
+* snapmylife.com[http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2012 by Mike Mondragon blog[http://plasti.cx/]
-MMS2R's [Flickr page](http://www.flickr.com/photos/8627919@N05/]
+MMS2R's {Flickr page}(http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
-* Luke Francl blog[http://railspikes.com/]
-* Will Jessup blog[http://www.willjessup.com/]
-* Shane Vitarana blog[http://www.shanesbrain.net/]
-* Layton Wedgeworth company[http://www.beenup2.com/]
-* Jason Haruska blog[http://software.haruska.com/]
-* Dave Myron company[http://contentfree.com/]
+* Luke Francl - blog[http://railspikes.com/]
+* Will Jessup - blog[http://www.willjessup.com/]
+* Shane Vitarana - blog[http://www.shanesbrain.net/]
+* Layton Wedgeworth - company[http://www.beenup2.com/]
+* Jason Haruska - blog[http://software.haruska.com/]
+* Dave Myron - company[http://contentfree.com/]
* Vijay Yellapragada
-* Jesse Dp (github profile)[http://github.com/jessedp]
+* Jesse Dp - {github profile}[http://github.com/jessedp]
* David Alm
* Jeremy Wilkins
-* Matt Conway (github profile)[http://github.com/wr0ngway]
+* Matt Conway - {github profile}[http://github.com/wr0ngway]
* Kai Kai
* Michael DelGaudio
-* Sai Emrys blog[http://saizai.com]
-* Brendan Lim (github profile)[http://github.com/brendanlim]
-* Scott Taylor (github profile)[http://github.com/smtlaissezfaire]
-* Jaap van der Meer (github profile)[http://github.com/japetheape]
-* Karl Baum (github profile)[http://github.com/kbaum]
-* James McGrath blog[http://jamespmcgrath.com]
+* Sai Emrys - blog[http://saizai.com]
+* Brendan Lim - {github profile}[http://github.com/brendanlim]
+* Scott Taylor - {github profile}[http://github.com/smtlaissezfaire]
+* Jaap van der Meer - {github profile}[http://github.com/japetheape]
+* Karl Baum - {github profile}[http://github.com/kbaum]
+* James McGrath - blog[http://jamespmcgrath.com]
|
monde/mms2r
|
3678d7ba59e49fac7147427da03f1585a923c03f
|
fixed formatting of readme links to be consistent with RDoc markup.
|
diff --git a/README.rdoc b/README.rdoc
index e0aa123..853d698 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,222 +1,222 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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:
+=== Corpus of carriers currently processed by MMS2R:
* 1nbox/Idea: 1nbox.net
* 3 Ireland: mms.3ireland.ie
* Alltel: mms.alltel.com
* AT&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
-Corpus of smart phones known to MMS2R:
+=== Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
-* [twitpic.com](http://www.twitpic.com/)
-* [Simplton](http://simplton.com/)
-* [fanchatter.com](http://www.fanchatter.com/)
-* [camura.com](http://www.camura.com/)
-* [eachday.com](http://www.eachday.com/)
-* [beenup2.com](http://www.beenup2.com/)
-* [snapmylife.com](http://www.snapmylife.com/)
+* (twitpic.com)[http://www.twitpic.com/]
+* Simplton[http://simplton.com/]
+* (fanchatter.com)[http://www.fanchatter.com/]
+* (camura.com)[http://www.camura.com/]
+* (eachday.com)[http://www.eachday.com/]
+* (beenup2.com)[http://www.beenup2.com/]
+* (snapmylife.com)[http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
-Copyright (c) 2007-2012 by Mike Mondragon [blog](http://plasti.cx/)
+Copyright (c) 2007-2012 by Mike Mondragon blog[http://plasti.cx/]
-MMS2R's [Flickr page](http://www.flickr.com/photos/8627919@N05/)
+MMS2R's [Flickr page](http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
-* Luke Francl [blog](http://railspikes.com/)
-* Will Jessup [blog](http://www.willjessup.com/)
-* Shane Vitarana [blog](http://www.shanesbrain.net/)
-* Layton Wedgeworth [company](http://www.beenup2.com/)
-* Jason Haruska [blog](http://software.haruska.com/)
-* Dave Myron [company](http://contentfree.com/)
+* Luke Francl blog[http://railspikes.com/]
+* Will Jessup blog[http://www.willjessup.com/]
+* Shane Vitarana blog[http://www.shanesbrain.net/]
+* Layton Wedgeworth company[http://www.beenup2.com/]
+* Jason Haruska blog[http://software.haruska.com/]
+* Dave Myron company[http://contentfree.com/]
* Vijay Yellapragada
-* Jesse Dp [github profile](http://github.com/jessedp)
+* Jesse Dp (github profile)[http://github.com/jessedp]
* David Alm
* Jeremy Wilkins
-* Matt Conway [github profile](http://github.com/wr0ngway)
+* Matt Conway (github profile)[http://github.com/wr0ngway]
* Kai Kai
* Michael DelGaudio
-* Sai Emrys [blog](http://saizai.com)
-* Brendan Lim [github profile](http://github.com/brendanlim)
-* Scott Taylor [github profile](http://github.com/smtlaissezfaire)
-* Jaap van der Meer [github profile](http://github.com/japetheape)
-* Karl Baum [github profile](http://github.com/kbaum)
-* James McGrath (blog)[http://jamespmcgrath.com]
+* Sai Emrys blog[http://saizai.com]
+* Brendan Lim (github profile)[http://github.com/brendanlim]
+* Scott Taylor (github profile)[http://github.com/smtlaissezfaire]
+* Jaap van der Meer (github profile)[http://github.com/japetheape]
+* Karl Baum (github profile)[http://github.com/kbaum]
+* James McGrath blog[http://jamespmcgrath.com]
|
monde/mms2r
|
5990894faf41e290eaefb64daacdc87fb202b45c
|
fixed the formatting of the links in readme.txt
|
diff --git a/README.txt b/README.txt
index 2e11bb9..10a89e1 100644
--- a/README.txt
+++ b/README.txt
@@ -1,222 +1,222 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
-* twitpic.com [http://www.twitpic.com/]
-* Simplton [http://simplton.com/]
-* fanchatter.com [http://www.fanchatter.com/]
-* camura.com [http://www.camura.com/]
-* eachday.com [http://www.eachday.com/]
-* beenup2.com [http://www.beenup2.com/]
-* snapmylife.com [http://www.snapmylife.com/]
+* [twitpic.com](http://www.twitpic.com/)
+* [Simplton](http://simplton.com/)
+* [fanchatter.com](http://www.fanchatter.com/)
+* [camura.com](http://www.camura.com/)
+* [eachday.com](http://www.eachday.com/)
+* [beenup2.com](http://www.beenup2.com/)
+* [snapmylife.com](http://www.snapmylife.com/)
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
-Copyright (c) 2007-2012 by Mike Mondragon (blog[http://plasti.cx/])
+Copyright (c) 2007-2012 by Mike Mondragon [blog](http://plasti.cx/)
-MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
+MMS2R's [Flickr page](http://www.flickr.com/photos/8627919@N05/)
== CONTRIBUTORS
-* Luke Francl (blog[http://railspikes.com/])
-* Will Jessup (blog[http://www.willjessup.com/])
-* Shane Vitarana (blog[http://www.shanesbrain.net/])
-* Layton Wedgeworth (http://www.beenup2.com/)
-* Jason Haruska (blog[http://software.haruska.com/])
-* Dave Myron (company[http://contentfree.com/])
+* Luke Francl [blog](http://railspikes.com/)
+* Will Jessup [blog](http://www.willjessup.com/)
+* Shane Vitarana [blog](http://www.shanesbrain.net/)
+* Layton Wedgeworth [company](http://www.beenup2.com/)
+* Jason Haruska [blog](http://software.haruska.com/)
+* Dave Myron [company](http://contentfree.com/)
* Vijay Yellapragada
-* Jesse Dp (github profile[http://github.com/jessedp])
+* Jesse Dp [github profile](http://github.com/jessedp)
* David Alm
* Jeremy Wilkins
-* Matt Conway (github profile[http://github.com/wr0ngway])
+* Matt Conway [github profile](http://github.com/wr0ngway)
* Kai Kai
* Michael DelGaudio
-* Sai Emrys (blog[http://saizai.com])
-* Brendan Lim (github profile[http://github.com/brendanlim])
-* Scott Taylor (github profile[http://github.com/smtlaissezfaire])
-* Jaap van der Meer (github profile[http://github.com/japetheape])
-* Karl Baum (github profile[http://github.com/kbaum])
-* James McGrath (blog[http://jamespmcgrath.com])
+* Sai Emrys [blog](http://saizai.com)
+* Brendan Lim [github profile](http://github.com/brendanlim)
+* Scott Taylor [github profile](http://github.com/smtlaissezfaire)
+* Jaap van der Meer [github profile](http://github.com/japetheape)
+* Karl Baum [github profile](http://github.com/kbaum)
+* James McGrath [blog](http://jamespmcgrath.com)
|
monde/mms2r
|
8800e3edc7c0ab313058663c40fe13692a2ec333
|
Added myself to contributors list to satify my vanity :-)
|
diff --git a/README.txt b/README.txt
index 4761048..2e11bb9 100644
--- a/README.txt
+++ b/README.txt
@@ -1,221 +1,222 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
https://github.com/monde/mms2r
https://rubygems.org/gems/mms2r
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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com [http://www.twitpic.com/]
* Simplton [http://simplton.com/]
* fanchatter.com [http://www.fanchatter.com/]
* camura.com [http://www.camura.com/]
* eachday.com [http://www.eachday.com/]
* beenup2.com [http://www.beenup2.com/]
* snapmylife.com [http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2012 by Mike Mondragon (blog[http://plasti.cx/])
MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl (blog[http://railspikes.com/])
* Will Jessup (blog[http://www.willjessup.com/])
* Shane Vitarana (blog[http://www.shanesbrain.net/])
* Layton Wedgeworth (http://www.beenup2.com/)
* Jason Haruska (blog[http://software.haruska.com/])
* Dave Myron (company[http://contentfree.com/])
* Vijay Yellapragada
* Jesse Dp (github profile[http://github.com/jessedp])
* David Alm
* Jeremy Wilkins
* Matt Conway (github profile[http://github.com/wr0ngway])
* Kai Kai
* Michael DelGaudio
* Sai Emrys (blog[http://saizai.com])
* Brendan Lim (github profile[http://github.com/brendanlim])
* Scott Taylor (github profile[http://github.com/smtlaissezfaire])
* Jaap van der Meer (github profile[http://github.com/japetheape])
* Karl Baum (github profile[http://github.com/kbaum])
+* James McGrath (blog[http://jamespmcgrath.com])
|
monde/mms2r
|
ed782e003ac405fedbf33e4aa582917da5cf20c1
|
Sprint is returning html in the json response that contains the text message that comes with some photos. This commit implements a search and replace on the returned message string to replace all POSIX spaces with regular spaces " ". Also updated the test suite to include an nbsp in the json response fixture file. NOTE: This file is encoded as ASCII-8BIT NOT UTF-8, this is necessary for the text to be effective.
|
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index bab8f57..08cfe94 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,248 +1,249 @@
#--
# Copyright (c) 2007-2012 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
require 'json'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
# if there is no text media found in the mail body - then we go to more
# extreme measures.
text_found = false
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
next if text.empty?
text_found = true
type, text = transform_text(type, text)
type, file = sprint_write_file(type, text.strip)
add_file(type, file) unless type.nil? || file.nil?
end
# if no text was found, there still might be a message with images
# that can be seen at the end of the "View Entire Message" link
if !text_found
view_entire_message_link = doc.search("a").find { |link| link.inner_html == "View Entire Message"}
# if we can't find the view entire message link, give up
if view_entire_message_link
# Sprint uses AJAX/json to serve up the content at the end of the link so this is conveluted
url = view_entire_message_link.attr("href")
# extract the "invite" param out of the url - this will be the id we pass to the ajax path below
inviteMessageId = CGI::parse(URI::parse(url).query)["invite"].first
if inviteMessageId
json_url = "http://pictures.sprintpcs.com/ui-refresh/guest/getMessageContainerJSON.do%3FcomponentType%3DmediaDetail&invite=#{inviteMessageId}&externalMessageId=#{inviteMessageId}"
# pull down the json from the url and parse it
uri = URI.parse(json_url)
connection = Net::HTTP.new(uri.host, uri.port)
response = connection.get2(
uri.request_uri,
{ "User-Agent" => MMS2R::Media::USER_AGENT }
)
content = response.body
# if the content has expired, sprint sends back html "content expired page
# json will fail to parse
begin
json = JSON.parse(content)
# there may be multiple "results" in the json - due to multiple images
# cycle through them and extract the "description" which is the text
# message the sender sent with the images
json["Results"].each do |result|
type = 'text/plain'
- text = result["description"] ? result["description"].strip : nil
+ # remove any chars from the resulting text
+ text = result["description"] ? result["description"].gsub(/[[:space:]]/, " ").strip : nil
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?
end
rescue JSON::ParserError => e
log("#{self.class} processing error, #{$!}", :error)
end
end
end
end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
unless @is_video
query={}
uri.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
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)
#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
end
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
# force the encoding to be utf-8
content = content.force_encoding("UTF-8") if content.respond_to?(:force_encoding)
File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
diff --git a/test/fixtures/sprint-ajax-response-success.json b/test/fixtures/sprint-ajax-response-success.json
index a080747..8feb749 100644
--- a/test/fixtures/sprint-ajax-response-success.json
+++ b/test/fixtures/sprint-ajax-response-success.json
@@ -1 +1 @@
-{"totalMediaItems":1,"shareType":"normal","nomediaItem":"false","isOnlyVideo":null,"creationDate":"Apr 16, 2012","from":"(513)545-5510","offset":null,"externalMessageId":"GEc4YYms2Y7KAkmhaoFL","Results":[{"elementID":"2","hasVoiceCaption":false,"URL":{"elementID":"2","indexCount":0,"audio":null,"thumb":"http:\/\/pictures.sprintpcs.com:80\/mmps\/031_36415d1a9c3c73f0_1\/2.jpg?partExt=.jpg&&&outquality=90&ext=.jpg&&size=40,40&squareoutput=255,255,255&aspectcrop=0.5,0.5,1.0,1.0,1.0","annotationVoiceID":null,"image":"http:\/\/pictures.sprintpcs.com:80\/mmps\/031_36415d1a9c3c73f0_1\/2.jpg?partExt=.jpg&&&outquality=90&ext=.jpg","video":null},"description":"Just testing the caption on Sprint","mediaItemNum":0,"isDRMProtected":false,"externalMessageId":"GEc4YYms2Y7KAkmhaoFL","mediaType":"IMAGE","restOperation":"false","folderFullName":"\/RECIPIENT"}],"invite":null,"tmemo":null,"toAddress":"[email protected]","mediaIndex":0,"subject":"New Message","isDRMProtected":false,"expirationDate":"Expires in 18 days","voiceURL":null,"guest":"true","folderFullName":"\/RECIPIENT"}
\ No newline at end of file
+{"totalMediaItems":2,"shareType":"normal","nomediaItem":"false","isOnlyVideo":null,"creationDate":"May 31, 2012","from":"(513)545-0000","offset":null,"externalMessageId":"XXXXXXXXXXXXXXXXXX","Results":[{"elementID":"0","hasVoiceCaption":false,"URL":{"elementID":"0","indexCount":0,"audio":null,"thumb":"\/retailers\/PCSNEXTEL\/ui-refresh\/images\/background\/slide_no_media_90x90.gif","annotationVoiceID":null,"image":"\/retailers\/PCSNEXTEL\/ui-refresh\/images\/background\/slide_no_media_90x90.gif","video":null},"description":"First text content. ","mediaItemNum":0,"isDRMProtected":false,"externalMessageId":"XXXXXXXXXXXXXXXXXX","mediaType":"TEXT","restOperation":"false","folderFullName":"\/RECIPIENT"},{"elementID":"3","hasVoiceCaption":false,"URL":{"elementID":"3","indexCount":1,"audio":"","thumb":"http:\/\/pictures.sprintpcs.com:80\/mmps\/048_0736849c3f1a9d27_1\/3.jpg?partExt=.jpg&&&outquality=90&ext=.jpg&&size=40,40&squareoutput=255,255,255&aspectcrop=0.5,0.5,1.0,1.0,1.0","annotationVoiceID":null,"image":"http:\/\/pictures.sprintpcs.com:80\/mmps\/048_0736849c3f1a9d27_1\/3.jpg?partExt=.jpg&&&outquality=90&ext=.jpg","video":""},"description":"Second text content. ","mediaItemNum":1,"isDRMProtected":false,"externalMessageId":"XXXXXXXXXXXXXXXXXX","mediaType":"IMAGE","restOperation":"false","folderFullName":"\/RECIPIENT"}],"invite":null,"tmemo":null,"toAddress":"[email protected]","mediaIndex":0,"subject":"New Message","isDRMProtected":false,"expirationDate":"Expires in 57 Days","voiceURL":null,"guest":"true","folderFullName":"\/RECIPIENT"}
diff --git a/test/test_pm_sprint_com.rb b/test/test_pm_sprint_com.rb
index 372ccf6..c5a6b23 100644
--- a/test/test_pm_sprint_com.rb
+++ b/test/test_pm_sprint_com.rb
@@ -1,317 +1,320 @@
require "test_helper"
class TestPmSprintCom < Test::Unit::TestCase
include MMS2R::TestHelper
def mock_sprint_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_purged_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_ajax
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-success.json", "rb")
json = file.read
body.expects(:to_str).returns json
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('200')
response.expects(:content_type).twice.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
end
def mock_sprint_ajax_purged
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-failure.html", "rb")
error_html = file.read
body.expects(:to_str).returns error_html
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('500')
response.expects(:content_type).once.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
end
def test_mms_should_have_text
mail = mail('sprint-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068765309", mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert_equal true, File.exist?(file)
assert_match(/\.txt$/, File.basename(file))
assert_equal "Tea Pot", IO.read(file)
mms.purge
end
def test_mms_should_have_a_phone_number
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
mms.purge
end
def test_should_have_simple_video
mail = mail('sprint-video-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).once.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/quicktime']
assert_equal 1, mms.media['video/quicktime'].size
assert_equal "000_259e41e851be9b1d_1-0.mov", File.basename(mms.media['video/quicktime'][0])
mms.purge
end
def test_should_have_simple_image
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/001_2066c7013e7ca833_1-0.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
def test_collect_image_using_block
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
file_array = nil
mms.process do |k, v|
file_array = v if (k == 'image/jpeg')
assert_equal 1, file_array.size
file = file_array.first
assert_not_nil file = file_array.first
assert_equal "001_2066c7013e7ca833_1-0.jpg", File.basename(file)
end
mms.purge
end
def test_process_internals_should_only_be_executed_once
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
# second time through shouldn't go into the was_processed block
mms.mail.expects(:parts).never
mms.process{|k, v| }
mms.purge
end
def test_should_have_two_images
mail = mail('sprint-two-images-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).twice.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 2, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'][0]
assert_not_nil mms.media['image/jpeg'][1]
assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
mms.purge
end
def test_image_should_be_missing
# this test is questionable
mail = mail('sprint-broken-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_message_is_missing_in_mail
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
- assert_equal 1, mms.media['text/plain'].size
-
+ assert_equal 2, mms.media['text/plain'].size
+
# test that the message was extracted from the ajax response
message = IO.readlines(mms.media['text/plain'].first).join("")
- assert_equal "Just testing the caption on Sprint", message
-
+ assert_equal "First text content.", message
+
+ # test that the was removed ()
+ assert message.last.bytes.to_a != [194, 160]
+
mms.purge
end
def test_message_is_missing_in_mail_purged_from_content_server
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax_purged
mms = MMS2R::Media.new(mail)
assert_equal '5135455555', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_image_should_be_purged_from_content_server
mail = mail('sprint-image-01.mail')
mock_sprint_purged_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_body_should_return_empty_when_there_is_no_user_text
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.body
end
def test_sprint_write_file
mail = mock(:message_id => 'a')
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
mms = MMS2R::Media.new(mail, :process => :lazy)
type = 'text/plain'
content = 'foo'
file = Tempfile.new('sprint')
file.close
type, file = mms.send(:sprint_write_file, type, content, file.path)
assert_equal 'text/plain', type
assert_equal content, IO.read(file)
end
def test_subject
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
def test_new_subject
mail = mail('sprint-new-image-01.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
end
|
monde/mms2r
|
f895ff17a5bc03a0bd140fafccc202e949fa9b30
|
rake build -> Built 3.7.0
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 855713e..7b9c3fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- mms2r (3.6.5)
+ mms2r (3.7.0)
exifr (>= 1.0.3)
json (>= 1.6.0)
mail (>= 2.4.0)
nokogiri (>= 1.5.0)
rake (= 0.9.2.2)
GEM
remote: https://rubygems.org/
specs:
exifr (1.1.2)
i18n (0.6.0)
json (1.7.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.18)
mocha (0.11.4)
metaclass (~> 0.0.1)
multi_json (1.3.5)
nokogiri (1.5.2)
polyglot (0.3.3)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
simplecov (0.6.4)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
test-unit (2.4.8)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
mms2r!
mocha
rdoc
simplecov
test-unit
|
monde/mms2r
|
e50c334c429e4571d3ddc3a8a5c67c2186ae86f2
|
Improvements bumped for a 3.7.0 release.
|
diff --git a/History.txt b/History.txt
index 3f8ba80..11810bb 100644
--- a/History.txt
+++ b/History.txt
@@ -1,423 +1,434 @@
-### 3.6.3 / 2012-03.25 (Dethklok Minute Host - host of The Dethklok Minute)
+### 3.7.0 / 2012-05-31 (The Teenager - Edgar's brother via Eric's face)
+
+* 2 major enhancements
+ * Improve processing of Sprint media - James McGrath
+ * Remove Hoe and gemcutter dependencies
+
+### 3.6.4 / 2012-04-22 (Molly - Pickles' mother)
+
+* 1 minor enhancement
+ * strip a variation of the iphone default footer
+
+### 3.6.3 / 2012-03-25 (Dethklok Minute Host - host of The Dethklok Minute)
* 1 minor enhancement
* strip Windows phone default footer
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
index 2762189..ad58e7e 100644
--- a/lib/mms2r/version.rb
+++ b/lib/mms2r/version.rb
@@ -1,25 +1,25 @@
module MMS2R
class Version
def self.major
3
end
def self.minor
- 6
+ 7
end
def self.patch
- 5
+ 0
end
def self.pre
nil
end
def self.to_s
[major, minor, patch, pre].compact.join('.')
end
end
end
|
monde/mms2r
|
cba403fcafca3b09800b6caa73db590fbb5cee28
|
Remove Hoe and Gemcutter deps, build gem solely with bundler, updating gems.
|
diff --git a/Gemfile b/Gemfile
index 8941e45..fa75df1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,21 +1,3 @@
-# -*- ruby -*-
+source 'https://rubygems.org'
-source :rubygems
-
-gem "nokogiri"
-gem "mail"
-gem "exifr"
-gem "json"
-# gem "psych"
-
-group :development, :test do
- gem "rdoc"
- gem "rubyforge"
- gem "gemcutter"
- gem "hoe"
- gem "rcov"
- gem "test-unit", "=1.2.3"
- gem "mocha"
-end
-
-# vim: syntax=ruby
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 074dd18..855713e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,47 +1,48 @@
+PATH
+ remote: .
+ specs:
+ mms2r (3.6.5)
+ exifr (>= 1.0.3)
+ json (>= 1.6.0)
+ mail (>= 2.4.0)
+ nokogiri (>= 1.5.0)
+ rake (= 0.9.2.2)
+
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- exifr (1.1.1)
- gemcutter (0.7.1)
- hoe (2.12.5)
- rake (~> 0.8)
+ exifr (1.1.2)
i18n (0.6.0)
- json (1.6.5)
- json_pure (1.6.5)
- mail (2.4.0)
+ json (1.7.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.17.2)
- mocha (0.10.2)
+ mime-types (1.18)
+ mocha (0.11.4)
metaclass (~> 0.0.1)
- nokogiri (1.5.0)
+ multi_json (1.3.5)
+ nokogiri (1.5.2)
polyglot (0.3.3)
rake (0.9.2.2)
- rcov (0.9.11)
rdoc (3.12)
json (~> 1.4)
- rubyforge (2.0.4)
- json_pure (>= 1.1.7)
- test-unit (1.2.3)
- hoe (>= 1.5.1)
+ simplecov (0.6.4)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
+ test-unit (2.4.8)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
- exifr
- gemcutter
- hoe
- json
- mail
+ mms2r!
mocha
- nokogiri
- rcov
rdoc
- rubyforge
- test-unit (= 1.2.3)
+ simplecov
+ test-unit
diff --git a/Manifest.txt b/Manifest.txt
index ef08e0f..472055b 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,186 +1,187 @@
.gitignore
Gemfile
Gemfile.lock
History.txt
Manifest.txt
README.TMail.txt
README.txt
Rakefile
conf/1nbox.net.yml
conf/aliases.yml
conf/bellsouth.net.yml
conf/from.yml
conf/mediamessaging.o2.co.uk.yml
conf/messaging.nextel.com.yml
conf/mms.3ireland.ie.yml
conf/mms.ae.yml
conf/mms.alltel.com.yml
conf/mms.att.net.yml
conf/mms.dobson.net.yml
conf/mms.luxgsm.lu.yml
conf/mms.mobileiam.ma.yml
conf/mms.mtn.co.za.yml
conf/mms.mycricket.com.yml
conf/mms.myhelio.com.yml
conf/mms.netcom.no.yml
conf/mms.o2online.de.yml
conf/mms.three.co.uk.yml
conf/mms.uscc.net.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/vmpix.com.yml
conf/vzwpix.com.yml
conf/waw.plspictures.com.yml
dev_tools/anonymizer.rb
dev_tools/debug_sprint_nokogiri_parsing.rb
init.rb
lib/ext/mail.rb
lib/ext/object.rb
lib/mms2r.rb
lib/mms2r/media.rb
+lib/mms2r/version.rb
lib/mms2r/media/sprint.rb
mms2r.gemspec
test/fixtures/1nbox-2images-01.mail
test/fixtures/1nbox-2images-02.mail
test/fixtures/1nbox-2images-03.mail
test/fixtures/1nbox-2images-04.mail
test/fixtures/3ireland-mms-01.mail
test/fixtures/ad_new.txt
test/fixtures/alltel-image-01.mail
test/fixtures/alltel-mms-01.mail
test/fixtures/alltel-mms-03.mail
test/fixtures/apple-double-image-01.mail
test/fixtures/att-blackberry-02.mail
test/fixtures/att-blackberry.mail
test/fixtures/att-image-01.mail
test/fixtures/att-image-02.mail
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/dici_un_mois_georgie.txt
test/fixtures/dobson-image-01.mail
test/fixtures/dot.jpg
test/fixtures/generic.mail
test/fixtures/handsets.yml
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/invalid-byte-seq-outlook.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
test/fixtures/mmode-image-01.mail
test/fixtures/mms.ae-image-01.mail
test/fixtures/mms.mycricket.com-pic-and-text.mail
test/fixtures/mms.mycricket.com-pic.mail
test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail
test/fixtures/mobile.mycingular.com-text-01.mail
test/fixtures/mtn-southafrica-mms.mail
test/fixtures/mycingular-image-01.mail
test/fixtures/netcom-image-01.mail
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/o2-de-image-01.mail
test/fixtures/orange-uk-image-01.mail
test/fixtures/orangefrance-text-and-image.mail
test/fixtures/orangepoland-text-01.mail
test/fixtures/orangepoland-text-02.mail
test/fixtures/pics.cingularme.com-image-01.mail
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
test/fixtures/sprint-pcs-text-01.mail
test/fixtures/sprint-purged-image-01.mail
test/fixtures/sprint-text-01.mail
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/tmo.blackberry.net-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/us-cellular-image-01.mail
test/fixtures/verizon-blackberry.mail
test/fixtures/verizon-image-01.mail
test/fixtures/verizon-image-02.mail
test/fixtures/verizon-image-03.mail
test/fixtures/verizon-text-01.mail
test/fixtures/verizon-video-01.mail
test/fixtures/virgin-mobile-image-01.mail
test/fixtures/virgin.ca-text-01.mail
test/fixtures/vodacom4me-co-za-01.mail
test/fixtures/vodacom4me-co-za-02.mail
test/fixtures/vodacom4me-southafrica-mms-01.mail
test/fixtures/vodacom4me-southafrica-mms-04.mail
test/fixtures/vtext-text-01.mail
test/fixtures/vzwpix.com-image-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_helper.rb
test/test_invalid_byte_seq_outlook.rb
test/test_mediamessaging_o2_co_uk.rb
test/test_messaging_nextel_com.rb
test/test_messaging_sprintpcs_com.rb
test/test_mms2r_media.rb
test/test_mms_3ireland_ie.rb
test/test_mms_ae.rb
test/test_mms_alltel_com.rb
test/test_mms_att_net.rb
test/test_mms_dobson_net.rb
test/test_mms_luxgsm_lu.rb
test/test_mms_mobileiam_ma.rb
test/test_mms_mtn_co_za.rb
test/test_mms_mycricket_com.rb
test/test_mms_myhelio_com.rb
test/test_mms_netcom_no.rb
test/test_mms_o2online_de.rb
test/test_mms_three_co_uk.rb
test/test_mms_uscc_net.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_sprint.rb
test/test_tmomail_net.rb
test/test_unicel_com.rb
test/test_vmpix_com.rb
test/test_vzwpix_com.rb
test/test_waw_plspictures_com.rb
vendor/plugins/mms2r/lib/autotest/discover.rb
vendor/plugins/mms2r/lib/autotest/mms2r.rb
diff --git a/README.txt b/README.txt
index 44d90c9..5f0362b 100644
--- a/README.txt
+++ b/README.txt
@@ -1,248 +1,247 @@
= mms2r
https://github.com/monde/mms2r
== DESCRIPTION
MMS2R by Mike Mondragon
-http://mms2r.rubyforge.org/
https://github.com/monde/mms2r
-https://github.com/monde/mms2r/issues
+https://rubygems.org/gems/mms2r
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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com [http://www.twitpic.com/]
* Simplton [http://simplton.com/]
* fanchatter.com [http://www.fanchatter.com/]
* camura.com [http://www.camura.com/]
* eachday.com [http://www.eachday.com/]
* beenup2.com [http://www.beenup2.com/]
* snapmylife.com [http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2010 by Mike Mondragon (blog[http://plasti.cx/])
MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl (blog[http://railspikes.com/])
* Will Jessup (blog[http://www.willjessup.com/])
* Shane Vitarana (blog[http://www.shanesbrain.net/])
* Layton Wedgeworth (http://www.beenup2.com/)
* Jason Haruska (blog[http://software.haruska.com/])
* Dave Myron (company[http://contentfree.com/])
* Vijay Yellapragada
* Jesse Dp (github profile[http://github.com/jessedp])
* David Alm
* Jeremy Wilkins
* Matt Conway (github profile[http://github.com/wr0ngway])
* Kai Kai
* Michael DelGaudio
* Sai Emrys (blog[http://saizai.com])
* Brendan Lim (github profile[http://github.com/brendanlim])
* Scott Taylor (github profile[http://github.com/smtlaissezfaire])
* Jaap van der Meer (github profile[http://github.com/japetheape])
* Karl Baum (github profile[http://github.com/kbaum])
== LICENSE
(The MIT License)
Copyright (c) 2007, 2008 Mike Mondragon ([email protected]).
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Rakefile b/Rakefile
index 0902222..041c148 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,45 +1,11 @@
-# -*- ruby -*-
+require 'bundler'
+Bundler::GemHelper.install_tasks
-begin
- require 'hoe'
-rescue LoadError
- require 'rubygems'
- require 'hoe'
-end
-
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
-require 'mms2r'
-require 'rake'
-
-Hoe.plugin :bundler
-Hoe.spec('mms2r') do |p|
- p.version = MMS2R::Media::VERSION
- p.rubyforge_name = 'mms2r'
- p.author = ['Mike Mondragon']
- p.email = ['[email protected]']
- p.summary = 'Extract user media from MMS (and not carrier cruft)'
- p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
- p.url = p.paragraphs_of('README.txt', 1).first.strip
- p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
- p.readme_file = 'README.txt'
- p.history_file = 'History.txt'
- p.extra_deps << ['nokogiri', '>= 1.4.4']
- p.extra_deps << ['mail', '>= 2.2.10']
- p.extra_deps << ['uuidtools', '>= 2.1.1']
- p.extra_deps << ['exifr', '>= 1.0.3']
- p.clean_globs << 'coverage'
-end
+require 'rake/testtask'
-begin
- require 'rcov/rcovtask'
- Rcov::RcovTask.new do |rcov|
- rcov.pattern = 'test/**/test_*.rb'
- rcov.verbose = true
- rcov.rcov_opts << "--exclude rcov.rb"
- end
-rescue
- task :rcov => :check_dependencies
+Rake::TestTask.new do |t|
+ t.libs << 'test'
end
-# vim: syntax=Ruby
+desc "Run tests"
+task :default => :test
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index 80df937..9712599 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,83 +1,78 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
- ##
- # MMS2R library version
-
- VERSION = '3.6.3'
-
##
# Spoof User-Agent, primarily for the Sprint CDN
USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2"
end
# 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, options = {}
mail = Mail.new raw_mail
MMS2R::Media.new(mail, options)
end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
if RUBY_VERSION >= "1.9"
begin
require 'psych'
YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
rescue LoadError
end
end
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index fdd4fac..0a21387 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -294,551 +294,552 @@ module MMS2R
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
begin
ic = Iconv.new('UTF-8', original_encoding )
utf_t = ic.iconv(text)
utf_t << ic.iconv(nil)
ic.close
rescue Exception => e
utf_t = text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :nokia
# * :palm
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header].decoded =~ regex
field = mail.header.fields.detect { |field| field.name == header }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
boundary = mail.boundary
boundaries = config['device_types']['boundary'] rescue {}
boundaries.each do |type, regex|
return type if boundary =~ regex
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
+ next unless File.exist?(path)
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
diff --git a/lib/mms2r/version.rb b/lib/mms2r/version.rb
new file mode 100644
index 0000000..2762189
--- /dev/null
+++ b/lib/mms2r/version.rb
@@ -0,0 +1,25 @@
+module MMS2R
+ class Version
+
+ def self.major
+ 3
+ end
+
+ def self.minor
+ 6
+ end
+
+ def self.patch
+ 5
+ end
+
+ def self.pre
+ nil
+ end
+
+ def self.to_s
+ [major, minor, patch, pre].compact.join('.')
+ end
+
+ end
+end
diff --git a/mms2r.gemspec b/mms2r.gemspec
index fe175b7..30385bc 100644
--- a/mms2r.gemspec
+++ b/mms2r.gemspec
@@ -1,45 +1,33 @@
-# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path("../lib", __FILE__)
+require "mms2r/version"
-Gem::Specification.new do |s|
- s.name = "mms2r"
- s.version = "3.6.2"
+Gem::Specification.new do |gem|
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Mike Mondragon"]
- s.date = "2011-10-31"
- s.description = "== DESCRIPTION\n\nMMS2R by Mike Mondragon\nhttp://mms2r.rubyforge.org/\nhttps://github.com/monde/mms2r\nhttps://github.com/monde/mms2r/issues\nhttp://peepcode.com/products/mms2r-pdf\n\nMMS2R is a library that decodes the parts of an MMS message to disk while\nstripping out advertising injected by the mobile carriers. MMS messages are\nmultipart email and the carriers often inject branding into these messages. Use\nMMS2R if you want to get at the real user generated content from a MMS without\nhaving to deal with the cruft from the carriers.\n\nIf MMS2R is not aware of a particular carrier no extra processing is done to the\nMMS other than decoding and consolidating its media."
- s.email = ["[email protected]"]
- s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.txt"]
- s.files = ["Gemfile", "Gemfile.lock", "History.txt", "Manifest.txt", "README.TMail.txt", "README.txt", "Rakefile", "conf/1nbox.net.yml", "conf/aliases.yml", "conf/bellsouth.net.yml", "conf/from.yml", "conf/mediamessaging.o2.co.uk.yml", "conf/messaging.nextel.com.yml", "conf/mms.3ireland.ie.yml", "conf/mms.ae.yml", "conf/mms.alltel.com.yml", "conf/mms.att.net.yml", "conf/mms.dobson.net.yml", "conf/mms.luxgsm.lu.yml", "conf/mms.mobileiam.ma.yml", "conf/mms.mtn.co.za.yml", "conf/mms.mycricket.com.yml", "conf/mms.myhelio.com.yml", "conf/mms.netcom.no.yml", "conf/mms.o2online.de.yml", "conf/mms.three.co.uk.yml", "conf/mms.uscc.net.mail", "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/vmpix.com.yml", "conf/vzwpix.com.yml", "conf/waw.plspictures.com.yml", "dev_tools/anonymizer.rb", "dev_tools/debug_sprint_nokogiri_parsing.rb", "init.rb", "lib/ext/mail.rb", "lib/ext/object.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.rb", "mms2r.gemspec", "test/fixtures/1nbox-2images-01.mail", "test/fixtures/1nbox-2images-02.mail", "test/fixtures/1nbox-2images-03.mail", "test/fixtures/1nbox-2images-04.mail", "test/fixtures/3ireland-mms-01.mail", "test/fixtures/ad_new.txt", "test/fixtures/alltel-image-01.mail", "test/fixtures/alltel-mms-01.mail", "test/fixtures/alltel-mms-03.mail", "test/fixtures/apple-double-image-01.mail", "test/fixtures/att-blackberry-02.mail", "test/fixtures/att-blackberry.mail", "test/fixtures/att-image-01.mail", "test/fixtures/att-image-02.mail", "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/dici_un_mois_georgie.txt", "test/fixtures/dobson-image-01.mail", "test/fixtures/dot.jpg", "test/fixtures/generic.mail", "test/fixtures/handsets.yml", "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/iphone-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", "test/fixtures/mmode-image-01.mail", "test/fixtures/mms.ae-image-01.mail", "test/fixtures/mms.mycricket.com-pic-and-text.mail", "test/fixtures/mms.mycricket.com-pic.mail", "test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail", "test/fixtures/mobile.mycingular.com-text-01.mail", "test/fixtures/mtn-southafrica-mms.mail", "test/fixtures/mycingular-image-01.mail", "test/fixtures/netcom-image-01.mail", "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/o2-de-image-01.mail", "test/fixtures/orange-uk-image-01.mail", "test/fixtures/orangefrance-text-and-image.mail", "test/fixtures/orangepoland-text-01.mail", "test/fixtures/orangepoland-text-02.mail", "test/fixtures/pics.cingularme.com-image-01.mail", "test/fixtures/pxt-image-01.mail", "test/fixtures/rogers-canada-mms-01.mail", "test/fixtures/sasktel-image-01.mail", "test/fixtures/sprint-broken-image-01.mail", "test/fixtures/sprint-image-01.mail", "test/fixtures/sprint-new-image-01.mail", "test/fixtures/sprint-pcs-text-01.mail", "test/fixtures/sprint-purged-image-01.mail", "test/fixtures/sprint-text-01.mail", "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/tmo.blackberry.net-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/us-cellular-image-01.mail", "test/fixtures/verizon-blackberry.mail", "test/fixtures/verizon-image-01.mail", "test/fixtures/verizon-image-02.mail", "test/fixtures/verizon-image-03.mail", "test/fixtures/verizon-text-01.mail", "test/fixtures/verizon-video-01.mail", "test/fixtures/virgin-mobile-image-01.mail", "test/fixtures/virgin.ca-text-01.mail", "test/fixtures/vodacom4me-co-za-01.mail", "test/fixtures/vodacom4me-co-za-02.mail", "test/fixtures/vodacom4me-southafrica-mms-01.mail", "test/fixtures/vodacom4me-southafrica-mms-04.mail", "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", "test/test_helper.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_messaging_nextel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms2r_media.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_alltel_com.rb", "test/test_mms_att_net.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_mycricket_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_netcom_no.rb", "test/test_mms_o2online_de.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_uscc_net.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_vmpix_com.rb", "test/test_vzwpix_com.rb", "test/test_waw_plspictures_com.rb", "vendor/plugins/mms2r/lib/autotest/discover.rb", "vendor/plugins/mms2r/lib/autotest/mms2r.rb", ".gemtest"]
- s.homepage = "https://github.com/monde/mms2r"
- s.rdoc_options = ["--main", "README.txt"]
- s.require_paths = ["lib"]
- s.rubyforge_project = "mms2r"
- s.rubygems_version = "1.8.10"
- s.summary = "Extract user media from MMS (and not carrier cruft)"
- s.test_files = ["test/test_orangemms_net.rb", "test/test_waw_plspictures_com.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_vzwpix_com.rb", "test/test_unicel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms_luxgsm_lu.rb", "test/test_rci_rogers_com.rb", "test/test_mms_uscc_net.rb", "test/test_mms_netcom_no.rb", "test/test_1nbox_net.rb", "test/test_sms_sasktel_com.rb", "test/test_mms_att_net.rb", "test/test_mobile_indosat_net_id.rb", "test/test_messaging_nextel_com.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_mms_dobson_net.rb", "test/test_helper.rb", "test/test_msg_telus_com.rb", "test/test_mms_o2online_de.rb", "test/test_mms2r_media.rb", "test/test_bell_canada.rb", "test/test_tmomail_net.rb", "test/test_mms_3ireland_ie.rb", "test/test_pm_sprint_com.rb", "test/test_mms_alltel_com.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mycricket_com.rb", "test/test_bellsouth_net.rb", "test/test_mms_three_co_uk.rb", "test/test_vmpix_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_ae.rb"]
+ gem.add_dependency 'rake', ['= 0.9.2.2']
+ gem.add_dependency 'nokogiri', ['>= 1.5.0']
+ gem.add_dependency 'mail', ['>= 2.4.0']
+ gem.add_dependency 'exifr', ['>= 1.0.3']
+ gem.add_dependency 'json', ['>= 1.6.0']
- if s.respond_to? :specification_version then
- s.specification_version = 3
+ gem.add_development_dependency "rdoc"
+ gem.add_development_dependency "simplecov"
+ gem.add_development_dependency 'test-unit'
+ gem.add_development_dependency 'mocha'
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
- s.add_runtime_dependency(%q<mail>, [">= 2.2.10"])
- s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.1"])
- s.add_runtime_dependency(%q<exifr>, [">= 1.0.3"])
- s.add_development_dependency(%q<hoe>, ["~> 2.12"])
- else
- s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
- s.add_dependency(%q<mail>, [">= 2.2.10"])
- s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
- s.add_dependency(%q<exifr>, [">= 1.0.3"])
- s.add_dependency(%q<hoe>, ["~> 2.12"])
- end
- else
- s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
- s.add_dependency(%q<mail>, [">= 2.2.10"])
- s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
- s.add_dependency(%q<exifr>, [">= 1.0.3"])
- s.add_dependency(%q<hoe>, ["~> 2.12"])
- end
+ gem.name = "mms2r"
+ gem.version = MMS2R::Version.to_s
+ gem.platform = Gem::Platform::RUBY
+ gem.authors = ["Mike Mondragon"]
+ gem.email = ["[email protected]"]
+ gem.homepage = "https://github.com/monde/mms2r"
+ gem.summary = "Extract user media from MMS (and not carrier cruft)"
+ gem.description = open(File.join(File.dirname(__FILE__), 'README.txt')).readlines[6...22].join
+ gem.rubyforge_project = "mms2r"
+ gem.rubygems_version = ">= 1.3.6"
+ gem.files = `git ls-files`.split("\n")
+ gem.require_path = ['lib']
+ gem.rdoc_options = ["--main", "README.txt"]
+ gem.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.txt"]
+
+ gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index a2c57ca..df698cf 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,97 +1,103 @@
-# do it like rake http://ozmm.org/posts/do_it_like_rake.html
+if ENV['COVERAGE']
+ require 'simplecov'
+ SimpleCov.start do
+ add_filter 'test'
+ end
+end
-%W{ test/unit set net/http net/https pp tempfile mocha rcov/rcovtask }.each do |g|
+# do it like rake http://ozmm.org/posts/do_it_like_rake.html
+%W{ test/unit set net/http net/https pp tempfile mocha }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'mms2r')
module MMS2R
module TestHelper
def assert_file_size(file, size)
assert_not_nil(file, "file was nil")
assert(File::exist?(file), "file #{file} does not exist")
assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
end
def fixture(file)
File.join(File.expand_path(File.dirname(__FILE__)), "fixtures", file)
end
def fixture_data(name)
open(fixture(name)).read
end
def mail_fixture(file)
fixture(file)
end
def mail(name)
Mail.read(mail_fixture(name))
end
def smart_phone_mock(make_text = 'Apple', model_text = 'iPhone', software_text = nil, jpeg = true)
mail = stub('mail',
:from => ['[email protected]'],
:return_path => '<[email protected]>',
:message_id => 'abcd0123',
:multipart? => true,
:header => {})
part = stub('part',
:part_type? => "image/#{jpeg ? 'jpeg' : 'tiff'}",
:body => Mail::Body.new('abc'),
:multipart? => false,
:filename => "foo.#{jpeg ? 'jpg' : 'tif'}" )
mail.stubs(:parts).returns([part])
exif = stub('exif', :make => make_text, :model => model_text, :software => software_text)
if jpeg
EXIFR::JPEG.expects(:new).at_least_once.returns(exif)
else
EXIFR::TIFF.expects(:new).at_least_once.returns(exif)
end
mail
end
end
end
class Hash
def except(*keys)
rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
reject { |key,| rejected.include?(key) }
end
def except!(*keys)
replace(except(*keys))
end
end
# monkey patch Net::HTTP so un caged requests don't go over the wire
module Net #:nodoc:
class HTTP #:nodoc:
alias :old_net_http_request :request
alias :old_net_http_connect :connect
def request(req, body = nil, &block)
uri_cls = use_ssl ? URI::HTTPS : URI::HTTP
query = req.path.split('?',2)
opts = {:host => self.address,
:port => self.port, :path => query[0]}
opts[:query] = query[1] if query[1]
uri = uri_cls.build(opts)
raise ArgumentError.new("#{req.method} method to #{uri} not being handled in testing")
end
def connect
raise ArgumentError.new("connect not being handled in testing")
end
end
end
|
monde/mms2r
|
8d2de6fb15094edb09527af696e1657094498af1
|
Whitespace fascist!
|
diff --git a/dev_tools/debug_sprint_nokogiri_parsing.rb b/dev_tools/debug_sprint_nokogiri_parsing.rb
index 1ddf5c4..a6a0ee3 100644
--- a/dev_tools/debug_sprint_nokogiri_parsing.rb
+++ b/dev_tools/debug_sprint_nokogiri_parsing.rb
@@ -1,87 +1,87 @@
require 'rubygems'
require 'nokogiri'
require 'net/http'
require 'cgi'
require 'rubygems'
require 'pp'
if ARGV[0].nil?
puts "please execute with a file path to a Sprint HTML file that was extracted from a MMS"
puts "ruby #{$0} MYFILE"
exit
end
doc = open(ARGV[0]) { |f| Nokogiri(f) }
puts "TITLE: #{doc.at('title').inner_html}"
#phone number is tucked away in the comment in the head
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
number = / name="MDN">(\d+)</.match(t)[1]
puts "NUMBER: #{number}"
#if there is a text message with the MMS its in the
#inner html of the only pre on the page
text = doc.search("/html/body//pre").first.inner_html
puts "TEXT: #{text}"
-# just see what they say this MMS is it really doesn't mean anything, the
+# just see what they say this MMS is it really doesn't mean anything, the
# content is in faux image with a RECIPIENT in its URI path
text = doc.search("/html/body//tr[2]/td//b")
case text.text
when /You have a Video Mail from/
puts "it claims to be a video: #{text}"
when /You have a Picture Mail from /
puts "it claims to be an image: #{text}"
else
puts "what is it? #{text.text}"
end
# group all the images together
srcs = Array.new
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
#next unless /pictures.sprintpcs.com\/+mmps\/RECIPIENT\//.match(src)
#we don't want to double fetch content and we only
#want to fetch media from the content server, you get
#a clue about that as there is a RECIPIENT in the URI path
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
# now fetch the media
puts "there are #{srcs.size} sources to fetch"
cnt = 0
srcs.each do |src|
puts "--"
puts "FETCHING:\n #{src.text}"
url = URI.parse(CGI.unescapeHTML(src.text))
query={}
url.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("&")
# sprint is a ghetto, they expect to see & for video request
url.query = url.query.gsub(/&/, "&") if @is_video
#res = Net::HTTP.get_response(url)
agent = "Mozilla/5.0 (X11; U; Minix3 i686 (x86_64); en-US; rv:1.8.1.1) Gecko/20061208 Firefox/2.0.0.1"
res = Net::HTTP.start(url.host, url.port) { |http|
req = Net::HTTP::Get.new(url.request_uri, {'User-Agent' => agent})
http.request(req)
}
# prep and write a file
base = /\/RECIPIENT\/([^\/]+)\//.match(src)[1]
ext = /^[^\/]+\/(.+)/.match(res.content_type)[1]
file_name ="#{base}.#{cnt}.#{ext}"
puts "writing file: #{file_name}"
File.open(file_name,'w'){ |f| f.write(res.body) }
puts "file is sized #{File.size(file_name)}"
cnt = cnt + 1
end
puts "no images or video" if srcs.size == 0
diff --git a/test/fixtures/handsets.yml b/test/fixtures/handsets.yml
index 90b6c13..706d07d 100644
--- a/test/fixtures/handsets.yml
+++ b/test/fixtures/handsets.yml
@@ -1,119 +1,119 @@
----
+---
- - Apple
- iPhone
- - Apple
- iPhone 3G
- - Apple
- iPhone 3GS
- - CASIO
- G'z One TYPE-S
- - CASIO
- G'zOne ROCK
- - CX87BL05
- LG8700
- - ES.M800
- SPH-M800
- - HTC
- Eris
- - HTC
- HERO200
- - HTC
- HTC_TyTN_II
- - HTC
- RAPH800
- - HTC
- T-Mobile G1
- - HTC
- T-Mobile myTouch 3G
- - HTC-ST7377
- HTC-ST7377
- - ISUS02232009
- Seoul Electronics & Telecom SIM120B 1.3M
- - ISUS09012008
- Seoul Electronics & Telecom SIM120B 1.3M
- - LG Electronics
- VX-8800
- - LG Electronics
- VX-9700
- - LG Electronics
- VX11000
- - LG Electronics, Inc.
- LG RUMOR2
- - LGE
- CU920
- - M6550B-SAM-4480
- SYSTEMLSI S5K4BAFB 2.0 MP
- - MSM6100
- Omni_vision-9650
- - MSM6500
- LSI_S5K4AAFA
- - Motorola
- 1.3 Megapixel
- - Motorola
- Droid
- - Motorola
- Motorola Phone
- - Motorola C.451.01.04.17.08
- 2.0 Megapixel
- - PANTECH
- C790
- - RIM
- BlackBerry 8100 Series
- - Research In Motion
- BlackBerry 8310
- - Research In Motion
- BlackBerry 8320
- - Research In Motion
- BlackBerry 8330
- - Research In Motion
- BlackBerry 8330m
- - Research In Motion
- BlackBerry 8530
- - Research In Motion
- BlackBerry 8900
- - Research In Motion
- BlackBerry 9700
- - SAMSUNG
- SAMSUNG
- - SAMSUNG
- SCH-U350
- - SAMSUNG
- SCH-U450
- - SAMSUNG
- SCH-U490
- - SAMSUNG
- SGH-A167
- - SAMSUNG
- SGH-A437
- - SAMSUNG
- SGH-E250
- - SAMSUNG
- SGH-T459
- - SAMSUNG
- SGH-T729
- - SAMSUNG
- SPH-M900
- - SAMSUNG
- Samsung SCH-U750
- - SAMSUNG Electronics
- SGH-i637
- - Samsung Electronics
- A727
- - Samsung Electronics
- A767
- - Samsung Electronics
- SGH-A737
- - Samsung Electronics
- SGH-T749
- - Samsung Electronics
- SGH-T819
- - Samsung Electronics
- T639
- - Sprint
- KATANA Eclipse X
- - T-Mobile Dash
- T-Mobile Dash
- - T1A_UC1.88
- Micron MT9M113 1.3MP YUV
- - google
- Nexus One
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index d9f923d..d3db314 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,878 +1,878 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
@oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@oldtmpdir)
FileUtils.mkdir_p(@oldconfdir)
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
end
end
def test_faux_user_agent
assert_equal "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2", MMS2R::Media::USER_AGENT
end
def test_class_parse
mms = mail('generic.mail')
assert_equal ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Windows Phone")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent via iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
- mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
+ mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
# ASCII-8BIT -> D'ici un mois G\xE9orgie
# UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
else
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
end
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'text/plain' || type == 'text/html'
- assert_equal true, File.basename(files.first) == 'message.txt' ||
+ assert_equal true, File.basename(files.first) == 'message.txt' ||
File.basename(files.first) == 'message.html'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_faux_tiff_iphone_device_type_by_exif
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_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)
assert_equal :dash, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_droid_device_type_by_exif
mail = smart_phone_mock('Motorola', 'Droid')
mms = MMS2R::Media.new(mail)
assert_equal :droid, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_eris_device_type_by_exif
mail = smart_phone_mock('HTC', 'Eris')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_hero_device_type_by_exif
mail = smart_phone_mock('HTC', 'HERO200')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
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|
mail = smart_phone_mock(handset.first, handset.last)
mms = MMS2R::Media.new(mail)
assert_equal true, mms.is_mobile?, "mms with make #{mms.exif.make}, and model #{mms.exif.model}, should be considered a mobile device"
end
end
def test_blackberry_device_type
berries = ['att-blackberry.mail',
'suncom-blackberry.mail',
'tmobile-blackberry-02.mail',
'tmobile-blackberry.mail',
'tmo.blackberry.net-image-01.mail',
'verizon-blackberry.mail',
'verizon-blackberry.mail']
berries.each do |berry|
mms = MMS2R::Media.new(mail(berry))
assert_equal :blackberry, mms.device_type?, "fixture #{berry} was not a blackberrry"
assert_equal true, mms.is_mobile?
end
end
def test_handset_device_type
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal :handset, mms.device_type?
assert_equal true, mms.is_mobile?
end
end
diff --git a/test/test_pm_sprint_com.rb b/test/test_pm_sprint_com.rb
index 9edd048..372ccf6 100644
--- a/test/test_pm_sprint_com.rb
+++ b/test/test_pm_sprint_com.rb
@@ -1,317 +1,317 @@
require "test_helper"
class TestPmSprintCom < Test::Unit::TestCase
include MMS2R::TestHelper
def mock_sprint_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_purged_image(message_id)
response = mock('response')
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(: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)
end
-
+
def mock_sprint_ajax
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-success.json", "rb")
json = file.read
body.expects(:to_str).returns json
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('200')
response.expects(:content_type).twice.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
end
def mock_sprint_ajax_purged
response = mock('response')
body = mock('body')
# this is a response from a real sprint message
file = File.open("./test/fixtures/sprint-ajax-response-failure.html", "rb")
error_html = file.read
body.expects(:to_str).returns error_html
connection = mock('connection')
connection.stubs(:use_ssl=).returns(true)
response.expects(:body).twice.returns(body)
response.expects(:code).once.returns('500')
response.expects(:content_type).once.returns('text/html')
Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
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 }
).twice.returns(response)
- end
-
+ end
+
def test_mms_should_have_text
mail = mail('sprint-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068765309", mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert_equal true, File.exist?(file)
assert_match(/\.txt$/, File.basename(file))
assert_equal "Tea Pot", IO.read(file)
mms.purge
end
def test_mms_should_have_a_phone_number
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
mms.purge
end
def test_should_have_simple_video
mail = mail('sprint-video-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).once.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/quicktime']
assert_equal 1, mms.media['video/quicktime'].size
assert_equal "000_259e41e851be9b1d_1-0.mov", File.basename(mms.media['video/quicktime'][0])
mms.purge
end
def test_should_have_simple_image
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/001_2066c7013e7ca833_1-0.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
def test_collect_image_using_block
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
file_array = nil
mms.process do |k, v|
file_array = v if (k == 'image/jpeg')
assert_equal 1, file_array.size
file = file_array.first
assert_not_nil file = file_array.first
assert_equal "001_2066c7013e7ca833_1-0.jpg", File.basename(file)
end
mms.purge
end
def test_process_internals_should_only_be_executed_once
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
# second time through shouldn't go into the was_processed block
mms.mail.expects(:parts).never
mms.process{|k, v| }
mms.purge
end
def test_should_have_two_images
mail = mail('sprint-two-images-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).twice.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 2, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'][0]
assert_not_nil mms.media['image/jpeg'][1]
assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
mms.purge
end
def test_image_should_be_missing
# this test is questionable
mail = mail('sprint-broken-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_message_is_missing_in_mail
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal 1, mms.media['text/plain'].size
# test that the message was extracted from the ajax response
message = IO.readlines(mms.media['text/plain'].first).join("")
assert_equal "Just testing the caption on Sprint", message
mms.purge
end
-
+
def test_message_is_missing_in_mail_purged_from_content_server
# this test is questionable
mail = mail('sprint-image-missing-message.mail')
mock_sprint_ajax_purged
mms = MMS2R::Media.new(mail)
assert_equal '5135455555', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
-
+
def test_image_should_be_purged_from_content_server
mail = mail('sprint-image-01.mail')
mock_sprint_purged_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_body_should_return_empty_when_there_is_no_user_text
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.body
end
def test_sprint_write_file
mail = mock(:message_id => 'a')
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
mms = MMS2R::Media.new(mail, :process => :lazy)
type = 'text/plain'
content = 'foo'
file = Tempfile.new('sprint')
file.close
type, file = mms.send(:sprint_write_file, type, content, file.path)
assert_equal 'text/plain', type
assert_equal content, IO.read(file)
end
def test_subject
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
def test_new_subject
mail = mail('sprint-new-image-01.mail')
mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
end
|
monde/mms2r
|
886c61c0c9d4c126f5206d5148364e05971b8bcc
|
Don't open up Object if someone else already has put a #blank? or #present? on the class.
|
diff --git a/lib/ext/object.rb b/lib/ext/object.rb
index 70dbc56..85a0d8f 100644
--- a/lib/ext/object.rb
+++ b/lib/ext/object.rb
@@ -1,11 +1,19 @@
class Object
- def blank?
- respond_to?(:empty?) ? empty? : !self
+ unless respond_to?(:blank?)
+
+ def blank?
+ respond_to?(:empty?) ? empty? : !self
+ end
+
end
- def present?
- !blank?
+ unless respond_to?(:present?)
+
+ def present?
+ !blank?
+ end
+
end
end
|
monde/mms2r
|
3b3865ca627b21bdd273201bc5ea07a4f3ef1a7a
|
clean out some white space
|
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index c9e9ceb..8df6c6f 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,247 +1,248 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
require 'json'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
- # if there is no text media found in the mail body - then we go to more
+ # if there is no text media found in the mail body - then we go to more
# extreme measures.
text_found = false
-
+
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
next if text.empty?
+
text_found = true
type, text = transform_text(type, text)
type, file = sprint_write_file(type, text.strip)
add_file(type, file) unless type.nil? || file.nil?
end
# if no text was found, there still might be a message with images
- # that can be seen at the end of the "View Entire Message" link
+ # that can be seen at the end of the "View Entire Message" link
if !text_found
view_entire_message_link = doc.search("a").find { |link| link.inner_html == "View Entire Message"}
# if we can't find the view entire message link, give up
if view_entire_message_link
# Sprint uses AJAX/json to serve up the content at the end of the link so this is conveluted
url = view_entire_message_link.attr("href")
# extract the "invite" param out of the url - this will be the id we pass to the ajax path below
inviteMessageId = CGI::parse(URI::parse(url).query)["invite"].first
-
+
if inviteMessageId
json_url = "http://pictures.sprintpcs.com/ui-refresh/guest/getMessageContainerJSON.do%3FcomponentType%3DmediaDetail&invite=#{inviteMessageId}&externalMessageId=#{inviteMessageId}"
# pull down the json from the url and parse it
uri = URI.parse(json_url)
connection = Net::HTTP.new(uri.host, uri.port)
response = connection.get2(
uri.request_uri,
{ "User-Agent" => MMS2R::Media::USER_AGENT }
)
content = response.body
-
+
# if the content has expired, sprint sends back html "content expired page
# json will fail to parse
begin
json = JSON.parse(content)
-
+
# there may be multiple "results" in the json - due to multiple images
- # cycle through them and extract the "description" which is the text
+ # cycle through them and extract the "description" which is the text
# message the sender sent with the images
- json["Results"].each do |result|
+ json["Results"].each do |result|
type = 'text/plain'
text = result["description"] ? result["description"].strip : nil
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?
end
rescue JSON::ParserError => e
log("#{self.class} processing error, #{$!}", :error)
end
end
end
- end
+ end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
unless @is_video
query={}
uri.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
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)
#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
end
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
# force the encoding to be utf-8
content = content.force_encoding("UTF-8") if content.respond_to?(:force_encoding)
File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
|
monde/mms2r
|
2bb66ed420c8013668a618e96fda29c3d03ed48b
|
strip a variation of the iphone default footer
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 3ecd090..4d78f4e 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,79 +1,79 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Windows Phone.*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- - !ruby/regexp /\ASent from (my|your) iPhone.?$/im
+ - !ruby/regexp /\ASent (via|(from (my|your))) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Windows Phone.*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
+ - - !ruby/regexp /\A(.*?)Sent (via|(from (my|your))) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
boundary:
:motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:nokia: !ruby/regexp /^Nokia/i
:pantech: !ruby/regexp /^PANTECH$/i
:palm: !ruby/regexp /Palm/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:centro: !ruby/regexp /^Palm Centro$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/
:video: !ruby/regexp /\.3gp$/
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index 5dd4389..d9f923d 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,710 +1,711 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
@oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@oldtmpdir)
FileUtils.mkdir_p(@oldconfdir)
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
end
end
def test_faux_user_agent
assert_equal "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2", MMS2R::Media::USER_AGENT
end
def test_class_parse
mms = mail('generic.mail')
assert_equal ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Windows Phone")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
+ assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent via iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
# ASCII-8BIT -> D'ici un mois G\xE9orgie
# UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
else
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
end
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
|
monde/mms2r
|
e8df44f79dc6ccd55b7611264a95b89bc4ca3387
|
Added test cases for downloading messages from sprint with ajax. Test when message exists, and when message has been purged.
|
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index 49d99ac..c9e9ceb 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,229 +1,247 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
+require 'json'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
# if there is no text media found in the mail body - then we go to more
# extreme measures.
text_found = false
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
next if text.empty?
text_found = true
type, text = transform_text(type, text)
type, file = sprint_write_file(type, text.strip)
add_file(type, file) unless type.nil? || file.nil?
end
-
# if no text was found, there still might be a message with images
# that can be seen at the end of the "View Entire Message" link
if !text_found
- # Sprint uses AJAX/josn to serve up the content at the end of the link so this is conveluted
view_entire_message_link = doc.search("a").find { |link| link.inner_html == "View Entire Message"}
- url = view_entire_message_link.attr("href")
- # extract the "invite" param out of the url - this will be the id we pass to the ajax path below
- inviteMessageId = CGI::parse(URI::parse(url).query)["invite"].first
- json_url = "http://pictures.sprintpcs.com/ui-refresh/guest/getMessageContainerJSON.do%3FcomponentType%3DmediaDetail&invite=#{inviteMessageId}&externalMessageId=#{inviteMessageId}"
- # pull down the json from the url and parse it
- json_response = Net::HTTP.get_response(URI.parse(json_url))
- json = JSON.parse(json_response.body)
-
- # there may be multiple "results" in the json - due to multiple images
- # cycle through them and extract the "description" which is the text
- # message the sender sent with the images
- json["Results"].each do |result|
- type = 'text/plain'
- text = result["description"] ? result["description"].strip : nil
- 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?
+ # if we can't find the view entire message link, give up
+ if view_entire_message_link
+ # Sprint uses AJAX/json to serve up the content at the end of the link so this is conveluted
+ url = view_entire_message_link.attr("href")
+ # extract the "invite" param out of the url - this will be the id we pass to the ajax path below
+ inviteMessageId = CGI::parse(URI::parse(url).query)["invite"].first
+
+ if inviteMessageId
+ json_url = "http://pictures.sprintpcs.com/ui-refresh/guest/getMessageContainerJSON.do%3FcomponentType%3DmediaDetail&invite=#{inviteMessageId}&externalMessageId=#{inviteMessageId}"
+ # pull down the json from the url and parse it
+ uri = URI.parse(json_url)
+ connection = Net::HTTP.new(uri.host, uri.port)
+ response = connection.get2(
+ uri.request_uri,
+ { "User-Agent" => MMS2R::Media::USER_AGENT }
+ )
+ content = response.body
+
+ # if the content has expired, sprint sends back html "content expired page
+ # json will fail to parse
+ begin
+ json = JSON.parse(content)
+
+ # there may be multiple "results" in the json - due to multiple images
+ # cycle through them and extract the "description" which is the text
+ # message the sender sent with the images
+ json["Results"].each do |result|
+ type = 'text/plain'
+ text = result["description"] ? result["description"].strip : nil
+ 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?
+ end
+ rescue JSON::ParserError => e
+ log("#{self.class} processing error, #{$!}", :error)
+ end
+ end
end
end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
unless @is_video
query={}
uri.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
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)
#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
end
-
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
# force the encoding to be utf-8
content = content.force_encoding("UTF-8") if content.respond_to?(:force_encoding)
File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
diff --git a/test/fixtures/sprint-ajax-response-failure.html b/test/fixtures/sprint-ajax-response-failure.html
new file mode 100644
index 0000000..4ce2c65
--- /dev/null
+++ b/test/fixtures/sprint-ajax-response-failure.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+
+<head>
+
+
+
+ <meta name="ROBOTS" content="NOINDEX,NOFOLLOW"/>
+ <title>Pictures from Sprint</title>
+ <link rel="shortcut icon" type="image/x-icon" href="/retailers/PCSNEXTEL/ui-refresh/images/icons/favicon.ico"/>
+ <link rel="stylesheet" type="text/css" href="/combined.css.h-968716942.pack" charset="utf-8"/>
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" type="text/css" href="/combined.css.h-865380446.pack" charset="utf-8"/>
+
+
+<script type="text/javascript" src="/combined.js.h2135702050.pack" charset="utf-8"></script>
+<script type="text/javascript" src="/js/ui-refresh/jsprops.jsp"></script>
+
+</head>
+<body class="yui-skin-sam" onload=";javascript:YAHOO.com.sprint.pm.util.functions.isLoginPageLoadedIntoIframe();" onunload="">
+
+
+<div id="com-sprint-pm-panel-container" class="com-sprint-pm-panel-container"></div>
+
+<div id="com-xoom-widget-result-dialog"></div>
+
+<div id="custom-doc" class="yui-t7">
+
+
+
+ <div id="hd">
+
+
+
+
+
+
+
+
+
+
+
+<div id="com-sprint-pm-brand"><a href="http://www.sprintpcs.com" target="_blank"></a></div>
+
+<div class="yui-g">
+ <img src="/retailers/PCSNEXTEL/ui-refresh/images/sprint-nav.gif" width="963" height="57" alt="Sprint Navigation" usemap="#sprint_nav_Map"/>
+</div>
+
+
+
+
+
+<map id="sprint_nav_Map" name="sprint_nav_Map">
+ <area shape="rect" title="Support" alt="Support" coords="537,15,620,44" href="http://support.sprint.com/support" onclick="javascript:YAHOO.com.sprint.pm.util.functions.removeSSOCookie();"/>
+ <area shape="rect" title="Community" alt="Community" coords="429,15,533,44" href="http://community.sprint.com/" onclick="javascript:YAHOO.com.sprint.pm.util.functions.removeSSOCookie();"/>
+ <area shape="rect" title="Digital Lounge" alt="Digital Lounge" coords="305,15,425,44" href="http://www.sprint.com/digitallounge" onclick="javascript:YAHOO.com.sprint.pm.util.functions.removeSSOCookie();"/>
+ <area shape="rect" title="Shop" alt="Shop" coords="230,15,300,44" href="http://www.nextel.com/en/shop/" onclick="javascript:YAHOO.com.sprint.pm.util.functions.removeSSOCookie();"/>
+ <area shape="rect" title="My Sprint" alt="My Sprint" coords="137,15,225,44" onclick="javascript:YAHOO.com.sprint.pm.util.functions.removeSSOCookie();" href="https://mysprint.sprint.com/mysprint/pages/secure/myaccount/landingPage.jsp"/>
+ <area shape="rect" title="Sprint.com" alt="Sprint.com" coords="0,0,110,44" onclick="javascript:YAHOO.com.sprint.pm.util.functions.removeSSOCookie();" href="http://www.sprint.com"/>
+</map>
+</div>
+
+ <div id="bd">
+ <div id="yui-main">
+
+
+
+
+
+
+
+ <div class="yui-navset">
+ <ul class="yui-nav"><li class="yui-li-empty-tab-nav"></li></ul>
+ <div class="yui-content">
+ <div id="com-sprint-pm-configurable-content-holder" class="yui-g">
+
+<div class="com-sprint-pm-one-panel-box">
+ <div class="com-sprint-pm-one-panel-content">
+ <div class="com-sprint-pm-title-heading"><img src="/retailers/PCSNEXTEL/ui-refresh/images/title/title_error.gif"/></div><br/><br/>
+ <div>Sorry, but the shared album or picture has been removed by its owner.</div><br/>
+ </div>
+</div>
+
+ <div class="com-sprint-pm-one-panel-verisign-logo">
+</div>
+ </div>
+ </div>
+ </div>
+
+ </div><!-- /yui-main -->
+ </div> <!-- close bd -->
+
+ <div id="ft">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<div id="com-sprint-pm-footer" >
+ <div class="yui-ge">
+ <div class="yui-u first">
+ <ul id="com-sprint-pm-footerLinks">
+ <li>Order by phone 1-800-2-SPRINT</li>
+ <li><a href="http://www2.sprint.com/mr/aboutsprint.do" target="_blank" title="About Us">About Us</a></li>
+ <li><a href="http://www.sprint.com/contactus/" target="_blank" title="Contact Us">Contact Us</a></li>
+ <li><a href="http://www.sprint.com/legal/picturemail_terms_and_conditions.html" target="_blank" title="Terms of Use">Terms of Use</a></li>
+ <li class="pm-last"><a href="http://www.sprint.com/legal/privacy.html" target="_blank" title="Privacy Policy">Privacy Policy</a></li>
+ </ul>
+ </div>
+ <div class="yui-u" id="com-sprint-pm-copyright">
+ © 2012 Sprint. All rights reserved.<br/>
+ </div>
+ </div>
+
+
+
+<script type="text/javascript" src="/combined.js.h845901428.pack" charset="utf-8"></script>
+<script type="text/javascript"> _uacct = "UA-822828-4"; _udn=".sprintpcs.com"; YAHOO.com.sprint.pm.util.functions.urchinTracker(); </script>
+
+
+ </div>
+
+</div> <!-- close custom-doc -->
+</body>
+
+
+
+
+</html>
diff --git a/test/fixtures/sprint-ajax-response-success.json b/test/fixtures/sprint-ajax-response-success.json
new file mode 100644
index 0000000..a080747
--- /dev/null
+++ b/test/fixtures/sprint-ajax-response-success.json
@@ -0,0 +1 @@
+{"totalMediaItems":1,"shareType":"normal","nomediaItem":"false","isOnlyVideo":null,"creationDate":"Apr 16, 2012","from":"(513)545-5510","offset":null,"externalMessageId":"GEc4YYms2Y7KAkmhaoFL","Results":[{"elementID":"2","hasVoiceCaption":false,"URL":{"elementID":"2","indexCount":0,"audio":null,"thumb":"http:\/\/pictures.sprintpcs.com:80\/mmps\/031_36415d1a9c3c73f0_1\/2.jpg?partExt=.jpg&&&outquality=90&ext=.jpg&&size=40,40&squareoutput=255,255,255&aspectcrop=0.5,0.5,1.0,1.0,1.0","annotationVoiceID":null,"image":"http:\/\/pictures.sprintpcs.com:80\/mmps\/031_36415d1a9c3c73f0_1\/2.jpg?partExt=.jpg&&&outquality=90&ext=.jpg","video":null},"description":"Just testing the caption on Sprint","mediaItemNum":0,"isDRMProtected":false,"externalMessageId":"GEc4YYms2Y7KAkmhaoFL","mediaType":"IMAGE","restOperation":"false","folderFullName":"\/RECIPIENT"}],"invite":null,"tmemo":null,"toAddress":"[email protected]","mediaIndex":0,"subject":"New Message","isDRMProtected":false,"expirationDate":"Expires in 18 days","voiceURL":null,"guest":"true","folderFullName":"\/RECIPIENT"}
\ No newline at end of file
diff --git a/test/fixtures/sprint-image-missing-message.mail b/test/fixtures/sprint-image-missing-message.mail
new file mode 100644
index 0000000..95feb55
--- /dev/null
+++ b/test/fixtures/sprint-image-missing-message.mail
@@ -0,0 +1,183 @@
+Return-Path: <[email protected]>
+Received: by 10.112.114.196 with SMTP id ji4csp42935lbb; Mon, 16 Apr 2012 13:50:50 -0700
+Received: by 10.68.195.103 with SMTP id id7mr30477156pbc.98.1334609449244; Mon, 16 Apr 2012 13:50:49 -0700
+Received: from smtp04.sun3.lightsurf.net (smtp.sun3.lightsurf.net. [63.215.195.131]) by mx.google.com with ESMTPS id s4si21720545pbc.315.2012.04.16.13.50.48 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Apr 2012 13:50:49 -0700
+Received: from pcs-nams007 (pcs-mmsc.sun3.lightsurf.net [10.0.0.152]) by smtp04.sun3.lightsurf.net (8.12.11.20060308/8.12.11) with ESMTP id q3GKoNxU028344 for <[email protected]>; Mon, 16 Apr 2012 13:50:48 -0700
+Date: Mon, 16 Apr 2012 13:50:48 -0700
+From: "[email protected]" <[email protected]>
+To: [email protected]
+Message-ID: <28315302.1330941238231.JavaMail.lsadm@pcs-nams007>
+Subject: New Message
+Mime-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="----=_Part_313708_25410566.1334609448230";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+Delivered-To: [email protected]
+Received-SPF: neutral (google.com: 63.215.195.131 is neither permitted nor
+ denied by best guess record for domain of [email protected])
+ client-ip=63.215.195.131;
+Authentication-Results: mx.google.com; spf=neutral (google.com: 63.215.195.131
+ is neither permitted nor denied by best guess record for domain of
+ [email protected]) [email protected]
+X-Priority: 3
+X-MSMail-Priority: Normal
+Importance: Normal
+
+
+
+------=_Part_313708_25410566.1334609448230
+Date: Mon, 16 Apr 2012 20:57:48 +0000
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=us-ascii
+Content-Transfer-Encoding: 7bit
+Content-ID: <4f8c87cc3a7_3bcbcf3a47358c@711c1195-3077-406a-aba4-b6725acc21c4.mail>
+
+New Picture Mail from {SENDER_ADDRESS}!
+
+Click Go/View to see.
+http://pictures.sprintpcs.com/?mivt=dWQEWQERDWEefwWEf&shareName=MMS
+
+ _frsthgl
+
+------=_Part_313708_25410566.1334609448230
+Date: Mon, 16 Apr 2012 20:57:48 +0000
+Mime-Version: 1.0
+Content-Type: text/html;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+Content-ID: <4f8c87cc1220_3bcbcf3a4736fd@711c1195-3077-406a-aba4-b6725acc21c4.mail>
+
+<html>
+<head><title>You have new Picture Mail!</title>
+<!-- lsPictureMail-Share-dWQEWQERDWEefwWEf-comment
+<?xml version="1.0" encoding="UTF-8"?>
+<shareMessage>
+ <messageContents type="PICTURE">
+ <messageText></messageText>
+ <mediaItems>
+ <mediaItem id="1">
+ <title></title>
+ &lt;url&gt;http://pictures.sprintpcs.com/getMMBOXMessageMedia?id=Xw1004H8sLv6S3x76lVPYolcexVfCdoEvXqTgC1LOkLONz34IC9SMwmk5gW%2FZUWGqyw0fwJJvr5z%0ARdCKg1wQYriT07mKN82PqmTlYRVwDMWGkNKbb8WqPD%2F4a1A61I2rQ26BSr%2Fb84dpnib%2FsZpVJg%3D%3D%0A&lt;/url&gt;
+
+ <urlExpiration>2012-04-23T20:50:48Z</urlExpiration>
+ </mediaItem>
+ </mediaItems>
+ </messageContents>
+</shareMessage>
+
+-->
+<!-- lsPictureMail-UserInfo-dWQEWQERDWEefwWEf-comment
+<?xml version="1.0" encoding="UTF-8"?>
+<UserInfo timestamp="2012-04-16T20:50:48.228+00:00" originating_from_address="[email protected]"><credential name="MDN">5135455555</credential></UserInfo>
+ -->
+</head>
+<body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
+<table border="0" width="100%" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" >
+<tr>
+ <td VALIGN="top" colspan="2" width="100%">
+ <div style="border-bottom:1px solid rgb(156, 154, 156); padding:20px 0px 20px 10px"><a href="http://www.sprintpcs.com"><img src="http://pictures.sprintpcs.com/retailers/PCSNEXTEL/ui-refresh/images/logo/sprint-logo-white.jpg" alt="" border="0" /></a></div>
+ </td>
+</tr>
+<tr>
+ <td VALIGN="top" colspan="2">
+ <table border="0" cellpadding="0" cellspacing="0" width="590" bgcolor="#FFFFFF">
+ <tr>
+ <td><br/><p><img src="http://pictures.sprintpcs.com/images/x.gif" border="0" width="10"/><font face="trebuchet ms, Helvetica, Arial, Verdana" size="2"><b>You have a Picture Mail from [email protected]</b></font><br/><br/></p></td>
+ </tr>
+ </table>
+ </td>
+</tr>
+<tr>
+ <td colspan="2">
+ <table border="0" width="590" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="10"> </td>
+ <td width="280" valign="top">
+ <table border="0" cellpadding="0" style="border:1px solid #9C9A9C;">
+ <tr>
+ <td>
+ <table border="0" bgcolor="#ffffff" cellpadding="0" cellspacing="7" style="table-layout:fixed">
+ <tr>
+ <td align="center">
+ <img src="http://pictures.sprintpcs.com//mmps/RECIPIENT/031_36415d1a9c3c73f0_1/2?inviteToken=dWQEWQERDWEefwWEf&limitsize=258,258&outquality=90&squareoutput=255,255,255&ext=.jpg&iconifyVideo=true&wm=1"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td width="20"> </td>
+ <td VALIGN="top" align="right" width="280">
+ <table border="0" cellpadding="0" cellspacing="0" width="280" style="table-layout:fixed">
+ <tr>
+ <td><p><font face="trebuchet ms, Helvetica, Arial, Verdana" size="2"><b>Message:</b></font></p></td>
+ </tr>
+ <tr>
+ <td><pre style="overflow:auto; font:normal 10pt trebuchet ms; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"></pre></td>
+ </tr>
+ <tr>
+ <td><img src="http://pictures.sprintpcs.com/images/x.gif" border="0" height="15"/></td>
+ </tr>
+ <tr>
+ <td width="280">
+ <div style="padding:0px; background-color:#fff; font: normal 10pt trebuchet ms" width="280">
+ <a target="_blank" style="color: #148AB2;" href="http://pictures.sprintpcs.com/share.do?invite=dWQEWQERDWEefwWEf&shareName=MMS&messageState=RETRIEVED">View Entire Message</a>
+ <br/><br/>
+ Send and receive Pictures and Videos through Picture Mail<sup>SM</sup>. For more information go to <a target="_blank" style="color: #148AB2;" href="http://www.sprint.com/picturemail">www.sprint.com/picturemail.</a>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td>
+ <div style="font: normal 10pt trebuchet ms;margin-top:10px;">Please be aware your friends can forward your picture, video, and album share invitations to others or post the unique Web link to your share invitation on any number of sources (e.g. blogs), through which others could also gain access to your online photos. If you have private or sensitive photos you are sharing, please share them only with those you trust.</div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <img src="http://pictures.sprintpcs.com/images/x.gif" width="5" height="45"/>
+ </td>
+ </tr>
+ <tr>
+ <td VALIGN="top" colspan="2" width="590">
+ <img src="http://pictures.sprintpcs.com/images/x.gif" height="5"/>
+ </td>
+ </tr>
+ <tr>
+ <td VALIGN="top" colspan="2" width="100%">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td bgcolor="#ffffff" width="100%">
+ <div style="border-top:1px solid rgb(156, 154, 156)"> </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div style="float:right; padding-right:5px"><span style="font-family:trebuchet ms, Helvetica, Arial, Verdana; Font-size: 11px; Color: #000000">© 2012 Sprint. All rights reserved.</span></div>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#ffffff" width="100%"><img src="http://pictures.sprintpcs.com/images/x.gif" border="0" height="10"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</body>
+</html><!-- legacy_mms_arrived.txt -->
+
+------=_Part_313708_25410566.1334609448230--
\ No newline at end of file
diff --git a/test/test_pm_sprint_com.rb b/test/test_pm_sprint_com.rb
index 757fa2e..9edd048 100644
--- a/test/test_pm_sprint_com.rb
+++ b/test/test_pm_sprint_com.rb
@@ -1,239 +1,317 @@
require "test_helper"
class TestPmSprintCom < Test::Unit::TestCase
include MMS2R::TestHelper
def mock_sprint_image(message_id)
response = mock('response')
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(: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)
end
def mock_sprint_purged_image(message_id)
response = mock('response')
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(: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)
end
+
+ def mock_sprint_ajax
+ response = mock('response')
+ body = mock('body')
+ # this is a response from a real sprint message
+ file = File.open("./test/fixtures/sprint-ajax-response-success.json", "rb")
+ json = file.read
+ body.expects(:to_str).returns json
+ connection = mock('connection')
+ connection.stubs(:use_ssl=).returns(true)
+ response.expects(:body).twice.returns(body)
+ response.expects(:code).once.returns('200')
+ response.expects(:content_type).twice.returns('text/html')
+
+ Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
+ 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 }
+ ).twice.returns(response)
+ end
+
+ def mock_sprint_ajax_purged
+ response = mock('response')
+ body = mock('body')
+ # this is a response from a real sprint message
+ file = File.open("./test/fixtures/sprint-ajax-response-failure.html", "rb")
+ error_html = file.read
+ body.expects(:to_str).returns error_html
+ connection = mock('connection')
+ connection.stubs(:use_ssl=).returns(true)
+ response.expects(:body).twice.returns(body)
+ response.expects(:code).once.returns('500')
+ response.expects(:content_type).once.returns('text/html')
+ Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
+ 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 }
+ ).twice.returns(response)
+ end
+
def test_mms_should_have_text
mail = mail('sprint-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068765309", mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert_equal true, File.exist?(file)
assert_match(/\.txt$/, File.basename(file))
assert_equal "Tea Pot", IO.read(file)
mms.purge
end
def test_mms_should_have_a_phone_number
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
mms.purge
end
def test_should_have_simple_video
mail = mail('sprint-video-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).once.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/quicktime']
assert_equal 1, mms.media['video/quicktime'].size
assert_equal "000_259e41e851be9b1d_1-0.mov", File.basename(mms.media['video/quicktime'][0])
mms.purge
end
def test_should_have_simple_image
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/001_2066c7013e7ca833_1-0.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
def test_collect_image_using_block
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
file_array = nil
mms.process do |k, v|
file_array = v if (k == 'image/jpeg')
assert_equal 1, file_array.size
file = file_array.first
assert_not_nil file = file_array.first
assert_equal "001_2066c7013e7ca833_1-0.jpg", File.basename(file)
end
mms.purge
end
def test_process_internals_should_only_be_executed_once
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
# second time through shouldn't go into the was_processed block
mms.mail.expects(:parts).never
mms.process{|k, v| }
mms.purge
end
def test_should_have_two_images
mail = mail('sprint-two-images-01.mail')
response = mock('response')
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(:get2).with(
kind_of(String),
{ "User-Agent" => MMS2R::Media::USER_AGENT }
).twice.returns(response)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 2, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'][0]
assert_not_nil mms.media['image/jpeg'][1]
assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
mms.purge
end
def test_image_should_be_missing
# this test is questionable
mail = mail('sprint-broken-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
+ def test_message_is_missing_in_mail
+ # this test is questionable
+ mail = mail('sprint-image-missing-message.mail')
+ mock_sprint_ajax
+ mms = MMS2R::Media.new(mail)
+
+ assert_equal 1, mms.media['text/plain'].size
+
+ # test that the message was extracted from the ajax response
+ message = IO.readlines(mms.media['text/plain'].first).join("")
+ assert_equal "Just testing the caption on Sprint", message
+
+ mms.purge
+ end
+
+ def test_message_is_missing_in_mail_purged_from_content_server
+ # this test is questionable
+ mail = mail('sprint-image-missing-message.mail')
+ mock_sprint_ajax_purged
+ mms = MMS2R::Media.new(mail)
+
+ assert_equal '5135455555', mms.number
+ assert_equal "pm.sprint.com", mms.carrier
+
+ assert_equal 0, mms.media.size
+
+ mms.purge
+ end
+
def test_image_should_be_purged_from_content_server
mail = mail('sprint-image-01.mail')
mock_sprint_purged_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_body_should_return_empty_when_there_is_no_user_text
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.body
end
def test_sprint_write_file
mail = mock(:message_id => 'a')
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
mms = MMS2R::Media.new(mail, :process => :lazy)
type = 'text/plain'
content = 'foo'
file = Tempfile.new('sprint')
file.close
type, file = mms.send(:sprint_write_file, type, content, file.path)
assert_equal 'text/plain', type
assert_equal content, IO.read(file)
end
def test_subject
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
def test_new_subject
mail = mail('sprint-new-image-01.mail')
+ mock_sprint_ajax
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
end
|
monde/mms2r
|
66e5da4dc3e98584f987524695471cb3488a17e7
|
json gem has been introduced
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 39b1bb3..074dd18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,47 @@
GEM
remote: http://rubygems.org/
specs:
exifr (1.1.1)
gemcutter (0.7.1)
hoe (2.12.5)
rake (~> 0.8)
i18n (0.6.0)
json (1.6.5)
json_pure (1.6.5)
mail (2.4.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.17.2)
mocha (0.10.2)
metaclass (~> 0.0.1)
nokogiri (1.5.0)
polyglot (0.3.3)
rake (0.9.2.2)
rcov (0.9.11)
rdoc (3.12)
json (~> 1.4)
rubyforge (2.0.4)
json_pure (>= 1.1.7)
test-unit (1.2.3)
hoe (>= 1.5.1)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
exifr
gemcutter
hoe
+ json
mail
mocha
nokogiri
rcov
rdoc
rubyforge
test-unit (= 1.2.3)
|
monde/mms2r
|
7ee77a3d58ff441a524fce8542324cebc5e3e914
|
Sprint is does not always (if ever) include image captions in the mail body of the email they send. To view the caption you must click on the "View Entire Message" link. To make things difficult Sprint uses Ajax to serve up JSON that is then turned into html content. These changes download the JSON and extract any text content to create text/html media for the mms mail object. Changes require JSON gem.
|
diff --git a/Gemfile b/Gemfile
index ee4f968..8941e45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,20 +1,21 @@
# -*- ruby -*-
source :rubygems
gem "nokogiri"
gem "mail"
gem "exifr"
+gem "json"
# gem "psych"
group :development, :test do
gem "rdoc"
gem "rubyforge"
gem "gemcutter"
gem "hoe"
gem "rcov"
gem "test-unit", "=1.2.3"
gem "mocha"
end
# vim: syntax=ruby
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index a04c1b4..49d99ac 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,198 +1,229 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
+ # if there is no text media found in the mail body - then we go to more
+ # extreme measures.
+ text_found = false
+
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
next if text.empty?
+ text_found = true
type, text = transform_text(type, text)
type, file = sprint_write_file(type, text.strip)
add_file(type, file) unless type.nil? || file.nil?
end
+
+ # if no text was found, there still might be a message with images
+ # that can be seen at the end of the "View Entire Message" link
+ if !text_found
+ # Sprint uses AJAX/josn to serve up the content at the end of the link so this is conveluted
+ view_entire_message_link = doc.search("a").find { |link| link.inner_html == "View Entire Message"}
+ url = view_entire_message_link.attr("href")
+ # extract the "invite" param out of the url - this will be the id we pass to the ajax path below
+ inviteMessageId = CGI::parse(URI::parse(url).query)["invite"].first
+ json_url = "http://pictures.sprintpcs.com/ui-refresh/guest/getMessageContainerJSON.do%3FcomponentType%3DmediaDetail&invite=#{inviteMessageId}&externalMessageId=#{inviteMessageId}"
+ # pull down the json from the url and parse it
+ json_response = Net::HTTP.get_response(URI.parse(json_url))
+ json = JSON.parse(json_response.body)
+
+ # there may be multiple "results" in the json - due to multiple images
+ # cycle through them and extract the "description" which is the text
+ # message the sender sent with the images
+ json["Results"].each do |result|
+ type = 'text/plain'
+ text = result["description"] ? result["description"].strip : nil
+ 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?
+ end
+ end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
unless @is_video
query={}
uri.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
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)
#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
end
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
# force the encoding to be utf-8
content = content.force_encoding("UTF-8") if content.respond_to?(:force_encoding)
File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
|
monde/mms2r
|
9227e1c22ac9ab586a60f3d6ce1a061944217cfc
|
Strip Windows phone's default footer.
|
diff --git a/History.txt b/History.txt
index 76f7fba..3f8ba80 100644
--- a/History.txt
+++ b/History.txt
@@ -1,418 +1,423 @@
+### 3.6.3 / 2012-03.25 (Dethklok Minute Host - host of The Dethklok Minute)
+
+* 1 minor enhancement
+ * strip Windows phone default footer
+
### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
* 1 minor enhancement
* Change user agent given to Sprint so it returns a properly sized image.
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 6d0ec63..3ecd090 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,76 +1,79 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
+ - !ruby/regexp /\ASent from my Windows Phone.*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
+ - - !ruby/regexp /\A(.*?)Sent from my Windows Phone.*$/im
+ - "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
boundary:
:motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:nokia: !ruby/regexp /^Nokia/i
:pantech: !ruby/regexp /^PANTECH$/i
:palm: !ruby/regexp /Palm/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:centro: !ruby/regexp /^Palm Centro$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/
:video: !ruby/regexp /\.3gp$/
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index 8075184..80df937 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,83 +1,83 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# MMS2R library version
- VERSION = '3.6.2'
+ VERSION = '3.6.3'
##
# Spoof User-Agent, primarily for the Sprint CDN
USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2"
end
# 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, options = {}
mail = Mail.new raw_mail
MMS2R::Media.new(mail, options)
end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
if RUBY_VERSION >= "1.9"
begin
require 'psych'
YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
rescue LoadError
end
end
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index a3ecc50..a2c57ca 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,102 +1,97 @@
# do it like rake http://ozmm.org/posts/do_it_like_rake.html
%W{ test/unit set net/http net/https pp tempfile mocha rcov/rcovtask }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
-# NOTE when we upgrade to test-unit 2.x.x or greater we'll not need redgreen,
-# it's baked into test-unit
-begin require 'redgreen'; rescue LoadError; end
-
require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'mms2r')
module MMS2R
module TestHelper
def assert_file_size(file, size)
assert_not_nil(file, "file was nil")
assert(File::exist?(file), "file #{file} does not exist")
assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
end
def fixture(file)
File.join(File.expand_path(File.dirname(__FILE__)), "fixtures", file)
end
def fixture_data(name)
open(fixture(name)).read
end
def mail_fixture(file)
fixture(file)
end
def mail(name)
Mail.read(mail_fixture(name))
end
def smart_phone_mock(make_text = 'Apple', model_text = 'iPhone', software_text = nil, jpeg = true)
mail = stub('mail',
:from => ['[email protected]'],
:return_path => '<[email protected]>',
:message_id => 'abcd0123',
:multipart? => true,
:header => {})
part = stub('part',
:part_type? => "image/#{jpeg ? 'jpeg' : 'tiff'}",
:body => Mail::Body.new('abc'),
:multipart? => false,
:filename => "foo.#{jpeg ? 'jpg' : 'tif'}" )
mail.stubs(:parts).returns([part])
exif = stub('exif', :make => make_text, :model => model_text, :software => software_text)
if jpeg
EXIFR::JPEG.expects(:new).at_least_once.returns(exif)
else
EXIFR::TIFF.expects(:new).at_least_once.returns(exif)
end
mail
end
end
end
class Hash
def except(*keys)
rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
reject { |key,| rejected.include?(key) }
end
def except!(*keys)
replace(except(*keys))
end
end
# monkey patch Net::HTTP so un caged requests don't go over the wire
module Net #:nodoc:
class HTTP #:nodoc:
alias :old_net_http_request :request
alias :old_net_http_connect :connect
def request(req, body = nil, &block)
- prot = use_ssl ? "https" : "http"
uri_cls = use_ssl ? URI::HTTPS : URI::HTTP
query = req.path.split('?',2)
opts = {:host => self.address,
:port => self.port, :path => query[0]}
opts[:query] = query[1] if query[1]
uri = uri_cls.build(opts)
raise ArgumentError.new("#{req.method} method to #{uri} not being handled in testing")
end
def connect
raise ArgumentError.new("connect not being handled in testing")
end
end
end
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index 3bca5a0..5dd4389 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,707 +1,708 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
@oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@oldtmpdir)
FileUtils.mkdir_p(@oldconfdir)
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
end
end
def test_faux_user_agent
assert_equal "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2", MMS2R::Media::USER_AGENT
end
def test_class_parse
mms = mail('generic.mail')
assert_equal ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
+ assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Windows Phone")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
# ASCII-8BIT -> D'ici un mois G\xE9orgie
# UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
else
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
end
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
|
monde/mms2r
|
7a4d0fd419d739125ce4ab57f166aecb7746c712
|
Change user agent given to Sprint
|
diff --git a/History.txt b/History.txt
index 5a946d1..76f7fba 100644
--- a/History.txt
+++ b/History.txt
@@ -1,413 +1,418 @@
+### 3.6.2 / 2012-02-12 (Mr. Gojira - Owner Mr. Gojira's Driving School - retake driver's exam)
+
+* 1 minor enhancement
+ * Change user agent given to Sprint so it returns a properly sized image.
+
### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index 33682fc..8075184 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,83 +1,83 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# MMS2R library version
- VERSION = '3.6.1'
+ VERSION = '3.6.2'
##
# 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"
+ USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2"
end
# 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, options = {}
mail = Mail.new raw_mail
MMS2R::Media.new(mail, options)
end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
if RUBY_VERSION >= "1.9"
begin
require 'psych'
YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
rescue LoadError
end
end
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/mms2r.gemspec b/mms2r.gemspec
index a0a9c6e..fe175b7 100644
--- a/mms2r.gemspec
+++ b/mms2r.gemspec
@@ -1,45 +1,45 @@
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = "mms2r"
- s.version = "3.6.1"
+ s.version = "3.6.2"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Mike Mondragon"]
s.date = "2011-10-31"
s.description = "== DESCRIPTION\n\nMMS2R by Mike Mondragon\nhttp://mms2r.rubyforge.org/\nhttps://github.com/monde/mms2r\nhttps://github.com/monde/mms2r/issues\nhttp://peepcode.com/products/mms2r-pdf\n\nMMS2R is a library that decodes the parts of an MMS message to disk while\nstripping out advertising injected by the mobile carriers. MMS messages are\nmultipart email and the carriers often inject branding into these messages. Use\nMMS2R if you want to get at the real user generated content from a MMS without\nhaving to deal with the cruft from the carriers.\n\nIf MMS2R is not aware of a particular carrier no extra processing is done to the\nMMS other than decoding and consolidating its media."
s.email = ["[email protected]"]
s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.txt"]
s.files = ["Gemfile", "Gemfile.lock", "History.txt", "Manifest.txt", "README.TMail.txt", "README.txt", "Rakefile", "conf/1nbox.net.yml", "conf/aliases.yml", "conf/bellsouth.net.yml", "conf/from.yml", "conf/mediamessaging.o2.co.uk.yml", "conf/messaging.nextel.com.yml", "conf/mms.3ireland.ie.yml", "conf/mms.ae.yml", "conf/mms.alltel.com.yml", "conf/mms.att.net.yml", "conf/mms.dobson.net.yml", "conf/mms.luxgsm.lu.yml", "conf/mms.mobileiam.ma.yml", "conf/mms.mtn.co.za.yml", "conf/mms.mycricket.com.yml", "conf/mms.myhelio.com.yml", "conf/mms.netcom.no.yml", "conf/mms.o2online.de.yml", "conf/mms.three.co.uk.yml", "conf/mms.uscc.net.mail", "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/vmpix.com.yml", "conf/vzwpix.com.yml", "conf/waw.plspictures.com.yml", "dev_tools/anonymizer.rb", "dev_tools/debug_sprint_nokogiri_parsing.rb", "init.rb", "lib/ext/mail.rb", "lib/ext/object.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.rb", "mms2r.gemspec", "test/fixtures/1nbox-2images-01.mail", "test/fixtures/1nbox-2images-02.mail", "test/fixtures/1nbox-2images-03.mail", "test/fixtures/1nbox-2images-04.mail", "test/fixtures/3ireland-mms-01.mail", "test/fixtures/ad_new.txt", "test/fixtures/alltel-image-01.mail", "test/fixtures/alltel-mms-01.mail", "test/fixtures/alltel-mms-03.mail", "test/fixtures/apple-double-image-01.mail", "test/fixtures/att-blackberry-02.mail", "test/fixtures/att-blackberry.mail", "test/fixtures/att-image-01.mail", "test/fixtures/att-image-02.mail", "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/dici_un_mois_georgie.txt", "test/fixtures/dobson-image-01.mail", "test/fixtures/dot.jpg", "test/fixtures/generic.mail", "test/fixtures/handsets.yml", "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/iphone-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", "test/fixtures/mmode-image-01.mail", "test/fixtures/mms.ae-image-01.mail", "test/fixtures/mms.mycricket.com-pic-and-text.mail", "test/fixtures/mms.mycricket.com-pic.mail", "test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail", "test/fixtures/mobile.mycingular.com-text-01.mail", "test/fixtures/mtn-southafrica-mms.mail", "test/fixtures/mycingular-image-01.mail", "test/fixtures/netcom-image-01.mail", "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/o2-de-image-01.mail", "test/fixtures/orange-uk-image-01.mail", "test/fixtures/orangefrance-text-and-image.mail", "test/fixtures/orangepoland-text-01.mail", "test/fixtures/orangepoland-text-02.mail", "test/fixtures/pics.cingularme.com-image-01.mail", "test/fixtures/pxt-image-01.mail", "test/fixtures/rogers-canada-mms-01.mail", "test/fixtures/sasktel-image-01.mail", "test/fixtures/sprint-broken-image-01.mail", "test/fixtures/sprint-image-01.mail", "test/fixtures/sprint-new-image-01.mail", "test/fixtures/sprint-pcs-text-01.mail", "test/fixtures/sprint-purged-image-01.mail", "test/fixtures/sprint-text-01.mail", "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/tmo.blackberry.net-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/us-cellular-image-01.mail", "test/fixtures/verizon-blackberry.mail", "test/fixtures/verizon-image-01.mail", "test/fixtures/verizon-image-02.mail", "test/fixtures/verizon-image-03.mail", "test/fixtures/verizon-text-01.mail", "test/fixtures/verizon-video-01.mail", "test/fixtures/virgin-mobile-image-01.mail", "test/fixtures/virgin.ca-text-01.mail", "test/fixtures/vodacom4me-co-za-01.mail", "test/fixtures/vodacom4me-co-za-02.mail", "test/fixtures/vodacom4me-southafrica-mms-01.mail", "test/fixtures/vodacom4me-southafrica-mms-04.mail", "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", "test/test_helper.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_messaging_nextel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms2r_media.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_alltel_com.rb", "test/test_mms_att_net.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_mycricket_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_netcom_no.rb", "test/test_mms_o2online_de.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_uscc_net.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_vmpix_com.rb", "test/test_vzwpix_com.rb", "test/test_waw_plspictures_com.rb", "vendor/plugins/mms2r/lib/autotest/discover.rb", "vendor/plugins/mms2r/lib/autotest/mms2r.rb", ".gemtest"]
s.homepage = "https://github.com/monde/mms2r"
s.rdoc_options = ["--main", "README.txt"]
s.require_paths = ["lib"]
s.rubyforge_project = "mms2r"
s.rubygems_version = "1.8.10"
s.summary = "Extract user media from MMS (and not carrier cruft)"
s.test_files = ["test/test_orangemms_net.rb", "test/test_waw_plspictures_com.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_vzwpix_com.rb", "test/test_unicel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms_luxgsm_lu.rb", "test/test_rci_rogers_com.rb", "test/test_mms_uscc_net.rb", "test/test_mms_netcom_no.rb", "test/test_1nbox_net.rb", "test/test_sms_sasktel_com.rb", "test/test_mms_att_net.rb", "test/test_mobile_indosat_net_id.rb", "test/test_messaging_nextel_com.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_mms_dobson_net.rb", "test/test_helper.rb", "test/test_msg_telus_com.rb", "test/test_mms_o2online_de.rb", "test/test_mms2r_media.rb", "test/test_bell_canada.rb", "test/test_tmomail_net.rb", "test/test_mms_3ireland_ie.rb", "test/test_pm_sprint_com.rb", "test/test_mms_alltel_com.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mycricket_com.rb", "test/test_bellsouth_net.rb", "test/test_mms_three_co_uk.rb", "test/test_vmpix_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_ae.rb"]
if s.respond_to? :specification_version then
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
s.add_runtime_dependency(%q<mail>, [">= 2.2.10"])
s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.1"])
s.add_runtime_dependency(%q<exifr>, [">= 1.0.3"])
s.add_development_dependency(%q<hoe>, ["~> 2.12"])
else
s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
s.add_dependency(%q<mail>, [">= 2.2.10"])
s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
s.add_dependency(%q<exifr>, [">= 1.0.3"])
s.add_dependency(%q<hoe>, ["~> 2.12"])
end
else
s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
s.add_dependency(%q<mail>, [">= 2.2.10"])
s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
s.add_dependency(%q<exifr>, [">= 1.0.3"])
s.add_dependency(%q<hoe>, ["~> 2.12"])
end
end
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index 3f63b54..3bca5a0 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,561 +1,561 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
@oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@oldtmpdir)
FileUtils.mkdir_p(@oldconfdir)
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
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
+ assert_equal "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2", MMS2R::Media::USER_AGENT
end
def test_class_parse
mms = mail('generic.mail')
assert_equal ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
# ASCII-8BIT -> D'ici un mois G\xE9orgie
# UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
else
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
end
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
|
monde/mms2r
|
744ff12064551464e7b08e366e6cda14602e6dff
|
make the spec valid
|
diff --git a/mms2r.gemspec b/mms2r.gemspec
index 0329977..a0a9c6e 100644
--- a/mms2r.gemspec
+++ b/mms2r.gemspec
@@ -1,45 +1,45 @@
# -*- encoding: utf-8 -*-
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"]
s.date = "2011-10-31"
s.description = "== DESCRIPTION\n\nMMS2R by Mike Mondragon\nhttp://mms2r.rubyforge.org/\nhttps://github.com/monde/mms2r\nhttps://github.com/monde/mms2r/issues\nhttp://peepcode.com/products/mms2r-pdf\n\nMMS2R is a library that decodes the parts of an MMS message to disk while\nstripping out advertising injected by the mobile carriers. MMS messages are\nmultipart email and the carriers often inject branding into these messages. Use\nMMS2R if you want to get at the real user generated content from a MMS without\nhaving to deal with the cruft from the carriers.\n\nIf MMS2R is not aware of a particular carrier no extra processing is done to the\nMMS other than decoding and consolidating its media."
s.email = ["[email protected]"]
s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.TMail.txt", "README.txt"]
s.files = ["Gemfile", "Gemfile.lock", "History.txt", "Manifest.txt", "README.TMail.txt", "README.txt", "Rakefile", "conf/1nbox.net.yml", "conf/aliases.yml", "conf/bellsouth.net.yml", "conf/from.yml", "conf/mediamessaging.o2.co.uk.yml", "conf/messaging.nextel.com.yml", "conf/mms.3ireland.ie.yml", "conf/mms.ae.yml", "conf/mms.alltel.com.yml", "conf/mms.att.net.yml", "conf/mms.dobson.net.yml", "conf/mms.luxgsm.lu.yml", "conf/mms.mobileiam.ma.yml", "conf/mms.mtn.co.za.yml", "conf/mms.mycricket.com.yml", "conf/mms.myhelio.com.yml", "conf/mms.netcom.no.yml", "conf/mms.o2online.de.yml", "conf/mms.three.co.uk.yml", "conf/mms.uscc.net.mail", "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/vmpix.com.yml", "conf/vzwpix.com.yml", "conf/waw.plspictures.com.yml", "dev_tools/anonymizer.rb", "dev_tools/debug_sprint_nokogiri_parsing.rb", "init.rb", "lib/ext/mail.rb", "lib/ext/object.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.rb", "mms2r.gemspec", "test/fixtures/1nbox-2images-01.mail", "test/fixtures/1nbox-2images-02.mail", "test/fixtures/1nbox-2images-03.mail", "test/fixtures/1nbox-2images-04.mail", "test/fixtures/3ireland-mms-01.mail", "test/fixtures/ad_new.txt", "test/fixtures/alltel-image-01.mail", "test/fixtures/alltel-mms-01.mail", "test/fixtures/alltel-mms-03.mail", "test/fixtures/apple-double-image-01.mail", "test/fixtures/att-blackberry-02.mail", "test/fixtures/att-blackberry.mail", "test/fixtures/att-image-01.mail", "test/fixtures/att-image-02.mail", "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/dici_un_mois_georgie.txt", "test/fixtures/dobson-image-01.mail", "test/fixtures/dot.jpg", "test/fixtures/generic.mail", "test/fixtures/handsets.yml", "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/iphone-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", "test/fixtures/mmode-image-01.mail", "test/fixtures/mms.ae-image-01.mail", "test/fixtures/mms.mycricket.com-pic-and-text.mail", "test/fixtures/mms.mycricket.com-pic.mail", "test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail", "test/fixtures/mobile.mycingular.com-text-01.mail", "test/fixtures/mtn-southafrica-mms.mail", "test/fixtures/mycingular-image-01.mail", "test/fixtures/netcom-image-01.mail", "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/o2-de-image-01.mail", "test/fixtures/orange-uk-image-01.mail", "test/fixtures/orangefrance-text-and-image.mail", "test/fixtures/orangepoland-text-01.mail", "test/fixtures/orangepoland-text-02.mail", "test/fixtures/pics.cingularme.com-image-01.mail", "test/fixtures/pxt-image-01.mail", "test/fixtures/rogers-canada-mms-01.mail", "test/fixtures/sasktel-image-01.mail", "test/fixtures/sprint-broken-image-01.mail", "test/fixtures/sprint-image-01.mail", "test/fixtures/sprint-new-image-01.mail", "test/fixtures/sprint-pcs-text-01.mail", "test/fixtures/sprint-purged-image-01.mail", "test/fixtures/sprint-text-01.mail", "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/tmo.blackberry.net-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/us-cellular-image-01.mail", "test/fixtures/verizon-blackberry.mail", "test/fixtures/verizon-image-01.mail", "test/fixtures/verizon-image-02.mail", "test/fixtures/verizon-image-03.mail", "test/fixtures/verizon-text-01.mail", "test/fixtures/verizon-video-01.mail", "test/fixtures/virgin-mobile-image-01.mail", "test/fixtures/virgin.ca-text-01.mail", "test/fixtures/vodacom4me-co-za-01.mail", "test/fixtures/vodacom4me-co-za-02.mail", "test/fixtures/vodacom4me-southafrica-mms-01.mail", "test/fixtures/vodacom4me-southafrica-mms-04.mail", "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", "test/test_helper.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_messaging_nextel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms2r_media.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_alltel_com.rb", "test/test_mms_att_net.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_mycricket_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_netcom_no.rb", "test/test_mms_o2online_de.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_uscc_net.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_vmpix_com.rb", "test/test_vzwpix_com.rb", "test/test_waw_plspictures_com.rb", "vendor/plugins/mms2r/lib/autotest/discover.rb", "vendor/plugins/mms2r/lib/autotest/mms2r.rb", ".gemtest"]
s.homepage = "https://github.com/monde/mms2r"
s.rdoc_options = ["--main", "README.txt"]
s.require_paths = ["lib"]
s.rubyforge_project = "mms2r"
s.rubygems_version = "1.8.10"
s.summary = "Extract user media from MMS (and not carrier cruft)"
s.test_files = ["test/test_orangemms_net.rb", "test/test_waw_plspictures_com.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_vzwpix_com.rb", "test/test_unicel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms_luxgsm_lu.rb", "test/test_rci_rogers_com.rb", "test/test_mms_uscc_net.rb", "test/test_mms_netcom_no.rb", "test/test_1nbox_net.rb", "test/test_sms_sasktel_com.rb", "test/test_mms_att_net.rb", "test/test_mobile_indosat_net_id.rb", "test/test_messaging_nextel_com.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_mms_dobson_net.rb", "test/test_helper.rb", "test/test_msg_telus_com.rb", "test/test_mms_o2online_de.rb", "test/test_mms2r_media.rb", "test/test_bell_canada.rb", "test/test_tmomail_net.rb", "test/test_mms_3ireland_ie.rb", "test/test_pm_sprint_com.rb", "test/test_mms_alltel_com.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mycricket_com.rb", "test/test_bellsouth_net.rb", "test/test_mms_three_co_uk.rb", "test/test_vmpix_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_ae.rb"]
if s.respond_to? :specification_version then
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
s.add_runtime_dependency(%q<mail>, [">= 2.2.10"])
s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.1"])
s.add_runtime_dependency(%q<exifr>, [">= 1.0.3"])
s.add_development_dependency(%q<hoe>, ["~> 2.12"])
else
s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
s.add_dependency(%q<mail>, [">= 2.2.10"])
s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
s.add_dependency(%q<exifr>, [">= 1.0.3"])
s.add_dependency(%q<hoe>, ["~> 2.12"])
end
else
s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
s.add_dependency(%q<mail>, [">= 2.2.10"])
s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
s.add_dependency(%q<exifr>, [">= 1.0.3"])
s.add_dependency(%q<hoe>, ["~> 2.12"])
end
end
|
monde/mms2r
|
01c61e54ba95de835fa1cbb1034042d4864a50f9
|
Use Net::HTTP#get2 to fetch Sprint content.
|
diff --git a/History.txt b/History.txt
index 8dc58b3..5a946d1 100644
--- a/History.txt
+++ b/History.txt
@@ -1,408 +1,413 @@
+### 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
* Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index b3808d8..33682fc 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,82 +1,83 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# MMS2R library version
- VERSION = '3.6.0'
+ VERSION = '3.6.1'
##
# 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:
# 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
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
if RUBY_VERSION >= "1.9"
begin
require 'psych'
YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
rescue LoadError
end
end
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index 217fbab..a04c1b4 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,196 +1,198 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
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?
end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
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
end
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
# force the encoding to be utf-8
content = content.force_encoding("UTF-8") if content.respond_to?(:force_encoding)
File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
diff --git a/test/test_pm_sprint_com.rb b/test/test_pm_sprint_com.rb
index 0526638..757fa2e 100644
--- a/test/test_pm_sprint_com.rb
+++ b/test/test_pm_sprint_com.rb
@@ -1,257 +1,239 @@
require "test_helper"
class TestPmSprintCom < Test::Unit::TestCase
include MMS2R::TestHelper
def mock_sprint_image(message_id)
response = mock('response')
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)
response = mock('response')
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
mail = mail('sprint-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068765309", mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert_equal true, File.exist?(file)
assert_match(/\.txt$/, File.basename(file))
assert_equal "Tea Pot", IO.read(file)
mms.purge
end
def test_mms_should_have_a_phone_number
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
mms.purge
end
def test_should_have_simple_video
mail = mail('sprint-video-01.mail')
response = mock('response')
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
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/quicktime']
assert_equal 1, mms.media['video/quicktime'].size
assert_equal "000_259e41e851be9b1d_1-0.mov", File.basename(mms.media['video/quicktime'][0])
mms.purge
end
def test_should_have_simple_image
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/001_2066c7013e7ca833_1-0.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
def test_collect_image_using_block
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
file_array = nil
mms.process do |k, v|
file_array = v if (k == 'image/jpeg')
assert_equal 1, file_array.size
file = file_array.first
assert_not_nil file = file_array.first
assert_equal "001_2066c7013e7ca833_1-0.jpg", File.basename(file)
end
mms.purge
end
def test_process_internals_should_only_be_executed_once
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
# second time through shouldn't go into the was_processed block
mms.mail.expects(:parts).never
mms.process{|k, v| }
mms.purge
end
def test_should_have_two_images
mail = mail('sprint-two-images-01.mail')
response = mock('response')
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
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 2, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'][0]
assert_not_nil mms.media['image/jpeg'][1]
assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
mms.purge
end
def test_image_should_be_missing
# this test is questionable
mail = mail('sprint-broken-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_image_should_be_purged_from_content_server
mail = mail('sprint-image-01.mail')
mock_sprint_purged_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_body_should_return_empty_when_there_is_no_user_text
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.body
end
def test_sprint_write_file
mail = mock(:message_id => 'a')
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
mms = MMS2R::Media.new(mail, :process => :lazy)
type = 'text/plain'
content = 'foo'
file = Tempfile.new('sprint')
file.close
type, file = mms.send(:sprint_write_file, type, content, file.path)
assert_equal 'text/plain', type
assert_equal content, IO.read(file)
end
def test_subject
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
def test_new_subject
mail = mail('sprint-new-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
end
|
monde/mms2r
|
e842600dd4dbba3ac59c7bd8dc1af3c75fc4bf0f
|
Refining the UTF-8 and making the gem Ruby 1.8.7, 1.9.2, 1.9.3, compatible.
|
diff --git a/Gemfile b/Gemfile
index e9281ad..ee4f968 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,19 +1,20 @@
# -*- ruby -*-
-source :gemcutter
+source :rubygems
gem "nokogiri"
gem "mail"
gem "exifr"
+# gem "psych"
group :development, :test do
gem "rdoc"
gem "rubyforge"
gem "gemcutter"
gem "hoe"
gem "rcov"
gem "test-unit", "=1.2.3"
gem "mocha"
end
# vim: syntax=ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index bf8e0ce..39b1bb3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,46 @@
GEM
remote: http://rubygems.org/
specs:
exifr (1.1.1)
- gemcutter (0.7.0)
- hoe (2.12.3)
+ gemcutter (0.7.1)
+ hoe (2.12.5)
rake (~> 0.8)
i18n (0.6.0)
- json (1.6.1)
- json_pure (1.6.1)
- mail (2.3.0)
+ json (1.6.5)
+ json_pure (1.6.5)
+ mail (2.4.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.17.2)
- mocha (0.10.0)
+ mocha (0.10.2)
metaclass (~> 0.0.1)
nokogiri (1.5.0)
- polyglot (0.3.2)
+ polyglot (0.3.3)
rake (0.9.2.2)
rcov (0.9.11)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
rubyforge (2.0.4)
json_pure (>= 1.1.7)
test-unit (1.2.3)
hoe (>= 1.5.1)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
PLATFORMS
ruby
DEPENDENCIES
exifr
gemcutter
hoe
mail
mocha
nokogiri
rcov
rdoc
rubyforge
test-unit (= 1.2.3)
diff --git a/History.txt b/History.txt
index b983f5e..8dc58b3 100644
--- a/History.txt
+++ b/History.txt
@@ -1,401 +1,408 @@
+### 3.6.0 / 2012-01-19 (Agent 216 - assassin, master of infiltration and sabotage)
+
+* 1 major enhancement
+ * Ruby 1.8.7, 1.9.2, and 1.9.3 compatible
+* 1 bug fix
+ * A fix for the utf-8 encoding issue with ruby 1.9.2 - minimul / Christian
+
### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
* 1 bug fix
* A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/Manifest.txt b/Manifest.txt
index 334b4f2..ef08e0f 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,184 +1,186 @@
.gitignore
Gemfile
Gemfile.lock
History.txt
Manifest.txt
README.TMail.txt
README.txt
Rakefile
conf/1nbox.net.yml
conf/aliases.yml
conf/bellsouth.net.yml
conf/from.yml
conf/mediamessaging.o2.co.uk.yml
conf/messaging.nextel.com.yml
conf/mms.3ireland.ie.yml
conf/mms.ae.yml
conf/mms.alltel.com.yml
conf/mms.att.net.yml
conf/mms.dobson.net.yml
conf/mms.luxgsm.lu.yml
conf/mms.mobileiam.ma.yml
conf/mms.mtn.co.za.yml
conf/mms.mycricket.com.yml
conf/mms.myhelio.com.yml
conf/mms.netcom.no.yml
conf/mms.o2online.de.yml
conf/mms.three.co.uk.yml
conf/mms.uscc.net.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/vmpix.com.yml
conf/vzwpix.com.yml
conf/waw.plspictures.com.yml
dev_tools/anonymizer.rb
dev_tools/debug_sprint_nokogiri_parsing.rb
init.rb
lib/ext/mail.rb
lib/ext/object.rb
lib/mms2r.rb
lib/mms2r/media.rb
lib/mms2r/media/sprint.rb
mms2r.gemspec
test/fixtures/1nbox-2images-01.mail
test/fixtures/1nbox-2images-02.mail
test/fixtures/1nbox-2images-03.mail
test/fixtures/1nbox-2images-04.mail
test/fixtures/3ireland-mms-01.mail
test/fixtures/ad_new.txt
test/fixtures/alltel-image-01.mail
test/fixtures/alltel-mms-01.mail
test/fixtures/alltel-mms-03.mail
test/fixtures/apple-double-image-01.mail
test/fixtures/att-blackberry-02.mail
test/fixtures/att-blackberry.mail
test/fixtures/att-image-01.mail
test/fixtures/att-image-02.mail
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/dici_un_mois_georgie.txt
test/fixtures/dobson-image-01.mail
test/fixtures/dot.jpg
test/fixtures/generic.mail
test/fixtures/handsets.yml
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/invalid-byte-seq-outlook.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
test/fixtures/mmode-image-01.mail
test/fixtures/mms.ae-image-01.mail
test/fixtures/mms.mycricket.com-pic-and-text.mail
test/fixtures/mms.mycricket.com-pic.mail
test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail
test/fixtures/mobile.mycingular.com-text-01.mail
test/fixtures/mtn-southafrica-mms.mail
test/fixtures/mycingular-image-01.mail
test/fixtures/netcom-image-01.mail
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/o2-de-image-01.mail
test/fixtures/orange-uk-image-01.mail
test/fixtures/orangefrance-text-and-image.mail
test/fixtures/orangepoland-text-01.mail
test/fixtures/orangepoland-text-02.mail
test/fixtures/pics.cingularme.com-image-01.mail
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
test/fixtures/sprint-pcs-text-01.mail
test/fixtures/sprint-purged-image-01.mail
test/fixtures/sprint-text-01.mail
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/tmo.blackberry.net-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/us-cellular-image-01.mail
test/fixtures/verizon-blackberry.mail
test/fixtures/verizon-image-01.mail
test/fixtures/verizon-image-02.mail
test/fixtures/verizon-image-03.mail
test/fixtures/verizon-text-01.mail
test/fixtures/verizon-video-01.mail
test/fixtures/virgin-mobile-image-01.mail
test/fixtures/virgin.ca-text-01.mail
test/fixtures/vodacom4me-co-za-01.mail
test/fixtures/vodacom4me-co-za-02.mail
test/fixtures/vodacom4me-southafrica-mms-01.mail
test/fixtures/vodacom4me-southafrica-mms-04.mail
test/fixtures/vtext-text-01.mail
test/fixtures/vzwpix.com-image-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_helper.rb
+test/test_invalid_byte_seq_outlook.rb
test/test_mediamessaging_o2_co_uk.rb
test/test_messaging_nextel_com.rb
test/test_messaging_sprintpcs_com.rb
test/test_mms2r_media.rb
test/test_mms_3ireland_ie.rb
test/test_mms_ae.rb
test/test_mms_alltel_com.rb
test/test_mms_att_net.rb
test/test_mms_dobson_net.rb
test/test_mms_luxgsm_lu.rb
test/test_mms_mobileiam_ma.rb
test/test_mms_mtn_co_za.rb
test/test_mms_mycricket_com.rb
test/test_mms_myhelio_com.rb
test/test_mms_netcom_no.rb
test/test_mms_o2online_de.rb
test/test_mms_three_co_uk.rb
test/test_mms_uscc_net.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_sprint.rb
test/test_tmomail_net.rb
test/test_unicel_com.rb
test/test_vmpix_com.rb
test/test_vzwpix_com.rb
test/test_waw_plspictures_com.rb
vendor/plugins/mms2r/lib/autotest/discover.rb
vendor/plugins/mms2r/lib/autotest/mms2r.rb
diff --git a/Rakefile b/Rakefile
index 3456fa8..0902222 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,44 +1,45 @@
# -*- ruby -*-
begin
require 'hoe'
rescue LoadError
require 'rubygems'
require 'hoe'
end
+
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
require 'mms2r'
require 'rake'
Hoe.plugin :bundler
Hoe.spec('mms2r') do |p|
p.version = MMS2R::Media::VERSION
p.rubyforge_name = 'mms2r'
p.author = ['Mike Mondragon']
p.email = ['[email protected]']
p.summary = 'Extract user media from MMS (and not carrier cruft)'
p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
p.url = p.paragraphs_of('README.txt', 1).first.strip
p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
p.readme_file = 'README.txt'
p.history_file = 'History.txt'
p.extra_deps << ['nokogiri', '>= 1.4.4']
p.extra_deps << ['mail', '>= 2.2.10']
p.extra_deps << ['uuidtools', '>= 2.1.1']
p.extra_deps << ['exifr', '>= 1.0.3']
p.clean_globs << 'coverage'
end
begin
require 'rcov/rcovtask'
Rcov::RcovTask.new do |rcov|
rcov.pattern = 'test/**/test_*.rb'
rcov.verbose = true
rcov.rcov_opts << "--exclude rcov.rb"
end
rescue
task :rcov => :check_dependencies
end
# vim: syntax=Ruby
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index e649900..b3808d8 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,76 +1,82 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# MMS2R library version
- VERSION = '3.5.1'
+ VERSION = '3.6.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:
# 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
mail = Mail.new raw_mail
MMS2R::Media.new(mail) end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
-# HAX to not deal with Psych YAML parser in Ruby >= 1.9
-#YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
+if RUBY_VERSION >= "1.9"
+ begin
+ require 'psych'
+ YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
+ rescue LoadError
+ end
+end
+
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index a9a1621..fdd4fac 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -1,839 +1,844 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
##
# = Synopsis
#
# MMS2R is a library to collect media files from MMS messages. MMS messages
# are multipart emails and mobile carriers often inject branding into these
# messages. MMS2R strips the advertising from an MMS leaving the actual user
# generated media.
#
# The Tracker for MMS2R is located at
# http://rubyforge.org/tracker/?group_id=3065
# Please submit bugs and feature requests using the Tracker.
#
# If MMS from a carrier not known by MMS2R is encountered please submit a
# sample to the author for inclusion in this project.
#
# == Stand Alone Example
#
# begin
# require 'mms2r'
# rescue LoadError
# require 'rubygems'
# require 'mms2r'
# end
# mail = Mail.read("sample-MMS.file")
# mms = MMS2R::Media.new(mail)
# subject = mms.subject
# number = mms.number
# file = mms.default_media
# mms.purge
#
# == Rails ActionMailer#receive w/ AttachmentFu Example
#
# def receive(mail)
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
# See the README.txt file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
- ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
- @body = ic.iconv(@body)
+ @body.force_encoding("ISO-8859-1") if RUBY_VERSION >= "1.9" && @body.encoding == "ASCII-8BIT"
+
+ begin
+ ic = Iconv.new('UTF-8', 'ISO-8859-1' )
+ @body = ic.iconv(@body)
+ @body << ic.iconv(nil)
+ ic.close
+ rescue Exception => e
+ end
+
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
- if RUBY_VERSION < "1.9"
- #convert to UTF-8
- begin
- c = Iconv.new('UTF-8', original_encoding )
- utf_t = c.iconv(text)
- rescue Exception => e
- utf_t = text
- end
- else
- utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
+ begin
+ ic = Iconv.new('UTF-8', original_encoding )
+ utf_t = ic.iconv(text)
+ utf_t << ic.iconv(nil)
+ ic.close
+ rescue Exception => e
+ utf_t = text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :nokia
# * :palm
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
- if mail.header[header.downcase]
+ if mail.header[header]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
- return type if mail.header[header.downcase].decoded =~ regex
- field = mail.header.fields.detect { |field| field.name.downcase == header.downcase }
+ return type if mail.header[header].decoded =~ regex
+ field = mail.header.fields.detect { |field| field.name == header }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
boundary = mail.boundary
boundaries = config['device_types']['boundary'] rescue {}
boundaries.each do |type, regex|
return type if boundary =~ regex
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
diff --git a/test/fixtures/invalid-byte-seq-outlook.mail b/test/fixtures/invalid-byte-seq-outlook.mail
new file mode 100644
index 0000000..b484103
--- /dev/null
+++ b/test/fixtures/invalid-byte-seq-outlook.mail
@@ -0,0 +1,342 @@
+Delivered-To: [email protected]
+Received: by 10.52.184.102 with SMTP id et6cs208438vdc;
+ Mon, 16 Jan 2012 14:19:35 -0800 (PST)
+Received: by 10.180.20.69 with SMTP id l5mr17988972wie.19.1326752373488;
+ Mon, 16 Jan 2012 14:19:33 -0800 (PST)
+Return-Path: <[email protected]>
+Received: from mail-wi0-f172.toogle.com (mail-wi0-f172.toogle.com [209.85.212.172])
+ by mx.toogle.com with ESMTPS id c7si13165326wia.5.2012.01.16.14.19.32
+ (version=TLSv1/SSLv3 cipher=OTHER);
+ Mon, 16 Jan 2012 14:19:33 -0800 (PST)
+Received-SPF: neutral (toogle.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of [email protected]) client-ip=209.85.212.172;
+Authentication-Results: mx.toogle.com; spf=neutral (toogle.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of [email protected]) [email protected]
+Received: by wics10 with SMTP id s10so1698315wic.31
+ for <[email protected]>; Mon, 16 Jan 2012 14:19:32 -0800 (PST)
+Received: by 10.180.73.72 with SMTP id j8mr12775876wiv.2.1326752372616;
+ Mon, 16 Jan 2012 14:19:32 -0800 (PST)
+X-Forwarded-To: [email protected]
+X-Forwarded-For: [email protected] [email protected]
+Delivered-To: [email protected]
+Received: by 10.216.22.196 with SMTP id t46cs153584wet;
+ Mon, 16 Jan 2012 14:19:31 -0800 (PST)
+Received: by 10.236.168.37 with SMTP id j25mr19473152yhl.92.1326752370735;
+ Mon, 16 Jan 2012 14:19:30 -0800 (PST)
+Return-Path: <[email protected]>
+Received: from barracuda.ngSmith.com (barracuda.ngSmith.com. [192.168.97.98])
+ by mx.toogle.com with ESMTP id i66si8419543yhn.66.2012.01.16.14.19.28;
+ Mon, 16 Jan 2012 14:19:30 -0800 (PST)
+Received-SPF: pass (toogle.com: best guess record for domain of [email protected] designates 192.168.97.98 as permitted sender) client-ip=192.168.97.98;
+X-ASG-Debug-ID: 1326752367-0199b2096162000001-x7cFak
+Received: from Mail.NGSmith.com (legacy.ngSmith.com [192.168.0.61]) by barracuda.ngSmith.com with ESMTP id f6DuStHCxnYrGzVR for <[email protected]>; Mon, 16 Jan 2012 16:19:27 -0600 (CST)
+X-Barracuda-Envelope-From: [email protected]
+Received: from MSPEXCH1.ngSmith.com ([fe80::ecf7:ebc1:c6af:b594]) by
+ MSPEXCH2.ngSmith.com ([fe80::4106:cc1:bb08:dd9f%15]) with mapi id
+ 14.01.0339.001; Mon, 16 Jan 2012 16:19:27 -0600
+From: Aaron Doe <[email protected]>
+X-Barracuda-Apparent-Source-IP: fe80::ecf7:ebc1:c6af:b594
+To: ProformaExpress <[email protected]>
+Subject: RE: Issue 14794:Don M. says.. Aaron - I completed RNS Test Question
+ 3, which was done as a 'Cargo Control Number' query. H
+Thread-Topic: Issue 14794:Don M. says.. Aaron - I completed RNS Test
+ Question 3, which was done as a 'Cargo Control Number' query. H
+X-ASG-Orig-Subj: RE: Issue 14794:Don M. says.. Aaron - I completed RNS Test Question
+ 3, which was done as a 'Cargo Control Number' query. H
+Thread-Index: AQHM1JquY55Wte0hREivWFQKTv0KkpYPkFyF
+Date: Mon, 16 Jan 2012 22:19:26 +0000
+Message-ID: <[email protected]>
+References: <[email protected]>
+In-Reply-To: <[email protected]>
+Accept-Language: en-US
+Content-Language: en-US
+X-MS-Has-Attach:
+X-MS-TNEF-Correlator:
+x-originating-ip: [192.168.106.241]
+Content-Type: text/plain; charset="Windows-1252"
+Content-Transfer-Encoding: quoted-printable
+MIME-Version: 1.0
+X-Barracuda-Connect: legacy.ngSmith.com[192.168.0.61]
+X-Barracuda-Start-Time: 1326752367
+X-Barracuda-URL: http://192.168.0.95:8000/cgi-mod/mark.cgi
+X-Virus-Scanned: by bsmtpd at ngSmith.com
+X-Barracuda-Spam-Score: 0.00
+X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests=
+X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.86107
+ Rule breakdown below
+ pts rule name description
+ ---- ---------------------- --------------------------------------------------
+
+Don,
+
+Please have express change "CC" to "ABT"
+Aaron
+
+________________________________
+From: ProformaExpress [[email protected]]
+Sent: Monday, January 16, 2012 4:10 PM
+To: Christian Doe; Pat Doe; Don Doe; Jim Doe; Michael H=
+anson; Tim Doe; Aaron Doe
+Subject: Issue 14794:Don M. says.. Aaron - I completed RNS Test Question 3,=
+ which was done as a 'Cargo Control Number' query. H
+
+
+Direct link to Issue 14794<http://trakr.net/list/ProformaExpress/rev=
+ise/14794> I am working on this<http://trakr.net/list/ProformaExpr=
+ess/work/19406>
+
+
+#10 Don Doe said less than a minute ago [Mon, Jan 16, 2012 02:10 PM =
+PST] status:active
+
+
+
+Aaron - I completed RNS Test Question 3, which was done as a 'Cargo Control=
+ Number' query.
+
+Having a problem, per attached, where the EDIFACT file is showing the Notif=
+ication_Qualifier (Reference Qualifier) as - TN - which should only be used=
+ for Transaction Number queries.
+
+In this case the EDIFACT file should be showing 'ABT' for a Cargo Control N=
+umber Query - not TN.
+
+The Express XML is showing 'CC' for the 'Notification_Qualifier' on Cargo C=
+ontrol Number queries.
+
+When you get the CC, it has to be shown as ABT in the EDIFACT.
+
+The last test question (2) required query by Transaction Number - so TN was=
+ correct.
+
+When you get 'CC' - please change to 'ABT' in the EDIFACT.
+
+Let me know if you need additional information.
+
+Thanks
+
+
+
+
+Wrong_Reference_Qualifier.xlsx<http://trakr.net/uploads/1/14794/Wron=
+g_Reference_Qualifier.xlsx> view<http://trakr.net/uploads/1/14794/Wr=
+ong_Reference_Qualifier.xlsx?viewer=3D1>
+
+
+
+ Email(s) sent to: Christian Doe,Pat Doe,Don Doe,Jim,=
+Michael Doe,Tim Doe,Aaron Doe
+ Direct link to Issue 14794<http://trakr.net/list/ProformaExp=
+ress/revise/14794>
+
+All attachments for this issue:
+
+Wrong_Reference_Qualifier.xlsx<http://trakr.net/uploads/1/14794/Wron=
+g_Reference_Qualifier.xlsx> view<http://trakr.net/uploads/1/14794/Wr=
+ong_Reference_Qualifier.xlsx?viewer=3D1>
+RNS_Query_by_Transaction_Number.xlsx<http://trakr.net/uploads/1/1479=
+4/RNS_Query_by_Transaction_Number.xlsx> view<http://trakr.net/upload=
+s/1/14794/RNS_Query_by_Transaction_Number.xlsx?viewer=3D1>
+RNS_Qeury_specifics.xlsx<http://trakr.net/uploads/1/14794/RNS_Qeury_=
+specifics.xlsx> view<http://trakr.net/uploads/1/14794/RNS_Qeury_spec=
+ifics.xlsx?viewer=3D1>
+
+
+ Issue History..
+#9 Don Doe said about 7 hours ago [Mon, Jan 16, 2012 07:10 AM PST] =
+
+ status:active
+
+
+
+Per Judi's email below - RNS Question 2 is correct.
+Have sent # 3 now.
+
+Question 2 was sent on Thursday so she is taking a couple days,
+or more, to get back with the question status.
+_________________________________________
+From: Johnson, Judi
+Sent: Monday, January 16, 2012 9:27 AM
+To: Don Doe
+Subject: RE: RNS Client Test Package =96 Question 2
+
+Hi Don
+That is correct
+Go to test 3
+Bye Judi
+_________________________________________
+From: Don Doe [mailto:[email protected]<mailto:[email protected]>]
+Sent: January 12, 2012 5:03 PM
+To: Johnson, Judi
+Subject: RE: RNS Client Test Package - 1
+Importance: High
+
+Hi Judi,
+
+I have sent the RNS Transaction for Test Question 2 again.
+The programmer has fixed the RNS Transaction showing TN for Transaction Num=
+ber.
+
+
+
+
+#8 Don Doe said 4 days ago [Thu, Jan 12, 2012 07:58 AM PST] =
+ status:active
+
+
+
+OK - sending it again.
+Thanks
+
+
+
+
+#7 Aaron Doe said 4 days ago [Thu, Jan 12, 2012 07:48 AM PST] =
+ status:active
+
+
+
+Refreshed the map. I tested and it is working now.
+
+Aaron
+
+
+
+
+#6 Don Doe said 4 days ago [Thu, Jan 12, 2012 06:26 AM PST] =
+ status:active
+
+
+
+I just re-sent the RNS Query Test 2 again - but got the same results.
+
+Express sent - <notification_qualifier>TN</notification_qualifier>
+
+But - ABT was sent to CBSA again:
+UNB+UNOA:2+6128547363+RCCECECPT:12+120112:0810+22++CUSREP'UNG+CUSREP+612854=
+7363+PARSPDN+120112:0810+22+UN+D:96A'UNH+0022+CUSREP:D:96A:UN'BGM+998'DTM+1=
+32:20120112:203'RFF+ABT:14142123913549'UNT+5+0022'UNE+1+22'UNZ+1+22'
+
+
+
+
+#5 Aaron Doe said 4 days ago [Thu, Jan 12, 2012 02:25 AM PST] =
+ status:active
+
+
+
+The qualifier is mapped. Please retest.
+
+
+
+
+#4 Don Doe said 5 days ago [Wed, Jan 11, 2012 11:02 AM PST] =
+ status:active
+
+
+
+Aaron - TN or ABT are both being included in the XML when oppopriate.
+Can you not go by this?
+
+Getting for the Transaction Number query -
+<Notification_qualifier>TN</Notification_qualifier>
+or
+<Notification_qualifier>ABT</Notification_qualifier>
+
+Do you have to have an indicator also?
+
+Should I recreate the RNS transaction to send or are you sending the one yo=
+u fixed?
+Thanks
+
+
+
+
+
+#3 Aaron Doe said 5 days ago [Wed, Jan 11, 2012 10:25 AM PST] =
+ status:active
+
+
+
+I changed =93ABT=94 to =93TN=94. If you need to switch between the CCN and =
+the TN I will need an indicator in the xml. Don recheck step 1.
+
+
+
+
+#2 Don Doe said 5 days ago [Wed, Jan 11, 2012 07:51 AM PST] =
+ status:active
+
+
+
+When completing the RNS Query Test 2 - sending by Transaction Number - have=
+ to send "TN" for the Reference Qualifier, per attached.
+
+But the EDIFACT sent shows ABT (for Cargo Control Number) in error. .
+
+The XML file sent from Express - also attached - does show TN - but the EDI=
+FACT file is showing: ABT
+
+Please correct - as soon as possible.
+
+Thanks
+
+
+
+
+RNS_Query_by_Transaction_Number.xlsx<http://trakr.net/uploads/1/1479=
+4/RNS_Query_by_Transaction_Number.xlsx> view<http://trakr.net/upload=
+s/1/14794/RNS_Query_by_Transaction_Number.xlsx?viewer=3D1>
+
+
+
+
+#1 Don Doe said 6 days ago [Tue, Jan 10, 2012 07:58 PM PST] =
+ status:active
+
+
+
+I completed the RNS Test Question 2 today. Still waiting to hear the result=
+s from Judi at CBSA.
+
+Question 2 requires that you do the query using the Transaction Id.
+In this case, Judi told me to use - 14142123913549 for the Transaction Id -=
+ which I did.
+
+But, per attached, the Query Responses grid doesn't tell you that this quer=
+y was completed by "Transaction Id" and doesn't show the "Transaction Id" u=
+sed with the query.
+
+Need to have a column that shows whether the RNS Query was done by Cargo Co=
+ntrol Number (CCN), Conveyance Reference, or Transaction Id.
+
+Also need to be able to see the Transaction #, CCN, or Conveyance Reference=
+ used within the Query Responses.
+
+This would let the user know what type of query was sent and make it easier=
+ to know which RNS Query is which.
+
+Let me know if any questions.
+
+Thanks.
+
+
+
+
+RNS_Qeury_specifics.xlsx<http://trakr.net/uploads/1/14794/RNS_Qeury_=
+specifics.xlsx> view<http://trakr.net/uploads/1/14794/RNS_Qeury_spec=
+ifics.xlsx?viewer=3D1>
+
+
+C-TPAT SVI Partner ID: norBro01937 / norCon01149=0D
+
+This message and any attachments are intended solely for the addressee(s) a=
+nd are confidential. If you receive this message in error, please delete i=
+t and immediately notify the sender. Norman G. Smith, Inc. accepts no lia=
+bility for any claims in connection with the content or the transmission of=
+ this message. To better protect yourself, we suggest you obtain written a=
+dvice from the applicable Government agency. =0D
+All business is transacted subject to our Terms and Conditions of Service. =
+ Visit http://www.ngSmith.com/tools/forms/eng/terms_conditions.pdf for a f=
+ull copy.=0D=0D
+
+
+
diff --git a/test/test_invalid_byte_seq_outlook.rb b/test/test_invalid_byte_seq_outlook.rb
new file mode 100644
index 0000000..75a6b6a
--- /dev/null
+++ b/test/test_invalid_byte_seq_outlook.rb
@@ -0,0 +1,27 @@
+require "test_helper"
+
+class TestInvalidByteSeqOutlook < Test::Unit::TestCase
+ include MMS2R::TestHelper
+
+ def test_bad_outlook
+ mail = mail('invalid-byte-seq-outlook.mail')
+ mms = MMS2R::Media.new(mail)
+ body = mms.body
+=begin
+
+ assert_equal "+919812345678", mms.number
+ assert_equal "1nbox.net", mms.carrier
+ assert_equal 2, mms.media.size
+
+ assert_not_nil mms.media['text/plain']
+ assert_equal 1, mms.media['text/plain'].size
+ assert_equal "testing123456789012", open(mms.media['text/plain'].first).read
+
+ assert_not_nil mms.media['image/jpeg']
+ assert_equal 1, mms.media['text/plain'].size
+ assert_match(/@003\.jpg$/, mms.media['image/jpeg'].first)
+=end
+
+ mms.purge
+ end
+end
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index f14c737..3f63b54 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,758 +1,758 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
- @tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-t")
+ @oldtmpdir = MMS2R::Media.tmp_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
+ @oldconfdir = MMS2R::Media.conf_dir || File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
+ FileUtils.mkdir_p(@oldtmpdir)
+ FileUtils.mkdir_p(@oldconfdir)
+
+ @tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@tmpdir)
- @confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-c")
+ @confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-#{rand(1000)}")
FileUtils.mkdir_p(@confdir)
-
- @oldtmpdir = MMS2R::Media.tmp_dir
- @oldconfdir = MMS2R::Media.conf_dir
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
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 ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
- # ASCII-8BIT -> D'ici un mois G\xC3\xA9orgie
- # UTF-8 -> D'ici un mois Géorgie
+ # ASCII-8BIT -> D'ici un mois G\xE9orgie
+ # UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
- assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
+ assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
else
- #assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
- assert_equal("D'ici un mois G\xE9orgie body", text_lines.first.strip)
- assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
+ assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("sample email message Fwd: sub D'ici un mois Géorgie"), mms.subject)
+ assert_equal(Iconv.new('UTF-8', 'ISO-8859-1').iconv("D'ici un mois G\xE9orgie body"), text_lines.first.strip)
end
- mms.purge
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'text/plain' || type == 'text/html'
assert_equal true, File.basename(files.first) == 'message.txt' ||
File.basename(files.first) == 'message.html'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
|
monde/mms2r
|
8f614579de34d45e14d3fb41fa0a9332bd3367b1
|
Fix for invalid byte sequence in UTF-8
|
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index 472ceb4..a9a1621 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -1,780 +1,782 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
##
# = Synopsis
#
# MMS2R is a library to collect media files from MMS messages. MMS messages
# are multipart emails and mobile carriers often inject branding into these
# messages. MMS2R strips the advertising from an MMS leaving the actual user
# generated media.
#
# The Tracker for MMS2R is located at
# http://rubyforge.org/tracker/?group_id=3065
# Please submit bugs and feature requests using the Tracker.
#
# If MMS from a carrier not known by MMS2R is encountered please submit a
# sample to the author for inclusion in this project.
#
# == Stand Alone Example
#
# begin
# require 'mms2r'
# rescue LoadError
# require 'rubygems'
# require 'mms2r'
# end
# mail = Mail.read("sample-MMS.file")
# mms = MMS2R::Media.new(mail)
# subject = mms.subject
# number = mms.number
# file = mms.default_media
# mms.purge
#
# == Rails ActionMailer#receive w/ AttachmentFu Example
#
# def receive(mail)
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
# See the README.txt file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
+ ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+ @body = ic.iconv(@body)
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :nokia
# * :palm
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
field = mail.header.fields.detect { |field| field.name.downcase == header.downcase }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
boundary = mail.boundary
boundaries = config['device_types']['boundary'] rescue {}
boundaries.each do |type, regex|
return type if boundary =~ regex
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
|
monde/mms2r
|
6dc91b2879e14a9673a959df62baf4ed8d0f2f6d
|
Make utf-8 fix play nice with Ruby 1.8.7. Bump version.
|
diff --git a/History.txt b/History.txt
index 66fe0b4..b983f5e 100644
--- a/History.txt
+++ b/History.txt
@@ -1,396 +1,401 @@
+### 3.5.1 / 2011-12-11 (Mashed Potato Johnson - oldest living blues guitarist in the world)
+
+* 1 bug fix
+ * A fix for the utf-8 encoding issue with ruby 1.9.2 - James McGrath
+
### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/Rakefile b/Rakefile
index 005e57e..3456fa8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,49 +1,44 @@
# -*- ruby -*-
begin
require 'hoe'
rescue LoadError
require 'rubygems'
require 'hoe'
end
-begin
- require 'rcov/rcovtask'
-rescue LoadError
-end
-
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
require 'mms2r'
require 'rake'
Hoe.plugin :bundler
Hoe.spec('mms2r') do |p|
p.version = MMS2R::Media::VERSION
p.rubyforge_name = 'mms2r'
p.author = ['Mike Mondragon']
p.email = ['[email protected]']
p.summary = 'Extract user media from MMS (and not carrier cruft)'
p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
p.url = p.paragraphs_of('README.txt', 1).first.strip
p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
p.readme_file = 'README.txt'
p.history_file = 'History.txt'
p.extra_deps << ['nokogiri', '>= 1.4.4']
p.extra_deps << ['mail', '>= 2.2.10']
p.extra_deps << ['uuidtools', '>= 2.1.1']
p.extra_deps << ['exifr', '>= 1.0.3']
p.clean_globs << 'coverage'
end
begin
require 'rcov/rcovtask'
Rcov::RcovTask.new do |rcov|
rcov.pattern = 'test/**/test_*.rb'
rcov.verbose = true
rcov.rcov_opts << "--exclude rcov.rb"
end
rescue
task :rcov => :check_dependencies
end
# vim: syntax=Ruby
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index 8691010..e649900 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,76 +1,76 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# MMS2R library version
- VERSION = '3.5.0'
+ VERSION = '3.5.1'
##
# 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:
# 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
mail = Mail.new raw_mail
MMS2R::Media.new(mail) end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
# HAX to not deal with Psych YAML parser in Ruby >= 1.9
#YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index 06250ea..217fbab 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,195 +1,196 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
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?
end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
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' }
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(
uri.request_uri,
{ "User-Agent" => MMS2R::Media::USER_AGENT }
)
rescue StandardError => err
log("#{self.class} processing error, #{$!}", :error)
next
end
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
# force the encoding to be utf-8
- File.open(file,'w'){ |f| f.write(content.force_encoding("UTF-8")) }
+ content = content.force_encoding("UTF-8") if content.respond_to?(:force_encoding)
+ File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3e0e1cc..a3ecc50 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,102 +1,102 @@
# do it like rake http://ozmm.org/posts/do_it_like_rake.html
-%W{ test/unit set net/http net/https pp tempfile mocha }.each do |g|
+%W{ test/unit set net/http net/https pp tempfile mocha rcov/rcovtask }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
# NOTE when we upgrade to test-unit 2.x.x or greater we'll not need redgreen,
# it's baked into test-unit
begin require 'redgreen'; rescue LoadError; end
require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'mms2r')
module MMS2R
module TestHelper
def assert_file_size(file, size)
assert_not_nil(file, "file was nil")
assert(File::exist?(file), "file #{file} does not exist")
assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
end
def fixture(file)
File.join(File.expand_path(File.dirname(__FILE__)), "fixtures", file)
end
def fixture_data(name)
open(fixture(name)).read
end
def mail_fixture(file)
fixture(file)
end
def mail(name)
Mail.read(mail_fixture(name))
end
def smart_phone_mock(make_text = 'Apple', model_text = 'iPhone', software_text = nil, jpeg = true)
mail = stub('mail',
:from => ['[email protected]'],
:return_path => '<[email protected]>',
:message_id => 'abcd0123',
:multipart? => true,
:header => {})
part = stub('part',
:part_type? => "image/#{jpeg ? 'jpeg' : 'tiff'}",
:body => Mail::Body.new('abc'),
:multipart? => false,
:filename => "foo.#{jpeg ? 'jpg' : 'tif'}" )
mail.stubs(:parts).returns([part])
exif = stub('exif', :make => make_text, :model => model_text, :software => software_text)
if jpeg
EXIFR::JPEG.expects(:new).at_least_once.returns(exif)
else
EXIFR::TIFF.expects(:new).at_least_once.returns(exif)
end
mail
end
end
end
class Hash
def except(*keys)
rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
reject { |key,| rejected.include?(key) }
end
def except!(*keys)
replace(except(*keys))
end
end
# monkey patch Net::HTTP so un caged requests don't go over the wire
module Net #:nodoc:
class HTTP #:nodoc:
alias :old_net_http_request :request
alias :old_net_http_connect :connect
def request(req, body = nil, &block)
prot = use_ssl ? "https" : "http"
uri_cls = use_ssl ? URI::HTTPS : URI::HTTP
query = req.path.split('?',2)
opts = {:host => self.address,
:port => self.port, :path => query[0]}
opts[:query] = query[1] if query[1]
uri = uri_cls.build(opts)
raise ArgumentError.new("#{req.method} method to #{uri} not being handled in testing")
end
def connect
raise ArgumentError.new("connect not being handled in testing")
end
end
end
|
monde/mms2r
|
2750c8d8d0beaf2e0d20cee130b1fc23d733eee1
|
Force encoding of temp file to be utf-8.
|
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index 567386a..06250ea 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,194 +1,195 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
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?
end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
srcs.each do |src|
begin
uri = URI.parse(CGI.unescapeHTML(src))
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' }
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(
uri.request_uri,
{ "User-Agent" => MMS2R::Media::USER_AGENT }
)
rescue StandardError => err
log("#{self.class} processing error, #{$!}", :error)
next
end
# 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 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 = 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, content, file)
add_file(type, file) unless type.nil? || file.nil?
cnt = cnt + 1
end
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
- File.open(file,'w'){ |f| f.write(content) }
+ # force the encoding to be utf-8
+ File.open(file,'w'){ |f| f.write(content.force_encoding("UTF-8")) }
return type, file
end
end
end
end
|
monde/mms2r
|
87922706d4d4b6bd237b5e763a3e42740ef8950d
|
Bug fix for fetching content from Sprint's CDN in Ruby 1.9.X runtimes. Version bump.
|
diff --git a/History.txt b/History.txt
index e147de0..66fe0b4 100644
--- a/History.txt
+++ b/History.txt
@@ -1,388 +1,396 @@
+### 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
* Additional means to detect android, iphone, motorola, nokia, palm handsets
* Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index e781447..8691010 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,72 +1,76 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# 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:
# 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
mail = Mail.new raw_mail
MMS2R::Media.new(mail) end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
# HAX to not deal with Psych YAML parser in Ruby >= 1.9
#YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
diff --git a/lib/mms2r/media/sprint.rb b/lib/mms2r/media/sprint.rb
index 01852b9..567386a 100644
--- a/lib/mms2r/media/sprint.rb
+++ b/lib/mms2r/media/sprint.rb
@@ -1,190 +1,194 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
require 'net/http'
require 'nokogiri'
require 'cgi'
module MMS2R
class Media
##
# Sprint version of MMS2R::Media
#
# Sprint is an annoying carrier because they don't actually transmit user
# generated content (like images or videos) directly in the MMS message.
# Instead, they hijack the media that is sent from the cellular subscriber
# and place that content on a content server. In place of the media
# the recipient receives a HTML message with unsolicited Sprint
# advertising and links back to their content server. The recipient has
# to click through Sprint more pages to view the content.
#
# The default subject on these messages from the
# carrier is "You have new Picture Mail!"
module Sprint
##
# Override process() because Sprint doesn't attach media (images, video,
# etc.) to its MMS. Media such as images and videos are hosted on a
# Sprint content server. MMS2R::Media::Sprint has to pick apart an
# HTML attachment to find the URL to the media on Sprint's content
# server and download each piece of content. Any text message part of
# the MMS if it exists is embedded in the html.
def process
unless @was_processed
log("#{self.class} processing", :info)
#sprint MMS are multipart
parts = @mail.parts
#find the payload html
doc = nil
parts.each do |p|
next unless p.part_type? == 'text/html'
d = Nokogiri(p.body.decoded)
title = d.at('title').inner_html
if title =~ /You have new Picture Mail!/
doc = d
@is_video = (p.body.decoded =~ /type="VIDEO">/m ? true : false)
end
end
return if doc.nil? # it was a dud
@is_video ||= false
# break it down
sprint_phone_number(doc)
sprint_process_text(doc)
sprint_process_media(doc)
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
private
##
# Digs out where Sprint hides the phone number
def sprint_phone_number(doc)
c = doc.search("/html/head/comment()").last
t = c.content.gsub(/\s+/m," ").strip
#@number returned in parent's #number
@number = / name="MDN">(\d+)</.match(t)[1]
end
##
# Pulls out the user text form the MMS and adds the text to media hash
def sprint_process_text(doc)
# there is at least one <pre> with MMS text if text has been included by
# the user. (note) we'll have to verify that if they attach multiple texts
# to the MMS then Sprint stacks it up in multiple <pre>'s. The only <pre>
# tag in the document is for text from the user.
doc.search("/html/body//pre").each do |pre|
type = 'text/plain'
text = pre.inner_html.strip
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?
end
end
##
# Fetch all the media that is referred to in the doc
def sprint_process_media(doc)
srcs = Array.new
# collect all the images in the document, even though
# they are <img> tag some might actually refer to video.
# To know the link refers to vide one must look at the
# content type on the http GET response.
imgs = doc.search("/html/body//img")
imgs.each do |i|
src = i.attributes['src']
next unless src
src = src.text
# we don't want to double fetch content and we only
# want to fetch media from the content server, you get
# a clue about that as there is a RECIPIENT in the URI path
# of real content
next unless /mmps\/RECIPIENT\//.match(src)
next if srcs.detect{|s| s.eql?(src)}
srcs << src
end
#we've got the payload now, go fetch them
cnt = 0
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
end
# 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
end
##
# Creates a temporary file based on the type
def sprint_temp_file(type)
file_name = "#{Time.now.to_f}.#{self.class.default_ext(type)}"
File.join(msg_tmp_dir(),File.basename(file_name))
end
##
# Writes the content to a file and returns the type, file as a tuple.
def sprint_write_file(type, content, file = nil)
file = sprint_temp_file(type) if file.nil?
log("#{self.class} writing file #{file}", :info)
File.open(file,'w'){ |f| f.write(content) }
return type, file
end
end
end
end
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index cea744f..f14c737 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -1,557 +1,561 @@
# encoding: UTF-8
require "test_helper"
class TestMms2rMedia < Test::Unit::TestCase
include MMS2R::TestHelper
def use_temp_dirs
MMS2R::Media.tmp_dir = @tmpdir
MMS2R::Media.conf_dir = @confdir
end
def setup
@tmpdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-t")
FileUtils.mkdir_p(@tmpdir)
@confdir = File.join(Dir.tmpdir, "#{Time.now.to_i}-c")
FileUtils.mkdir_p(@confdir)
@oldtmpdir = MMS2R::Media.tmp_dir
@oldconfdir = MMS2R::Media.conf_dir
end
def teardown
FileUtils.rm_rf(@tmpdir)
FileUtils.rm_rf(@confdir)
MMS2R::Media.tmp_dir = @oldtmpdir
MMS2R::Media.conf_dir = @oldconfdir
end
def stub_mail(vals = {})
attrs = {
:from => '[email protected]',
:to => '[email protected]',
:subject => 'This is a test email',
:body => 'a',
}.merge(vals)
Mail.new do
from attrs[:from]
to attrs[:to]
subject attrs[:subject]
body attrs[:body]
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 ['[email protected]'], mms.from
end
def temp_text_file(text)
tf = Tempfile.new("test" + rand.to_s)
tf.puts(text)
tf.close
tf.path
end
def test_tmp_dir
use_temp_dirs()
MMS2R::Media.tmp_dir = @tmpdir
assert_equal @tmpdir, MMS2R::Media.tmp_dir
end
def test_conf_dir
use_temp_dirs()
MMS2R::Media.conf_dir = @confdir
assert_equal @confdir, MMS2R::Media.conf_dir
end
def test_safe_message_id
mid1_b="1234abcd"
mid1_a="1234abcd"
mid2_b="<01234567.0123456789012.JavaMail.fooba@foo-bars999>"
mid2_a="012345670123456789012JavaMailfoobafoo-bars999"
assert_equal mid1_a, MMS2R::Media.safe_message_id(mid1_b)
assert_equal mid2_a, MMS2R::Media.safe_message_id(mid2_b)
end
def test_default_ext
assert_equal nil, MMS2R::Media.default_ext(nil)
assert_equal 'text', MMS2R::Media.default_ext('text')
assert_equal 'txt', MMS2R::Media.default_ext('text/plain')
assert_equal 'test', MMS2R::Media.default_ext('example/test')
end
def test_base_initialize_config_tries_to_open_default_config_yaml
f = File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml')
YAML.expects(:load_file).once.with(f).returns({})
config = MMS2R::Media.initialize_config(nil)
end
def test_base_initialize_config
config = MMS2R::Media.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_instance_initialize_config
mms = MMS2R::Media.new stub_mail
config = mms.initialize_config(nil)
# test defaults shipped in mms2r_media.yml
assert_not_nil config
assert_equal true, config['ignore'].is_a?(Hash)
assert_equal true, config['transform'].is_a?(Hash)
assert_equal true, config['number'].is_a?(Array)
end
def test_initialize_config_contatenation
c = {'ignore' => {'text/plain' => [/A TEST/]},
'transform' => {'text/plain' => [/FOO/, '']},
'number' => ['from', /^([^\s]+)\s.*/, '\1']
}
config = MMS2R::Media.initialize_config(c)
assert_not_nil config['ignore']['text/plain'].detect{|v| v == /A TEST/}
assert_not_nil config['transform']['text/plain'].detect{|v| v == /FOO/}
assert_not_nil config['number'].first == 'from'
end
def test_aliased_new_returns_default_processor_instance
mms = MMS2R::Media.new stub_mail
assert_not_nil mms
assert_equal true, mms.respond_to?(:process)
assert_equal MMS2R::Media, mms.class
end
def test_lazy_process_option
mms = MMS2R::Media.new stub_mail, :process => :lazy
mms.expects(:process).never
end
def test_logger_option
logger = mock()
logger.expects(:info).at_least_once
mms = MMS2R::Media.new stub_mail, :logger => logger
end
def test_default_processor_initialize_tries_to_open_config_for_carrier
mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
YAML.expects(:load_file).never.with(example_yaml)
mms = MMS2R::Media.new stub_mail
end
def test_mms_phone_number
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
end
def test_mms_phone_number_from_config
mail = stub_mail(:from => '"+2068675309" <[email protected]>')
mms = MMS2R::Media.new(mail)
mms.expects(:config).once.returns({'number' => ['from', /^([^\s]+)\s.*/, '\1']})
assert_equal '+2068675309', mms.number
end
def test_mms_phone_number_with_errors
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
assert_nothing_raised do
assert_equal '', mms.number
end
end
def test_transform_text_plain
mail = stub_mail
mail.stubs(:from).returns(nil)
mms = MMS2R::Media.new(mail)
type = 'test/type'
text = 'hello'
# no match in the config
result = [type, text]
assert_equal result, mms.transform_text(type, text)
# testing the default config
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent via BlackBerry from T-Mobile")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', "Sent from my Verizon Wireless BlackBerry")
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from my iPhone')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', 'Sent from your iPhone.')
assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
# has a bad regexp
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
# matches in config
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world']]}})
assert_equal [type, 'world'], mms.transform_text(type, text)
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/^Ignore this part, (.+)/, '\1']]}})
assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
# chaining transforms
mms.expects(:config).at_least_once.returns({'transform' => {type => [[/(hello)/, 'world'],
[/(world)/, 'mars']]}})
assert_equal [type, 'mars'], mms.transform_text(type, text)
# has a Iconv problem
mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
assert_equal result, mms.transform_text(type, text)
end
def test_transform_text_to_utf8
mail = mail('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_lines = IO.readlines("#{file}")
text = text_lines.join
# ASCII-8BIT -> D'ici un mois G\xC3\xA9orgie
# UTF-8 -> D'ici un mois Géorgie
if RUBY_VERSION < "1.9"
assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
else
#assert_equal("D'ici un mois Géorgie body", text_lines.first.strip)
assert_equal("D'ici un mois G\xE9orgie body", text_lines.first.strip)
assert_equal("sample email message Fwd: sub D'ici un mois Géorgie", mms.subject)
end
mms.purge
end
def test_subject
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
assert_equal s, mms.subject
# second time through shouldn't process the subject again
mail.expects(:subject).never
assert_equal s, mms.subject
end
def test_subject_with_bad_mail_subject
mail = stub_mail
mail.stubs(:subject).returns(nil)
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
diff --git a/test/test_pm_sprint_com.rb b/test/test_pm_sprint_com.rb
index 2c90698..0526638 100644
--- a/test/test_pm_sprint_com.rb
+++ b/test/test_pm_sprint_com.rb
@@ -1,224 +1,257 @@
require "test_helper"
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
mail = mail('sprint-text-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal "2068765309", mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_equal 1, mms.media['text/plain'].size
file = mms.media['text/plain'].first
assert_equal true, File.exist?(file)
assert_match(/\.txt$/, File.basename(file))
assert_equal "Tea Pot", IO.read(file)
mms.purge
end
def test_mms_should_have_a_phone_number
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
mms.purge
end
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&iconifyVideo=true&wm=1&limitsize=125,125&outquality=90&squareoutput=255,255,255&ext=.jpg&iconifyVideo=true&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
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['video/quicktime']
assert_equal 1, mms.media['video/quicktime'].size
assert_equal "000_259e41e851be9b1d_1-0.mov", File.basename(mms.media['video/quicktime'][0])
mms.purge
end
def test_should_have_simple_image
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_not_nil mms.media['image/jpeg'][0]
assert_match(/001_2066c7013e7ca833_1-0.jpg$/, mms.media['image/jpeg'][0])
mms.purge
end
def test_collect_image_using_block
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
file_array = nil
mms.process do |k, v|
file_array = v if (k == 'image/jpeg')
assert_equal 1, file_array.size
file = file_array.first
assert_not_nil file = file_array.first
assert_equal "001_2066c7013e7ca833_1-0.jpg", File.basename(file)
end
mms.purge
end
def test_process_internals_should_only_be_executed_once
mail = mail('sprint-image-01.mail')
mock_sprint_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 1, mms.media.size
# second time through shouldn't go into the was_processed block
mms.mail.expects(:parts).never
mms.process{|k, v| }
mms.purge
end
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
assert_equal 1, mms.media.size
assert_nil mms.media['text/plain']
assert_nil mms.media['text/html']
assert_equal 2, mms.media['image/jpeg'].size
assert_not_nil mms.media['image/jpeg'][0]
assert_not_nil mms.media['image/jpeg'][1]
assert_match(/001_104058d23d79fb6a_1-0.jpg$/, mms.media['image/jpeg'][0])
assert_match(/001_104058d23d79fb6a_1-1.jpg$/, mms.media['image/jpeg'][1])
mms.purge
end
def test_image_should_be_missing
# this test is questionable
mail = mail('sprint-broken-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_image_should_be_purged_from_content_server
mail = mail('sprint-image-01.mail')
mock_sprint_purged_image(mail.message_id)
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal 0, mms.media.size
mms.purge
end
def test_body_should_return_empty_when_there_is_no_user_text
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.body
end
def test_sprint_write_file
mail = mock(:message_id => 'a')
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
mms = MMS2R::Media.new(mail, :process => :lazy)
type = 'text/plain'
content = 'foo'
file = Tempfile.new('sprint')
file.close
type, file = mms.send(:sprint_write_file, type, content, file.path)
assert_equal 'text/plain', type
assert_equal content, IO.read(file)
end
def test_subject
mail = mail('sprint-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
def test_new_subject
mail = mail('sprint-new-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal '2068675309', mms.number
assert_equal "pm.sprint.com", mms.carrier
assert_equal "", mms.subject
end
end
|
monde/mms2r
|
7db749786be822954df2ced134f95711054df7d9
|
Don't ignore case, photo.JPG and photo.PNG are case sensitive names emitted from an iphone.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 1b035d1..6d0ec63 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,76 +1,76 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
boundary:
:motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:nokia: !ruby/regexp /^Nokia/i
:pantech: !ruby/regexp /^PANTECH$/i
:palm: !ruby/regexp /Palm/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:centro: !ruby/regexp /^Palm Centro$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
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$/
|
monde/mms2r
|
6deacd0dd082560e3d48b4ece871a8b122ba3ace
|
Prep for 3.4.1 Fatty Ding-Dongs release.
|
diff --git a/History.txt b/History.txt
index 6d183ea..e147de0 100644
--- a/History.txt
+++ b/History.txt
@@ -1,382 +1,388 @@
+### 3.4.1 / 2011-11-06 (Fatty Ding-Dongs, Dethklok foster child)
+
+* 2 major enhancements
+ * Additional means to detect android, iphone, motorola, nokia, palm handsets
+ * Additional known SMS/MMS domains mm.att.net, labwig.net, cdma.sasktel.com
+
### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
* 2 major enhancements
* regexp's in yaml configs are store as a ruby regexp and not a string that
is evaled.
* character encoding capability with 1.8 rubies and 1.9 rubies.
### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
* 2 minor enhancements
* new method #default_html returns the default html attachment
* #body will return the default plain text, or default stripped html text
### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
* 1 major enhancement
* MMS2R::Media::Sprint is now a module that is extended in for processing
Sprint content rather than being child class of MMS2R::Media
Extension is the strategy to use for overwriting template methods now
* 1 minor enhancement
* process new Sprint subject - Jason Hooper
* new SaskTel mms/sms domain alias sasktel.com
* new Virgin Mobile mms/sms domain alias yrmobl.com
### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
* 3 minor enhancements
* updated readme with latest sites known to use mms2r
* bundler assimilated
* loading rubygems only if it's required, like rake
### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
* 8 minor enhancements
* Detects additional Bell/AT&T domain sbcglobal.net as a handset
* Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
* Expanded mobile phone detection for handset makers by : Casio, Google Nexus
One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
* EXIF Reader (exifr) is integral to MMS2R and is now a required gem
* upgrade Mail to 2.2.5
* depend on latest gems
* corrected example - Jason Hooper
* added As Seen On The Internet to README that lists sites known to be using
MMS2R in some fashion
### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
* 1 minor enhancement
* support for U.S. Cellular
### 3.0.0 / 2010-02-24 (General Crozier - Chairman of the Joint Chiefs of Staff)
* 1 new feature
* dependence upon Mail gem rather than TMail gem
### 2.4.1 / 2010-02-07 (Vater Orlaag - political and spiritual specialist)
* 3 minor enhancements
* make sure filename is free of new lines - laurynas
* recognize HTC HERO200 as a smart phone
* recognize HTC Eris as a smart phone
### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
* 1 new feature
* replace Hpricot with Nokogiri for html parsing of Sprint data
* 3 minor enhancements
* smartphone identities stored in conf/mms2r_media.yml
* identify Motorola Droid as a smartphone
* identify T-Mobile Dash as a smartphone
* use uuidtools for naming temp directories - kbaum
### 2.3.0 / 2009-08-30 (Snakes 'n' Barrels Greatest Hits)
* 5 new features
* detect smartphone status/type based on model metadata from jpeg and tiff
exif data using exifr gem, access exif data with MMS2R::Media#exif
* make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
smtlaissezfaire
* delegate missing methods to mms2r's tmail object so that mms2r behaves as
if it were a tmail object - Sai Emrys, saizai
* default_media can return an attachment of application content type -
Brendan Lim, brendanlim
* MMS2R.parse(raw_mail) convenience class method that parses and returns an
mms2r from a mail file - saizai
* 4 minor enhancements
* make examples more 'mail' specific to enforce the fact that an mms is a
multipart email - saizai
* update for text in vzwpix.com default carrier message
* detecting smartphone (blackberries and iphones for now) is more versatile
from reading mail headers
* expanded filtering of carrier advertising text in mms from smartphones
### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
* 3 new features
* MMS2R::Media#is_mobile? best guess if the sender was a mobile device
* MMS2R::Media#device_type? best guess of the mobile device type. Simple
heuristics thus far for :blackberry :iphone :handset :unknown
could be expanded for exif probing or additinal shifting of mail header
* from array in conf/from.yml to provide granularity to determine carrier
domain (caused by tmo.blackberry.net)
* 4 minor enhancements
* support for Virgin Canada messaging service vmobile.ca
* support for text service messaging.sprintpcs.com
* additional BlackBerry coverage from T-Mobile tmo.blackberry.net provider
* legacy support for mobile.mycingular.com, pics.cingularme.com
* 3 bug fixes
* iPhone default subject - jesse dp
http://rubyforge.org/tracker/?func=detail&atid=11789&aid=22951&group_id=3065
* add sprintpcs.com to pm.sprint.com aliases
* fix OS X long filename issues - Matt Conway
### 2.1.3 / 2008-11-06 (Dr. Ramonolith Chesterfield - Military pharmaceutical psychotropic drug manufacturing expert
* 1 minor enhancement
* added mms.ae support
### 2.1.2 / 2008-10-21 (Toki's mom, Anja Wartooth)
* 2 minor enhancments
* Sprint subject update - jesse dp
* Virgin Mobile support vmpix.com
### 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 â Birthday expert and Murderface expert)
* 1 major enhancement:
* 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 - 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)
* Deal with Apple Mail multipart/appledouble - jesse dp
### 2.0.4 / 2008-04-28 (Mr. Selatcia - elder member of The Tribunal)
* updated mms.vodacom4me.co.za Vodacom South Africa - Vijay Yellapragada
* 1nbox.net / Idea cellular 1nbox.net - Vijay Yellapragada
* mms.3ireland.ie / 3 Ireland - Vijay Yellapragada
* mms.alltel.com / Alltel (reverted message.alltel.com) - Vijay Yellapragada
* mms.mobileiam.ma / Maroc Telecom - Vijay Yellapragada
* mms.mtn.co.za / MTM South Africa - Vijay Yellapragada
* rci.rogers.com / Rogers of Canada - Vijay Yellapragada
* mmsreply.t-mobile.co.uk / T-Mobile UK - Vijay Yellapragada
* waw.plspictures.com / PLSPICTURES.COM mms hosting service
### 2.0.3 / 2008-04-15 (Enter Taxman - The 1040 MMS Form)
* fix case when part is image/jpeg declared 'application/octet-stream'
* trim dangling image/jpeg text from blackberry messages
* file extensions added to filenames that are missing extensions in part headers
* anonymize images in fixtures to reduce gem size
* T-Mobile update - jesse dp
* AT&T/T-Mobile Blackberrry update - Dave Myron
### 2.0.2 / 2008-02-22 (The Jomfru Brothers - proprietors of diefordethklok.com)
* added support for mms.vodacom4me.co.za Vodacom South Africa - Jason Haruska
* added support for bellsouth.net - Jason Haruska
* added support for mms.mycricket.com
* Improved Blackberry and iPhone suport - Jason Haruska
* added :number key to configuration to provide rules for specifying
alternative phone number location
* return sender's phone number for mobile.indosat.net.id
* return sender's phone number for mms.luxgsm.lu
* return sender's phone number for mms.vodacom4me.co.za
### 2.0.1 / 2008-02-08 (Professor Jerry Gustav Munndig - Child control expert)
* strip out common blackberry and iPhone signatures
* handle carriers that use external mail services such as Yahoo! as the From address
* Add support for mobile.indosat.net.id (and yahoo.co.id) - Jason Haruska
* Add support for sms.sasktel.com - Jason Haruska
### 2.0.0 / 2008-01-23 (Skwisgaar Skwigelf - fastest guitarist alive)
* added support for pxt.vodafone.net.nz PXT New Zealand
* added support for mms.o2online.de O2 Germany
* added support for orangemms.net Orange UK
* added support for txt.att.net AT&T
* added support for mms.luxgsm.lu LUXGSM S.A.
* added support for mms.netcom.no NetCom (Norway)
* added support for mms.three.co.uk Hutchison 3G UK Ltd
* removed deprecated #get_number use #number
* removed deprecated #get_subject use #subject
* removed deprecated #get_body use #body
* removed deprecated #get_media use #default_media
* removed deprecated #get_text use #default_text
* removed deprecated #get_attachment use #attachment
* fixed error when Sprint content server responds 500
* better yaml configs
* moved TMail dependency from Rails ActionMailer SVN to 'official' Gem
* ::new greedily processes MMS unless otherwise specified as an initialize
option :process => :lazy
* logger moved to initialize option :logger => some_logger
* testing using mocks and stubs instead of duck raped Net::HTTP
* fixed typo in name of method #attachement to #attachment
* fixed broken downloading of Sprint videos
### 1.1.12 / 2007-10-21 (Dr. Ronald von Moldenberg - Endorsement specialist)
* fetch original images from Sprint content server (Layton Wedgeworth)
* ignore Sprint messages when requested content has been purged from their
content server
### 1.1.11 / 2007-10-20 (Dr. Armand Skagerakk Frederickshaven - Mythology expert)
* minor fix for attachment_fu where it might call #path on the cgi temp file
that is returned by get_attachment
* renamed a_t_t_media.rb to att_media.rb to make it autotest happy
* masthead.jpg misplaced in mms2r_t_mobile_media_ignore.yml (Layton Wedgeworth)
* overridden SprintMedia#process failed to accept block (Layton Wedgeworth)
* added method_deprecated to help mark methods that are going to be deprecated
in preparation of 1.2.x release
* #get_number marked deprecated, use #number instead
* #get_subject marked deprecated, use #subject instead
* #get_body marked deprecated, use #body instead
* #get_text marked deprecated, use #default_text instead
* #get_attachment marked deprecated, use #attachment instead
* #get_media marked deprecated, use #default_media instead
### 1.1.10 / 2007-09-30 (Face Bones)
* fixed a case for a nil match on From in the create method (Luke Francl)
* added support for Alltel message.alltel.com (Ben Wood)
### 1.1.9 / 2007-09-08 (Rebecca Nightrod - controlling girlfriend of Nathan
Explosion)
* fixed broken support for act_as_attachment and attachment_fu
### 1.1.8 / 2007-09-08 (James Grishnack - Head of Behemoth Productions, producer
of Blood Ocean)
* Added support for Orange of France, Orange orange.fr (Julian Biard)
* purge in the process block removed, purge must be called explicitly
after processing to clean up extracted temporary media files.
### 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
* Added support 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
### 1.1.5 / 2007-08-11 (Mustakrakish, the Lake Troll)
* AT&T => mms.att.net not clearing out default "multimedia message"
subject to nil (Will Jessup)
* Ignore case on default subject for all carriers in
corresponding conf/mms2r_XXX_media_subject.yml
### 1.1.4 / 2007-08-07 (Dr. Rockso)
* AT&T => mms.att.net support (thanks Mike Chen and Dave Myron)
* get_body returns nil when there is not user text (sorry Will!)
### 1.1.3 / 2007-07-10 (Charles Foster Ofdensen)
* Helio support by Will Jessup
* get_subject returns nil on default carrier subjects
### 1.1.2 / 2007-06-13 (Dethklok roadie #2)
* placed versioned hpricot dependency in Hoe's extra_deps (an attempt to
appease firebrigade gods or not cause Gem::RemoteInstallationCancelled
whichever you prefer)
### 1.1.1 / 2007-06-11 (Dethklok roadie)
* rescue rcov non-dependency in Rakefile to make firebrigade happy
### 1.1.0 / 2007-06-08 (Toki Wartooth)
* get_body to return body text (Luke Francl)
* get_subject returns "" for default subjects now
* default subjects listed in yaml by carrier in conf directory
* added granularity to Cingular, Sprint, and Verizon carrier services (Will
Jessup)
* refactored Sprint instance to process all media (Will Jessup + Mike)
* optimized text transformations (Will Jessup)
* properly handle ISO-8859-1 and UTF-8 text (Will Jessup)
* autotest powers activate! (ZenTest autotest discovery enabled)
* configuration file ignores, transforms, and subjects all store Regexp's
* Put vendor Text::Format & TMail::Mail as an external subversion dependency
to the 1.2 stable branch of Rails ActionMailer
* added get_number method to return the phone number associated with this MMS
* get_media and get_text attachment_fu helper return the largest piece of media
of that type if the more than one exits in the media (Luke Francl)
* added block support to process() method (Shane Vitarana)
### 1.0.7 / 2007-04-27 (Senator Stampingston)
* patch submitted by Luke Francl
* added a get_subject method that returns nil when any MMS has a default
carrier subject
* get_subject returns nil for '', 'Multimedia message', '(no subject)', 'You
have new Picture Mail!'
### 1.0.6 / 2007-04-24 (Pickles the Drummer)
* patch submitted by Luke Francl
* added support for mms.dobson.net (Dobson aka Cellular One) (Luke)
* DRY'd up unit tests (Luke)
* added get_media instance method that returns first video or image as File
(Luke)
* File from get_media can be used by/with attachment_fu (Luke)
* added get_text instance method that returns first non advertising text
* File from get_text can be used by/with attachment_fu
### 1.0.5 / 2007-04-10 (William Murderface)
* patch submitted by Luke Francl
* made ignore_media? start its text check from the start of the file (Luke)
* added new text transform for Verizon messages (Luke)
* updated Nextel ignore conf (Luke)
* added additional samples and tests for T-Mobile & Verizon (Luke)
* cleaned up MMS2R::Media documentation
* added Sprint broken image test for when media goes stale on their content
server
* fixed teardown typo in lots of plases
* added tests for 4 three samples of unique variants of Sprint/Nextel text
* 100% test coverage!
### 1.0.4 / 2007-04-09 (Metalocalypse)
* fix teardown in test_mms2r_sprint.rb (shanesbrain.net)
* clean up Net::HTTP in MMS2R::SprintMedia (shanesbrain.net)
* added accessor MMS2R::Media.media_dir
* fixed a nil issue with underlying tmp working dir
* added exception handling around Net::HTTP in MMS2R::SprintMedia
### 1.0.3 / 2007-04-05 (Paper Cut)
* Cleaned up packaging and errors in example found by Shane V.
http://shanesbrain.net/
### 1.0.2 / 2007-03-07
* Reorganized tests and fixtures
* Added carriers:
* Cingular => cingularme.com
* Nextel => messaging.nextel.com
* Verizon => vtext.com
### 1.0.1 / 2007-03-07
* Flubbed RubyForge release ... do not use this.
### 1.0.0 / 2007-03-06
* Birthday!
* AT&T/Cingular => mmode.com
* Cingular => mms.mycingular.com
* Sprint => pm.sprint.com
* Sprint => messaging.sprintpcs.com
* T-Mobile => tmomail.net
* Verizon => vzwpix.com
diff --git a/Manifest.txt b/Manifest.txt
index f3445d0..334b4f2 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,181 +1,184 @@
+.gitignore
Gemfile
Gemfile.lock
History.txt
Manifest.txt
README.TMail.txt
README.txt
Rakefile
conf/1nbox.net.yml
conf/aliases.yml
conf/bellsouth.net.yml
conf/from.yml
conf/mediamessaging.o2.co.uk.yml
conf/messaging.nextel.com.yml
conf/mms.3ireland.ie.yml
conf/mms.ae.yml
conf/mms.alltel.com.yml
conf/mms.att.net.yml
conf/mms.dobson.net.yml
conf/mms.luxgsm.lu.yml
conf/mms.mobileiam.ma.yml
conf/mms.mtn.co.za.yml
conf/mms.mycricket.com.yml
conf/mms.myhelio.com.yml
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
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/vmpix.com.yml
conf/vzwpix.com.yml
conf/waw.plspictures.com.yml
dev_tools/anonymizer.rb
dev_tools/debug_sprint_nokogiri_parsing.rb
init.rb
lib/ext/mail.rb
lib/ext/object.rb
lib/mms2r.rb
lib/mms2r/media.rb
lib/mms2r/media/sprint.rb
mms2r.gemspec
test/fixtures/1nbox-2images-01.mail
test/fixtures/1nbox-2images-02.mail
test/fixtures/1nbox-2images-03.mail
test/fixtures/1nbox-2images-04.mail
test/fixtures/3ireland-mms-01.mail
test/fixtures/ad_new.txt
test/fixtures/alltel-image-01.mail
test/fixtures/alltel-mms-01.mail
test/fixtures/alltel-mms-03.mail
test/fixtures/apple-double-image-01.mail
test/fixtures/att-blackberry-02.mail
test/fixtures/att-blackberry.mail
test/fixtures/att-image-01.mail
test/fixtures/att-image-02.mail
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/dici_un_mois_georgie.txt
test/fixtures/dobson-image-01.mail
test/fixtures/dot.jpg
test/fixtures/generic.mail
test/fixtures/handsets.yml
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/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
test/fixtures/mmode-image-01.mail
test/fixtures/mms.ae-image-01.mail
test/fixtures/mms.mycricket.com-pic-and-text.mail
test/fixtures/mms.mycricket.com-pic.mail
test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail
test/fixtures/mobile.mycingular.com-text-01.mail
test/fixtures/mtn-southafrica-mms.mail
test/fixtures/mycingular-image-01.mail
test/fixtures/netcom-image-01.mail
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/o2-de-image-01.mail
test/fixtures/orange-uk-image-01.mail
test/fixtures/orangefrance-text-and-image.mail
test/fixtures/orangepoland-text-01.mail
test/fixtures/orangepoland-text-02.mail
test/fixtures/pics.cingularme.com-image-01.mail
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
test/fixtures/sprint-pcs-text-01.mail
test/fixtures/sprint-purged-image-01.mail
test/fixtures/sprint-text-01.mail
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/tmo.blackberry.net-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/us-cellular-image-01.mail
test/fixtures/verizon-blackberry.mail
test/fixtures/verizon-image-01.mail
test/fixtures/verizon-image-02.mail
test/fixtures/verizon-image-03.mail
test/fixtures/verizon-text-01.mail
test/fixtures/verizon-video-01.mail
test/fixtures/virgin-mobile-image-01.mail
test/fixtures/virgin.ca-text-01.mail
test/fixtures/vodacom4me-co-za-01.mail
test/fixtures/vodacom4me-co-za-02.mail
test/fixtures/vodacom4me-southafrica-mms-01.mail
test/fixtures/vodacom4me-southafrica-mms-04.mail
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
test/test_helper.rb
test/test_mediamessaging_o2_co_uk.rb
test/test_messaging_nextel_com.rb
test/test_messaging_sprintpcs_com.rb
test/test_mms2r_media.rb
test/test_mms_3ireland_ie.rb
test/test_mms_ae.rb
test/test_mms_alltel_com.rb
test/test_mms_att_net.rb
test/test_mms_dobson_net.rb
test/test_mms_luxgsm_lu.rb
test/test_mms_mobileiam_ma.rb
test/test_mms_mtn_co_za.rb
test/test_mms_mycricket_com.rb
test/test_mms_myhelio_com.rb
test/test_mms_netcom_no.rb
test/test_mms_o2online_de.rb
test/test_mms_three_co_uk.rb
test/test_mms_uscc_net.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_sprint.rb
test/test_tmomail_net.rb
test/test_unicel_com.rb
test/test_vmpix_com.rb
test/test_vzwpix_com.rb
test/test_waw_plspictures_com.rb
vendor/plugins/mms2r/lib/autotest/discover.rb
vendor/plugins/mms2r/lib/autotest/mms2r.rb
diff --git a/lib/mms2r.rb b/lib/mms2r.rb
index d80ee40..e781447 100644
--- a/lib/mms2r.rb
+++ b/lib/mms2r.rb
@@ -1,72 +1,72 @@
#--
# Copyright (c) 2007-2010 by Mike Mondragon ([email protected])
#
# Please see the LICENSE file for licensing information.
#++
module MMS2R
##
# A hash of MMS2R processors keyed by MMS carrier domain.
CARRIERS = {}
##
# Registers a class as a processor for a MMS domain. Should only be
# used in special cases such as MMS2R::Media::Sprint for 'pm.sprint.com'
def self.register(domain, processor_class)
MMS2R::CARRIERS[domain] = processor_class
end
##
# A hash of file extensions for common mime-types
EXT = {
'text/plain' => 'text',
'text/plain' => 'txt',
'text/html' => 'html',
'image/png' => 'png',
'image/gif' => 'gif',
'image/jpeg' => 'jpeg',
'image/jpeg' => 'jpg',
'video/quicktime' => 'mov',
'video/3gpp2' => '3g2'
}
class MMS2R::Media
##
# MMS2R library version
- VERSION = '3.4.0'
+ VERSION = '3.4.1'
end
# 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
mail = Mail.new raw_mail
MMS2R::Media.new(mail) end
end
%W{ yaml mail fileutils pathname tmpdir yaml digest/sha1 iconv exifr }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
# HAX to not deal with Psych YAML parser in Ruby >= 1.9
#YAML::ENGINE.yamler= 'syck' if defined?(YAML::ENGINE)
require File.join(File.dirname(__FILE__), 'ext/mail')
require File.join(File.dirname(__FILE__), 'ext/object')
require File.join(File.dirname(__FILE__), 'mms2r/media')
require File.join(File.dirname(__FILE__), 'mms2r/media/sprint')
MMS2R.register('pm.sprint.com', MMS2R::Media::Sprint)
|
monde/mms2r
|
68d90d13f0e7b343c9bba7157be7e6b51449ca7c
|
Detect palm handsets.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 526606a..1b035d1 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,74 +1,76 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
boundary:
:motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:nokia: !ruby/regexp /^Nokia/i
:pantech: !ruby/regexp /^PANTECH$/i
+ :palm: !ruby/regexp /Palm/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
+ :centro: !ruby/regexp /^Palm Centro$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/i
:video: !ruby/regexp /\.3gp$/
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index f6c08bd..472ceb4 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -40,797 +40,798 @@
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
# See the README.txt file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :nokia
+ # * :palm
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
field = mail.header.fields.detect { |field| field.name.downcase == header.downcase }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
boundary = mail.boundary
boundaries = config['device_types']['boundary'] rescue {}
boundaries.each do |type, regex|
return type if boundary =~ regex
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
|
monde/mms2r
|
6b75ca8f59b2df8801ac671febc4118cdfc39914
|
Detect nokia handsets.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 8202cec..526606a 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,73 +1,74 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
boundary:
:motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
+ :nokia: !ruby/regexp /^Nokia/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/i
:video: !ruby/regexp /\.3gp$/
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index d89038a..f6c08bd 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -39,797 +39,798 @@
# def receive(mail)
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
# See the README.txt file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
+ # * :nokia
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
field = mail.header.fields.detect { |field| field.name.downcase == header.downcase }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
boundary = mail.boundary
boundaries = config['device_types']['boundary'] rescue {}
boundaries.each do |type, regex|
return type if boundary =~ regex
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
|
monde/mms2r
|
b4b376d8c8bcdc76495e76902b07c2e603293e46
|
Detect motorola handsets by the inspecting the naming pattern of it mail parts boundary.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 539897f..8202cec 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,71 +1,73 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
+ boundary:
+ :motorola: !ruby/regexp /Motorola-A-Mail/i
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/i
:video: !ruby/regexp /\.3gp$/
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index f43533c..d89038a 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -104,726 +104,732 @@
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
field = mail.header.fields.detect { |field| field.name.downcase == header.downcase }
return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
+ boundary = mail.boundary
+ boundaries = config['device_types']['boundary'] rescue {}
+ boundaries.each do |type, regex|
+ return type if boundary =~ regex
+ end
+
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
|
monde/mms2r
|
bacbadf1f2a348d6853c4124cea4b99c195e22e3
|
Refine apple detection.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 521d472..539897f 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,71 +1,71 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
user-agent:
:iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
- :iphone: !ruby/regexp /iPhone|201/i
+ :iphone: !ruby/regexp /iPhone/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/i
:video: !ruby/regexp /\.3gp$/
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index 99ac44e..cea744f 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -260,613 +260,613 @@ class TestMms2rMedia < Test::Unit::TestCase
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'text/plain' || type == 'text/html'
assert_equal true, File.basename(files.first) == 'message.txt' ||
File.basename(files.first) == 'message.html'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_faux_tiff_iphone_device_type_by_exif
- mail = smart_phone_mock('Apple', 'iPhone', nil, nil, 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_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)
assert_equal :dash, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_droid_device_type_by_exif
mail = smart_phone_mock('Motorola', 'Droid')
mms = MMS2R::Media.new(mail)
assert_equal :droid, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_eris_device_type_by_exif
mail = smart_phone_mock('HTC', 'Eris')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_hero_device_type_by_exif
mail = smart_phone_mock('HTC', 'HERO200')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
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|
mail = smart_phone_mock(handset.first, handset.last)
mms = MMS2R::Media.new(mail)
assert_equal true, mms.is_mobile?, "mms with make #{mms.exif.make}, and model #{mms.exif.model}, should be considered a mobile device"
end
end
def test_blackberry_device_type
berries = ['att-blackberry.mail',
'suncom-blackberry.mail',
'tmobile-blackberry-02.mail',
'tmobile-blackberry.mail',
'tmo.blackberry.net-image-01.mail',
'verizon-blackberry.mail',
'verizon-blackberry.mail']
berries.each do |berry|
mms = MMS2R::Media.new(mail(berry))
assert_equal :blackberry, mms.device_type?, "fixture #{berry} was not a blackberrry"
assert_equal true, mms.is_mobile?
end
end
def test_handset_device_type
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal :handset, mms.device_type?
assert_equal true, mms.is_mobile?
end
end
|
monde/mms2r
|
75e207498148edb5777f3d86d7854b3574c11052
|
Inspect the mail header fields more closely, looking for User-Agent field in headers.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index e4146ec..521d472 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,69 +1,71 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
+ user-agent:
+ :iphone: !ruby/regexp /iPhone/i
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone|201/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo\.(JPG|PNG)$/i
:video: !ruby/regexp /\.3gp$/
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index a61a051..f43533c 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -80,748 +80,750 @@
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
+ field = mail.header.fields.detect { |field| field.name.downcase == header.downcase }
+ return type if field && field.to_s =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
file = attachment(['video'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
|
monde/mms2r
|
020a69417398b807aa9614858b2752038a4e33c2
|
Wasn't picking up iphone names correctly.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index f08c5d0..e4146ec 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,70 +1,69 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone|201/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
- :iphone: !ruby/regexp /^photo\.JPG$/
- :iphone: !ruby/regexp /^photo\.PNG$/
+ :iphone: !ruby/regexp /^photo\.(JPG|PNG)$/i
:video: !ruby/regexp /\.3gp$/
|
monde/mms2r
|
bd51f9058477fa46510bca540996aedb78f149df
|
mm.att.net as seen in the wild
|
diff --git a/README.txt b/README.txt
index 1a69fbc..44d90c9 100644
--- a/README.txt
+++ b/README.txt
@@ -1,248 +1,248 @@
= mms2r
https://github.com/monde/mms2r
== 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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,
+* AT&T/Cingular/Legacy: mms.att.net, mm.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com [http://www.twitpic.com/]
* Simplton [http://simplton.com/]
* fanchatter.com [http://www.fanchatter.com/]
* camura.com [http://www.camura.com/]
* eachday.com [http://www.eachday.com/]
* beenup2.com [http://www.beenup2.com/]
* snapmylife.com [http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2010 by Mike Mondragon (blog[http://plasti.cx/])
MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl (blog[http://railspikes.com/])
* Will Jessup (blog[http://www.willjessup.com/])
* Shane Vitarana (blog[http://www.shanesbrain.net/])
* Layton Wedgeworth (http://www.beenup2.com/)
* Jason Haruska (blog[http://software.haruska.com/])
* Dave Myron (company[http://contentfree.com/])
* Vijay Yellapragada
* Jesse Dp (github profile[http://github.com/jessedp])
* David Alm
* Jeremy Wilkins
* Matt Conway (github profile[http://github.com/wr0ngway])
* Kai Kai
* Michael DelGaudio
* Sai Emrys (blog[http://saizai.com])
* Brendan Lim (github profile[http://github.com/brendanlim])
* Scott Taylor (github profile[http://github.com/smtlaissezfaire])
* Jaap van der Meer (github profile[http://github.com/japetheape])
* Karl Baum (github profile[http://github.com/kbaum])
== LICENSE
(The MIT License)
Copyright (c) 2007, 2008 Mike Mondragon ([email protected]).
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/conf/aliases.yml b/conf/aliases.yml
index 0171c15..1c6bb6f 100644
--- a/conf/aliases.yml
+++ b/conf/aliases.yml
@@ -1,25 +1,26 @@
---
+mm.att.net: mms.att.net
txt.att.net: mms.att.net
cingularme.com: mms.att.net
mmode.com: mms.att.net
mms.mycingular.com: mms.att.net
mobile.mycingular.com: mms.att.net
pics.cingularme.com: mms.att.net
sbcglobal.net: mms.att.net
vtext.com: vzwpix.com
labwig.net: vzwpix.com
orange.fr: orangemms.net
mmsemail.orange.pl: orangemms.net
message.alltel.com: mms.alltel.com
mmsreply.t-mobile.co.uk: tmomail.net
tmo.blackberry.net: tmomail.net
info2go.com: unicel.com
mms.telusmobility.com: msg.telus.com
sasktel.com: sms.sasktel.com
cdma.sasktel.com: sms.sasktel.com
sprintpcs.com: pm.sprint.com
messaging.sprintpcs.com: pm.sprint.com
pixmbl.com: vmpix.com
vmobile.ca: vmpix.com
vmobl.com: vmpix.com
yrmobl.com: vmpix.com
diff --git a/test/fixtures/iphone-image-02.mail b/test/fixtures/iphone-image-02.mail
new file mode 100644
index 0000000..7c96b9d
--- /dev/null
+++ b/test/fixtures/iphone-image-02.mail
@@ -0,0 +1,1638 @@
+Return-Path: <[email protected]>
+Delivered-To: unknown
+Received: from imap.gmail.com (74.125.95.109) by ntk with IMAP4-SSL; 16 Mar
+ 2011 01:55:03 -0000
+Delivered-To: [email protected]
+Received: by 10.147.99.4 with SMTP id b4cs153574yam;
+ Tue, 15 Mar 2011 18:52:52 -0700 (PDT)
+Received: by 10.43.59.140 with SMTP id wo12mr108164icb.408.1300240372117;
+ Tue, 15 Mar 2011 18:52:52 -0700 (PDT)
+Received: from mail-iw0-f175.google.com (mail-iw0-f175.google.com [209.85.214.175])
+ by mx.google.com with ESMTPS id c4si981226ict.30.2011.03.15.18.52.51
+ (version=TLSv1/SSLv3 cipher=OTHER);
+ Tue, 15 Mar 2011 18:52:52 -0700 (PDT)
+Received-SPF: pass (google.com: domain of [email protected] designates 209.85.214.175 as permitted sender) client-ip=209.85.214.175;
+Authentication-Results: mx.google.com; spf=pass (google.com: domain of [email protected] designates 209.85.214.175 as permitted sender) [email protected]; dkim=pass (test mode) [email protected]
+Received: by mail-iw0-f175.google.com with SMTP id 10so1469259iwn.34
+ for <[email protected]>; Tue, 15 Mar 2011 18:52:51 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=gmail.com; s=gamma;
+ h=domainkey-signature:from:content-type:message-id:date:to
+ :content-transfer-encoding:mime-version:x-mailer;
+ bh=sH9AbLB2py4K/neNlkXyFvuvYRnCJsUywUfMCk2F79A=;
+ b=dz/5GCF9ymR+PdzZWyZluwhU2ys+9pY4ZPvjT8ocC+yeuGStPhRJ3Xi8O4jM41JfLv
+ 8OHmrdAzQwMxYOuvpB/0YDmDjZXsHXg/z9lvfbt5b/lJKz7ECJUHIGt+9DEgvHU7G3Gl
+ bDKaI7pfLIngIo/RspLRk5t38g5gkd1CLTs9k=
+DomainKey-Signature: a=rsa-sha1; c=nofws;
+ d=gmail.com; s=gamma;
+ h=from:content-type:message-id:date:to:content-transfer-encoding
+ :mime-version:x-mailer;
+ b=wJ9FT+MHhHPY2k3XJHZx7+G4yBPNXYw2zpwg1LRuTcTLqHnLJIR4joG2F43nUMVBEl
+ 7p52zHdAjFCbAgfiPfCN4y6R1mqYrAjO3KijOIa+9Du8CWGntBitwAx8h857RWPCG4iZ
+ dgSh/HvJDxTzeUBgPrUTt79neiRy/VbZpZYR8=
+Received: by 10.231.29.101 with SMTP id p37mr185060ibc.3.1300240093149;
+ Tue, 15 Mar 2011 18:48:13 -0700 (PDT)
+Received: from [10.68.83.221] ([166.205.140.48])
+ by mx.google.com with ESMTPS id d10sm264711ibb.18.2011.03.15.18.47.56
+ (version=TLSv1/SSLv3 cipher=OTHER);
+ Tue, 15 Mar 2011 18:48:11 -0700 (PDT)
+From: Tommy Tutone <[email protected]>
+Content-Type: multipart/mixed; boundary=Apple-Mail-1--189695060
+Message-Id: <[email protected]>
+Date: Tue, 15 Mar 2011 18:47:31 -0700
+To: [email protected]
+Content-Transfer-Encoding: 7bit
+
+
+--Apple-Mail-1--189695060
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain;
+ charset=us-ascii
+
+Jim's favorite
+
+
+--Apple-Mail-1--189695060
+Content-Disposition: inline;
+ filename=photo.PNG
+Content-Type: image/png;
+ name=photo.PNG
+Content-Transfer-Encoding: base64
+
+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
+SIAECiVAC2ChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiA
+BEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJ
+kAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiA
+BEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4J
+kAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmf
+BEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtg
+rC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmCh
+BJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXA
+CrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqA
+CmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqM
+ABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJ
+FEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiA
+BCqMABXACrtgrC4JkAAJkAAJkAAJFEqACmChBJmfBEiABEiABEiABCqMABXACrtgrC4JkAAJkAAJ
+kAAJFEqACmChBJmfBEiABEiABEiABCqMQJMKqy+rSwIkQAIFE2jTpo3abLPN1JIlS9QHH3ygZs6c
+WXCZLIAESIAEKokALYCVdLVYVxIggaIQ6Nq1q2ratKlq3ry5WmeddYpSJgshARIggUoiQAWwkq4W
+60oCJJCTwEorraQuueQS1b9//9i0Sy21VHCsSRN/R0ijRo3UmmuuqdZee20VlyYohCskQAIkUGEE
+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
+AhaTkgAJkAAJkAAJkEA1EKACWA1XkW0gARIgARIgARIggRQEqACmgMWkJEACJEACJEACJFANBKgA
+VsNVZBtIgARIgARIgARIIAUBKoApYDEpCZAACZAACZAACVQDASqA1XAV2QYSIAESIAESIAESSEGA
+CmAKWExKAiRAAiRAAiRAAtVAgApgNVxFtoEESIAESIAESIAEUhCgApgCFpOSAAmQAAmQAAmQQDUQ
+oAJYDVeRbSABEiABEiABEiCBFASoAKaAxaQkQAIkQAIkQAIkUA0EqABWw1VkG0iABEiABEiABEgg
+BQEqgClgMSkJkAAJkAAJkAAJVAMBKoDVcBXZBhIgARIgARIgARJIQYAKYApYTEoCJEACJEACJEAC
+1UCACmA1XEW2gQRIgARIgARIgARSEKACmAIWk5IACZAACZAACZBANRCgAlgNV5FtIAESIAESIAES
+IIEUBKgApoDFpCRAAiRAAiRAAiRQDQSoAFbDVWQbSIAESIAESIAESCAFASqAKWAxKQmQAAmQAAmQ
+AAlUAwEqgNVwFdkGEiABEiABEiABEkhBgApgClhMSgIkQAIkQAIkQALVQIAKYDVcRbaBBEiABEiA
+BEiABFIQoAKYAhaTkgAJkAAJkAAJkEA1EKACWA1XkW0gARIgARIgARIggRQEqACmgMWkJEACJEAC
+JEACJFANBKgAVsNVZBtIgARIgARIgARIIAUBKoApYDEpCZAACZAACZAACVQDASqA1XAV2QYSIAES
+IAESIAESSEGACmAKWExKAiRAAiRAAiRAAtVAgApgNVxFtoEESIAESIAESIAEUhCgApgCFpOSAAmQ
+AAmQAAmQQDUQoAJYDVeRbSABEiABEiABEiCBFASoAKaAxaQkQAIkQAIkQAIkUA0EqABWw1VkG0iA
+BEiABEiABEggBQEqgClgMSkJkAAJkAAJkAAJVAMBKoDVcBXZBhIgARIgARIgARJIQYAKYApYTEoC
+JEACJEACJEAC1UCACmA1XEW2gQRIgARIgARIgARSEKACmAIWk5IACZAACZAACZBANRCgAlgNV5Ft
+IAESIAESIAESIIEUBKgApoBVDUlXWWUVtdZaa6kmTZpUQ3PYBhIggTogwOdGHUDmKUigjglQCygy
+8GOOOUatuuqqoVIHDRqkJk6cGNonGyuuuKLaZ599VOfOnc1fmzZt1Jw5c9Rhhx2mFi9eLMnyXvbq
+1UuddNJJqkuXLmqNNdZQyy23nClr0aJFpk7jxo1T9913n/q///s/lclkYs+zzDLLqEMPPTR0HHmH
+DRsW2lcpG127dlX77bdfqLpff/21Gjx4cGifu7HsssuqU045RS211FLuIfXOO++o//3vf5H93JGb
+wOabb6522WWXUELc/9dff31on73Rt29fteaaa9q71I8//qgeffTR0D57A7+19dZbz96lRo4cqd5+
++22zb88991SrrbZacPyPP/5QjzzySLDdUFb43Ahf6XK5P8O14hYJFE4Ab33+FYnBxx9/rPWosOy6
+665evvqFl5k0aVI4ce1Ws2bNvHmSXquNN9448+qrr3rL9u386KOPMnvssUfsObVSG8n24IMPxqZP
+Ws/6SnfAAQdE2vPCCy9kbU/z5s0zr732WiQfdrz55puZFi1aZM1fX22thPNus802Xq7rrLNOLFOt
+sEfyTJs2LTY9OIwaNSqSR38IBHm0Ah86Pnfu3OBYJXAstI58bvjfheVyfxZ6fZnff30bMBcCKebF
+T6oAtm7dOoOXS5wUogBuuummmQULFsQVnXX/IYcc4n3hNXQFUFv8Mv/5z3+87N56662Mtgx6uRXz
+3qrmssB3xowZEb7aou7luvzyy2eWLFkSSY8d2irozaOt7ZE82sKXadWqVZC+3BXAAQMGZBYuXBj6
+22qrrYL6F3KP8LkR/y4sl/uzkOtbF3lLeX/WRf0b2jnoA6iveH3IUUcdpdCdWGxBFy+6nLUCmVfR
+DzzwgNpiiy3yylutmRo1aqTAZd999400EV2+6Db87bffIse4IzkBdPdqi3UkQ48ePSL7sOMvf/mL
+wnXxSdz9q604kTzotp89e7avmLLcB9eDpk2bhv7iOKRpAJ8b2Wnx/szOR46W6v6U8rksLgEqgMXl
+mbg0+OS58sQTT6jttttOwd8Evkf5yGWXXabWXnvtUFa84J555hnju9atWzelv/SNXyCUGvgC2rL0
+0kurZ599NvKitNM0tPVbb71VHXnkkZFmw/9Rd5tT+YuQyW/Hyy+/HMnYvXv3yD7swD0cJ3EKoK+s
+IUOGxBXToPbzuZH7cvP+zM2IKSqLAAeB1NP1atu2beTMZ511lvr5558j+9Ps6NmzZyi57mZWO+yw
+g/r0009D+z/55BN1zz33GGUPyqH2XwuOr7766gqDJL766qtgX0Ndufzyy9Xpp58eaf7w4cOp/EWo
+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
+VR7zIQESIIFQE6AADDVh5k8CJNBsAhCA2EPYO0DwYW4gjhB65j2O5r1JA1EIwYi4gQascIbIM25V
+UA8IPhwRcB/v8YIIhBWQgQRIgASiiUDgv4jR1CrWlQRIIKYJGMEFIRZIKCkpCSSaRxwj/jwu8oQE
+SIAEYoQABWCMdCSbQQIk4J8AxZx/NrxDAiQQnwTsmyQTn/zYahIgARIgARIgARKIOgIUgFHXZaww
+CZAACZAACZAACQRHgAIwOH5MTQIkQAIkQAIkQAJRR4ACMOq6jBUmARIgARIgARIggeAIUAAGx4+p
+SYAESIAESIAESCDqCFAARl2XscIkQAIkQAIkQAIkEBwBCsDg+DE1CZAACZAACZAACUQdAQrAqOsy
+VpgESIAESIAESIAEgiNAARgcP6YmARIgARIgARIggagjQAEYdV3GCpMACZAACZAACZBAcAQoAIPj
+x9QkQAIkQAIkQAIkEHUEKACjrstYYRIgARIgARIgARIIjgAFYHD8mJoESIAESIAESIAEoo4ABWDU
+dRkrTAIkQAIkQAIkQALBEaAADI4fU5MACZAACZAACZBA1BGgAIy6LmOFSYAESIAESIAESCA4AhSA
+wfFjahIgARIgARIgARKIOgIUgFHXZawwCZAACZAACZAACQRHgAIwOH5MTQIkQAIkQAIkQAJRR4AC
+MOq6jBUmARIgARIgARIggeAIUAAGx4+pSYAESIAESIAESCDqCFAARl2XscIkQAIkQAIkQAIkEBwB
+CsDg+DE1CZAACZAACZAACUQdAQrAqOsyVpgESIAESIAESIAEgiNAARgcP6YmARIgARIgARIggagj
+QAEYdV3GCpMACZAACZAACZBAcAQoAIPjx9QkQAIkQAIkQAIkEHUEKACjrstYYRIgARIgARIgARII
+jgAFYHD8mJoESIAESIAESIAEoo4ABWDUdRkrTAIkQAIkQAIkQALBEUgMLjlTO51AUlKSfOtb33J6
+NVk/EiABEiABBxFo1aqVg2rDqoSCQILK9GIoMmaeJEACJEACJEACJEACziTAIWBn9gtrRQIkQAIk
+QAIkQAIhI8Ah4JChdUbGPXr0kAsXLsj58+f10Rm1Yi1IgARIgAScSKBFixbSsmVLwXHPnj1OrCLr
+ZBMBCkCbQDo1m9raWsHr7Nmz+ujUerJeJEACJEACkSeQmJgomP+HI0NsE2APx3b/atFXU1MjVVVV
+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
+
+--Apple-Mail-1--189695060
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain;
+ charset=us-ascii
+
+
+
+
+--Apple-Mail-1--189695060--
|
monde/mms2r
|
adf9502d0349a204272a0c549a83c62d918da4ec
|
messaging.sprintpcs.com was dropped from aliases, somehow
|
diff --git a/conf/aliases.yml b/conf/aliases.yml
index 0530ec8..0171c15 100644
--- a/conf/aliases.yml
+++ b/conf/aliases.yml
@@ -1,24 +1,25 @@
---
txt.att.net: mms.att.net
cingularme.com: mms.att.net
mmode.com: mms.att.net
mms.mycingular.com: mms.att.net
mobile.mycingular.com: mms.att.net
pics.cingularme.com: mms.att.net
sbcglobal.net: mms.att.net
vtext.com: vzwpix.com
labwig.net: vzwpix.com
orange.fr: orangemms.net
mmsemail.orange.pl: orangemms.net
message.alltel.com: mms.alltel.com
mmsreply.t-mobile.co.uk: tmomail.net
tmo.blackberry.net: tmomail.net
info2go.com: unicel.com
mms.telusmobility.com: msg.telus.com
sasktel.com: sms.sasktel.com
cdma.sasktel.com: sms.sasktel.com
sprintpcs.com: pm.sprint.com
+messaging.sprintpcs.com: pm.sprint.com
pixmbl.com: vmpix.com
vmobile.ca: vmpix.com
vmobl.com: vmpix.com
yrmobl.com: vmpix.com
|
monde/mms2r
|
4323aab0738ea15fbd5f5ca27b70d7683c08c097
|
The message has 3gp video mark is as coming from a mobile device.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 36dafab..f08c5d0 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,69 +1,70 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
:android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone|201/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
- :iphone: !ruby/regexp /^photo.JPG$/
- :iphone: !ruby/regexp /^photo.PNG$/
+ :iphone: !ruby/regexp /^photo\.JPG$/
+ :iphone: !ruby/regexp /^photo\.PNG$/
+ :video: !ruby/regexp /\.3gp$/
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index 2ab70d1..a61a051 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -93,726 +93,735 @@
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata, and file name.
# Known smart phone types thus far are
#
# * :blackberry
# * :dash
# * :droid
# * :htc
# * :iphone
# * :lge
# * :motorola
# * :pantech
# * :samsung
#
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |type, regex|
return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |type, regex|
return type if @exif.make =~ regex
end
software = config['device_types']['software'] rescue {}
software.each do |type, regex|
return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
end
end
end
file = attachment(['image'])
if file
original_filename = file.original_filename
filenames = config['device_types']['filenames'] rescue {}
filenames.each do |type, regex|
return type if original_filename =~ regex
end
end
+ file = attachment(['video'])
+ if file
+ original_filename = file.original_filename
+ filenames = config['device_types']['filenames'] rescue {}
+ filenames.each do |type, regex|
+ return type if original_filename =~ regex
+ end
+ end
+
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
|
monde/mms2r
|
da353e92321051e259f2eacbc3ea614d59de1391
|
Verizon has a hosting service at labwig.net
|
diff --git a/README.txt b/README.txt
index 67e4500..1a69fbc 100644
--- a/README.txt
+++ b/README.txt
@@ -1,248 +1,248 @@
= mms2r
https://github.com/monde/mms2r
== 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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
-* Verizon: vzwpix.com, vtext.com
+* Verizon: vzwpix.com, vtext.com, labwig.net
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com [http://www.twitpic.com/]
* Simplton [http://simplton.com/]
* fanchatter.com [http://www.fanchatter.com/]
* camura.com [http://www.camura.com/]
* eachday.com [http://www.eachday.com/]
* beenup2.com [http://www.beenup2.com/]
* snapmylife.com [http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2010 by Mike Mondragon (blog[http://plasti.cx/])
MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl (blog[http://railspikes.com/])
* Will Jessup (blog[http://www.willjessup.com/])
* Shane Vitarana (blog[http://www.shanesbrain.net/])
* Layton Wedgeworth (http://www.beenup2.com/)
* Jason Haruska (blog[http://software.haruska.com/])
* Dave Myron (company[http://contentfree.com/])
* Vijay Yellapragada
* Jesse Dp (github profile[http://github.com/jessedp])
* David Alm
* Jeremy Wilkins
* Matt Conway (github profile[http://github.com/wr0ngway])
* Kai Kai
* Michael DelGaudio
* Sai Emrys (blog[http://saizai.com])
* Brendan Lim (github profile[http://github.com/brendanlim])
* Scott Taylor (github profile[http://github.com/smtlaissezfaire])
* Jaap van der Meer (github profile[http://github.com/japetheape])
* Karl Baum (github profile[http://github.com/kbaum])
== LICENSE
(The MIT License)
Copyright (c) 2007, 2008 Mike Mondragon ([email protected]).
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/conf/aliases.yml b/conf/aliases.yml
index abd1a1b..0530ec8 100644
--- a/conf/aliases.yml
+++ b/conf/aliases.yml
@@ -1,23 +1,24 @@
---
txt.att.net: mms.att.net
cingularme.com: mms.att.net
mmode.com: mms.att.net
mms.mycingular.com: mms.att.net
mobile.mycingular.com: mms.att.net
pics.cingularme.com: mms.att.net
sbcglobal.net: mms.att.net
vtext.com: vzwpix.com
+labwig.net: vzwpix.com
orange.fr: orangemms.net
mmsemail.orange.pl: orangemms.net
message.alltel.com: mms.alltel.com
mmsreply.t-mobile.co.uk: tmomail.net
tmo.blackberry.net: tmomail.net
info2go.com: unicel.com
mms.telusmobility.com: msg.telus.com
sasktel.com: sms.sasktel.com
cdma.sasktel.com: sms.sasktel.com
sprintpcs.com: pm.sprint.com
pixmbl.com: vmpix.com
vmobile.ca: vmpix.com
vmobl.com: vmpix.com
yrmobl.com: vmpix.com
|
monde/mms2r
|
0c0ee29f4670fd3ed7d81339f6b298cd4ea6caee
|
sasktel.com is using a cdma subdomain
|
diff --git a/README.txt b/README.txt
index b83933f..67e4500 100644
--- a/README.txt
+++ b/README.txt
@@ -1,248 +1,248 @@
= mms2r
https://github.com/monde/mms2r
== 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.
MMS2R can be used to process any multipart email to conveniently access the
parts the mail is comprised of.
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&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,
cingularme.com, mobile.mycingular.com pics.cingularme.com
* Bell Canada: txt.bell.ca
* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.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 & 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: sasktel.com, sms.sasktel.com
+* SaskTel: sasktel.com, sms.sasktel.com, cdma.sasktel.com
* Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
* T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
* U.S. Cellular: mms.uscc.net
* UAE MMS: mms.ae
* Unicel: unicel.com, info2go.com
(note: mobile number is tucked away in a text/plain part for unicel.com)
* Verizon: vzwpix.com, vtext.com
* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
* Virgin Mobile of Canada: vmobile.ca
* Vodacom: mms.vodacom4me.co.za
Corpus of smart phones known to MMS2R:
* Apple iPhone variants
* Blackberry / Research In Motion variants
* Casio variants
* Droid variants
* Google / Nexus One variants
* HTC variants (T-Mobile Dash, Sprint HERO)
* LG Electronics variants
* Motorola variants
* Pantech variants
* Qualcom variants
* Samsung variants
* Sprint variants
* UTStarCom variants
As Seen On The Internets - sites known to be using MMS2R in some fashion
* twitpic.com [http://www.twitpic.com/]
* Simplton [http://simplton.com/]
* fanchatter.com [http://www.fanchatter.com/]
* camura.com [http://www.camura.com/]
* eachday.com [http://www.eachday.com/]
* beenup2.com [http://www.beenup2.com/]
* snapmylife.com [http://www.snapmylife.com/]
* email the author to be listed here
== FEATURES
* #default_media and #default_text methods return a File that can be used in
attachment_fu or Paperclip
* #process supports blocks for enumerating over the content of the MMS
* #process can be made lazy when :process => :lazy is passed to new
* logging is enabled when :logger => your_logger is passed to new
* an mms instance acts like a Mail object, any methods not defined on the
instance are delegated to it's underlying Mail object
* #device_type? returns a symbol representing a device or smartphone type
Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
Samsung
== BOOKS
MMS2R, Making email useful
http://peepcode.com/products/mms2r-pdf
== SYNOPSIS
begin
require 'mms2r'
rescue LoadError
require 'rubygems'
require 'mms2r'
end
# required for the example
require 'fileutils'
mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
puts "mail has default carrier subject" if mail.subject.empty?
# access the sender's phone number
puts "mail was from phone #{mail.number}"
# most mail are either image or video, default_media will return the largest
# (non-advertising) video or image found
file = mail.default_media
puts "mail had a media: #{file.inspect}" unless file.nil?
# finds the largest (non-advertising) text found
file = mail.default_text
puts "mail had some text: #{file.inspect}" unless file.nil?
# mail.media is a hash that is indexed by mime-type.
# The mime-type key returns an array of filepaths
# to media that were extract from the mail and
# are of that type
mail.media['image/jpeg'].each {|f| puts "#{f}"}
mail.media['text/plain'].each {|f| puts "#{f}"}
# print the text (assumes mail had text)
text = IO.readlines(mail.media['text/plain'].first).join
puts text
# save the image (assumes mail had a jpeg)
FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
puts "plus run anything that Mail provides, e.g. #{mail.to.inspect}"
# check if the mail is from a mobile phone
puts "mail is from a mobile phone #{mail.is_mobile?}"
# determine the device type of the phone
puts "mail is from a mobile phone of type #{mail.device_type?}"
# inspect default media's exif data if exifr gem is installed and default
# media is a jpeg or tiff
puts "mail's default media's exif data is:"
puts mail.exif.inspect
# Block support, process and receive all media types of video.
mail.process do |media_type, files|
# assumes a Clip model that is an AttachmentFu
Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
end
# Another AttachmentFu example, Picture model is an AttachmentFu
picture = Picture.new
picture.title = mail.subject
picture.uploaded_data = mail.default_media
picture.save!
#remove all the media that was put to temporary disk
mail.purge
== REQUIREMENTS
* Mail (mail)
* Nokogiri (nokogiri)
* UUIDTools (uuidtools)
* EXIF Reader (exif)
== INSTALL
* sudo gem install mms2r
== SOURCE
git clone git://github.com/monde/mms2r.git
== AUTHORS
Copyright (c) 2007-2010 by Mike Mondragon (blog[http://plasti.cx/])
MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
== CONTRIBUTORS
* Luke Francl (blog[http://railspikes.com/])
* Will Jessup (blog[http://www.willjessup.com/])
* Shane Vitarana (blog[http://www.shanesbrain.net/])
* Layton Wedgeworth (http://www.beenup2.com/)
* Jason Haruska (blog[http://software.haruska.com/])
* Dave Myron (company[http://contentfree.com/])
* Vijay Yellapragada
* Jesse Dp (github profile[http://github.com/jessedp])
* David Alm
* Jeremy Wilkins
* Matt Conway (github profile[http://github.com/wr0ngway])
* Kai Kai
* Michael DelGaudio
* Sai Emrys (blog[http://saizai.com])
* Brendan Lim (github profile[http://github.com/brendanlim])
* Scott Taylor (github profile[http://github.com/smtlaissezfaire])
* Jaap van der Meer (github profile[http://github.com/japetheape])
* Karl Baum (github profile[http://github.com/kbaum])
== LICENSE
(The MIT License)
Copyright (c) 2007, 2008 Mike Mondragon ([email protected]).
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/conf/aliases.yml b/conf/aliases.yml
index e7d530f..abd1a1b 100644
--- a/conf/aliases.yml
+++ b/conf/aliases.yml
@@ -1,22 +1,23 @@
---
txt.att.net: mms.att.net
cingularme.com: mms.att.net
mmode.com: mms.att.net
mms.mycingular.com: mms.att.net
mobile.mycingular.com: mms.att.net
pics.cingularme.com: mms.att.net
sbcglobal.net: mms.att.net
vtext.com: vzwpix.com
orange.fr: orangemms.net
mmsemail.orange.pl: orangemms.net
message.alltel.com: mms.alltel.com
mmsreply.t-mobile.co.uk: tmomail.net
tmo.blackberry.net: tmomail.net
info2go.com: unicel.com
mms.telusmobility.com: msg.telus.com
sasktel.com: sms.sasktel.com
+cdma.sasktel.com: sms.sasktel.com
sprintpcs.com: pm.sprint.com
pixmbl.com: vmpix.com
vmobile.ca: vmpix.com
vmobl.com: vmpix.com
yrmobl.com: vmpix.com
|
monde/mms2r
|
c6af00539a1ec86129716975c6b3c363befc0f7c
|
Detecting an Android phone.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 78bf269..36dafab 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,68 +1,69 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
makes:
+ :android: !ruby/regexp /Android/i
:apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone|201/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
filenames:
:iphone: !ruby/regexp /^photo.JPG$/
:iphone: !ruby/regexp /^photo.PNG$/
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index af7d767..99ac44e 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -322,544 +322,551 @@ class TestMms2rMedia < Test::Unit::TestCase
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'text/plain' || type == 'text/html'
assert_equal true, File.basename(files.first) == 'message.txt' ||
File.basename(files.first) == 'message.html'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_faux_tiff_iphone_device_type_by_exif
mail = smart_phone_mock('Apple', 'iPhone', nil, nil, jpeg = false)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
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)
assert_equal :dash, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_droid_device_type_by_exif
mail = smart_phone_mock('Motorola', 'Droid')
mms = MMS2R::Media.new(mail)
assert_equal :droid, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_eris_device_type_by_exif
mail = smart_phone_mock('HTC', 'Eris')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_hero_device_type_by_exif
mail = smart_phone_mock('HTC', 'HERO200')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
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|
mail = smart_phone_mock(handset.first, handset.last)
mms = MMS2R::Media.new(mail)
assert_equal true, mms.is_mobile?, "mms with make #{mms.exif.make}, and model #{mms.exif.model}, should be considered a mobile device"
end
end
def test_blackberry_device_type
berries = ['att-blackberry.mail',
'suncom-blackberry.mail',
'tmobile-blackberry-02.mail',
'tmobile-blackberry.mail',
'tmo.blackberry.net-image-01.mail',
'verizon-blackberry.mail',
'verizon-blackberry.mail']
berries.each do |berry|
mms = MMS2R::Media.new(mail(berry))
assert_equal :blackberry, mms.device_type?, "fixture #{berry} was not a blackberrry"
assert_equal true, mms.is_mobile?
end
end
def test_handset_device_type
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal :handset, mms.device_type?
assert_equal true, mms.is_mobile?
end
end
|
monde/mms2r
|
f72ed908f5965f3eb130faf54ae9d178c0776905
|
Mark images name photo.PNG as coming from iphones. Mark images coming from Hipstamatic as coming from apple products.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index 9be7a75..78bf269 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,65 +1,68 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
- models:
- :blackberry: !ruby/regexp /BlackBerry/i
- :dash: !ruby/regexp /T-Mobile Dash/i
- :droid: !ruby/regexp /Droid/i
- :htc: !ruby/regexp /HTC|Eris|HERO200/i
- :iphone: !ruby/regexp /iPhone/i
makes:
- :apple: !ruby/regexp /^Apple$/i
+ :apple: !ruby/regexp /^(Apple|Hipstamatic)$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
+ models:
+ :blackberry: !ruby/regexp /BlackBerry/i
+ :dash: !ruby/regexp /T-Mobile Dash/i
+ :droid: !ruby/regexp /Droid/i
+ :htc: !ruby/regexp /HTC|Eris|HERO200/i
+ :iphone: !ruby/regexp /iPhone|201/i
software:
:blackberry: !ruby/regexp /^Rim Exif/i
+ filenames:
+ :iphone: !ruby/regexp /^photo.JPG$/
+ :iphone: !ruby/regexp /^photo.PNG$/
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index 625d649..2ab70d1 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -28,772 +28,791 @@
# require 'mms2r'
# end
# mail = Mail.read("sample-MMS.file")
# mms = MMS2R::Media.new(mail)
# subject = mms.subject
# number = mms.number
# file = mms.default_media
# mms.purge
#
# == Rails ActionMailer#receive w/ AttachmentFu Example
#
# def receive(mail)
# mms = MMS2R::Media.new(mail)
# picture = Picture.new # picture is an attachemnt_fu model
# picture.title = mms.subject
# picture.uploaded_data = mms.default_media
# picture.save!
# mms.purge
# end
#
# == More Examples
#
# See the README.txt file for more examples
#
# == Built In Configuration
#
# A custom configuration can be created for processing the MMS from carriers
# that are not currently known by MMS2R. In the conf/ directory create a
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
- # Best guess of the mobile device type. Simple heuristics thus far by
- # inspecting mail headers and jpeg/tiff exif metadata.
- # Smart phone types are
- # :iphone :blackberry :dash :droid
+ # Best guess of the mobile device type. Simple heuristics thus far by
+ # inspecting mail headers and jpeg/tiff exif metadata, and file name.
+ # Known smart phone types thus far are
+ #
+ # * :blackberry
+ # * :dash
+ # * :droid
+ # * :htc
+ # * :iphone
+ # * :lge
+ # * :motorola
+ # * :pantech
+ # * :samsung
+ #
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
- models.each do |model, regex|
- return model if @exif.model =~ regex
+ models.each do |type, regex|
+ return type if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
- makes.each do |make, regex|
- return make if @exif.make =~ regex
+ makes.each do |type, regex|
+ return type if @exif.make =~ regex
end
- softwares = config['device_types']['software'] rescue {}
- softwares.each do |software, regex|
- return software if @exif.software =~ regex
+ software = config['device_types']['software'] rescue {}
+ software.each do |type, regex|
+ return type if @exif.software =~ regex
end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
end
end
end
+ file = attachment(['image'])
+ if file
+ original_filename = file.original_filename
+ filenames = config['device_types']['filenames'] rescue {}
+ filenames.each do |type, regex|
+ return type if original_filename =~ regex
+ end
+ end
+
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
diff --git a/test/fixtures/sprint-blackberry-01.mail b/test/fixtures/sprint-blackberry-01.mail
index f0fdad6..0255b13 100644
--- a/test/fixtures/sprint-blackberry-01.mail
+++ b/test/fixtures/sprint-blackberry-01.mail
@@ -1,536 +1,536 @@
Return-Path: <[email protected]>
Delivered-To: unknown
Received: from imap.gmail.com (209.85.225.109) by ntk with IMAP4-SSL; 30 Oct
2011 06:10:03 -0000
-Delivered-To: [email protected]
+Delivered-To: [email protected]
Received: by 10.216.10.213 with SMTP id 63cs4880wev;
Sat, 29 Oct 2011 23:07:11 -0700 (PDT)
Received: by 10.224.189.7 with SMTP id dc7mr8092483qab.90.1319954829144;
Sat, 29 Oct 2011 23:07:09 -0700 (PDT)
Received: from snt0-omc2-s31.snt0.hotmail.com (snt0-omc2-s31.snt0.hotmail.com. [65.55.90.106])
by mx.google.com with ESMTP id 12si8277724vci.60.2011.10.29.23.07.08;
Sat, 29 Oct 2011 23:07:09 -0700 (PDT)
Received-SPF: pass (google.com: domain of [email protected] designates 65.55.90.106 as permitted sender) client-ip=65.55.90.106;
Authentication-Results: mx.google.com; spf=pass (google.com: domain of [email protected] designates 65.55.90.106 as permitted sender) [email protected]
Received: from SNT121-DS23 ([65.55.90.73]) by snt0-omc2-s31.snt0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675);
Sat, 29 Oct 2011 23:07:08 -0700
X-Originating-IP: [10.8.209.166]
X-Originating-Email: [[email protected]]
Message-ID: <[email protected]>
Content-Type: multipart/mixed;
boundary="_99db4215-8df5-4407-9408-286fd34bd3a9_"
MIME-Version: 1.0
From: "tommy tutone " <[email protected]>
-To: "Cellphotobot " <[email protected]>
+To: [email protected]
Date: Sun, 30 Oct 2011 06:07:08 +0000
Subject: Washington-20111030-00056.jpg
X-OriginalArrivalTime: 30 Oct 2011 06:07:08.0134 (UTC) FILETIME=[27BFC060:01CC96CA]
--_99db4215-8df5-4407-9408-286fd34bd3a9_
Content-Type: text/plain; charset="iso-8859-15"
Content-Transfer-Encoding: quoted-printable
Sent on the Sprint=AE Now Network from my BlackBerry=AE
--_99db4215-8df5-4407-9408-286fd34bd3a9_
Content-Description: =?utf-8?B?V2FzaGluZ3Rvbi0yMDExMTAzMC0wMDA1Ni5qcGc=?=
Content-Type: image/jpeg;
name="=?utf-8?B?V2FzaGluZ3Rvbi0yMDExMTAzMC0wMDA1Ni5qcGc=?="
Content-Disposition: attachment;
filename="=?utf-8?B?V2FzaGluZ3Rvbi0yMDExMTAzMC0wMDA1Ni5qcGc=?="
Content-Transfer-Encoding: base64
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
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index 5527789..af7d767 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -260,592 +260,606 @@ class TestMms2rMedia < Test::Unit::TestCase
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'text/plain' || type == 'text/html'
assert_equal true, File.basename(files.first) == 'message.txt' ||
File.basename(files.first) == 'message.html'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_faux_tiff_iphone_device_type_by_exif
- mail = smart_phone_mock('Apple', 'iPhone', nil, jpeg = false)
+ mail = smart_phone_mock('Apple', 'iPhone', nil, nil, jpeg = false)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
end
+ 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)
assert_equal :dash, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_droid_device_type_by_exif
mail = smart_phone_mock('Motorola', 'Droid')
mms = MMS2R::Media.new(mail)
assert_equal :droid, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_eris_device_type_by_exif
mail = smart_phone_mock('HTC', 'Eris')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_hero_device_type_by_exif
mail = smart_phone_mock('HTC', 'HERO200')
mms = MMS2R::Media.new(mail)
assert_equal :htc, 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|
mail = smart_phone_mock(handset.first, handset.last)
mms = MMS2R::Media.new(mail)
assert_equal true, mms.is_mobile?, "mms with make #{mms.exif.make}, and model #{mms.exif.model}, should be considered a mobile device"
end
end
def test_blackberry_device_type
berries = ['att-blackberry.mail',
'suncom-blackberry.mail',
'tmobile-blackberry-02.mail',
'tmobile-blackberry.mail',
'tmo.blackberry.net-image-01.mail',
'verizon-blackberry.mail',
'verizon-blackberry.mail']
berries.each do |berry|
mms = MMS2R::Media.new(mail(berry))
assert_equal :blackberry, mms.device_type?, "fixture #{berry} was not a blackberrry"
assert_equal true, mms.is_mobile?
end
end
def test_handset_device_type
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal :handset, mms.device_type?
assert_equal true, mms.is_mobile?
end
end
|
monde/mms2r
|
88a105086a494a1a8a73a53b77c6446a36ae6428
|
Also test correct device type is returned.
|
diff --git a/test/test_sprint.rb b/test/test_sprint.rb
index 8d3d535..bd9737b 100644
--- a/test/test_sprint.rb
+++ b/test/test_sprint.rb
@@ -1,17 +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
|
monde/mms2r
|
98b1e3e60bbae623a4ff85303344646af29b182e
|
Identify if the image is from a mobile device by its software listed in the exif information.
|
diff --git a/conf/mms2r_media.yml b/conf/mms2r_media.yml
index a4341d7..9be7a75 100644
--- a/conf/mms2r_media.yml
+++ b/conf/mms2r_media.yml
@@ -1,63 +1,65 @@
---
ignore:
text/plain:
- !ruby/regexp /^\(no subject\)$/i
- !ruby/regexp /\ASent via BlackBerry (from|by) .*$/im
- !ruby/regexp /\ASent from my Verizon Wireless BlackBerry$/im
- !ruby/regexp /\ASent from (my|your) iPhone.?$/im
- !ruby/regexp /\ASent on the Sprint.* Now Network.*$/im
multipart/mixed:
- !ruby/regexp "/^Attachment: /i"
transform:
text/plain:
- - !ruby/regexp /\A(.*?)Sent via BlackBerry (from|by) .*$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from my Verizon Wireless BlackBerry$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent from (my|your) iPhone.?$/im
- "\\1"
- - !ruby/regexp /\A(.*?)\s+image\/jpeg$/im
- "\\1"
- - !ruby/regexp /\A(.*?)Sent on the Sprint.* Now Network.*$/im
- "\\1"
device_types:
headers:
x-mailer:
:iphone: !ruby/regexp /iPhone Mail/i
:blackberry: !ruby/regexp /Palm webOS/i
mime-version:
:iphone: !ruby/regexp /iPhone Mail/i
x-rim-org-msg-ref-id:
:blackberry: !ruby/regexp /.+/
# TODO do something about the assortment of camera models that have
# been seen:
# 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
# Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
# Motorola Phone, Omni_vision-9650, Pre,
# Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
# SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
#
# NOTE: These model strings are stored in the exif model header of an image file
# created and sent by the device, the regex is used by mms2r to detect the
# model string
models:
:blackberry: !ruby/regexp /BlackBerry/i
:dash: !ruby/regexp /T-Mobile Dash/i
:droid: !ruby/regexp /Droid/i
:htc: !ruby/regexp /HTC|Eris|HERO200/i
:iphone: !ruby/regexp /iPhone/i
makes:
:apple: !ruby/regexp /^Apple$/i
:casio: !ruby/regexp /^CASIO$/i
:dash: !ruby/regexp /T-Mobile Dash/i
:google: !ruby/regexp /^google$/i
:htc: !ruby/regexp /^HTC/i
:lge: !ruby/regexp /^(LG|CX87BL05)/i
:motorola: !ruby/regexp /^Motorola/i
:pantech: !ruby/regexp /^PANTECH$/i
:qualcomm: !ruby/regexp /^MSM6/i
:research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
:samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
:seoul_electronics: !ruby/regexp /^ISUS0/i
:sprint: !ruby/regexp /^Sprint$/i
:utstarcom: !ruby/regexp /^T1A_UC1.88$/i
+ software:
+ :blackberry: !ruby/regexp /^Rim Exif/i
diff --git a/dev_tools/anonymizer.rb b/dev_tools/anonymizer.rb
index ba6b8b6..82e00fa 100755
--- a/dev_tools/anonymizer.rb
+++ b/dev_tools/anonymizer.rb
@@ -1,20 +1,18 @@
#! /usr/bin/env ruby
if ARGV.size != 3
puts "Usage: anonymizer.rb message_file phone_number email_address"
exit(1)
end
message_file = ARGV[0]
phone_number = ARGV[1]
email_address = ARGV[2]
message = File.read(message_file)
message.gsub!(phone_number, '2068675309')
message.gsub!(email_address, '[email protected]')
out = File.open(message_file, "wb")
out.puts message
out.close
-
-
diff --git a/lib/mms2r/media.rb b/lib/mms2r/media.rb
index 4a15d7c..625d649 100644
--- a/lib/mms2r/media.rb
+++ b/lib/mms2r/media.rb
@@ -56,740 +56,744 @@
# YAML file named by combining the domain name of the MMS sender plus a .yml
# extension. For instance the configuration of senders from AT&T's cellular
# service with a Sender pattern of [email protected] have a configuration
# named conf/mms.att.net.yml
#
# The YAML configuration contains a Hash with instructions for determining what
# is content generated by the user and what is content inserted by the carrier.
#
# The root hash itself has two hashes under the keys 'ignore' and 'transform',
# and an array under the 'number' key.
# Each hash is itself keyed by mime-type. The value pointed to by the mime-type
# key is an array. The ignore arrays are first inspected as regular expressions
# else are used as a equality for a string filename. Ignores # work by filename
# for the multi-part of the MMS that is being inspected. The array pointed to
# by the 'number' key represents an alternate mail header where the sender's
# number can be found with a regular expression and replacement value for a
# gsub.
#
# The transform arrays are themselves an array of two element arrays. The elements
# are regexp parameters for gsub.
#
# Ignore instructions are honored first then transform instructions. In the sample,
# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
# filename comparison. The transform has a match and a replacement, see the gsub
# documentation for more information about match and replace.
#
# --
# ignore:
# image/jpeg:
# - /^masthead.jpg$/i
# image/gif:
# - spacer.gif
# text/plain:
# - /\AThis message was sent using PIX-FLIX Messaging service from .*/m
# transform:
# text/plain:
# - - /\A(.+?)\s+This message was sent using PIX-FLIX Messaging .*/m
# - "\1"
# number:
# - from
# - /^([^\s]+)\s.*/
# - "\1"
#
# Carriers often provide their services under many different domain names.
# The conf/aliases.yml is a YAML file with a hash that maps alternative or
# legacy carrier names to the most common name of their service. For example
# in terms of MMS2R txt.att.net is an alias for mms.att.net. Therefore when
# an MMS with a Sender of txt.att.net is processed MMS2R will use the
# mms.att.net configuration to process the message.
module MMS2R
class MMS2R::Media
# Pass off everything we don't do to the Mail object
# TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
def method_missing method, *args, &block
mail.send method, *args, &block
end
##
# Mail object that the media files were derived from.
attr_reader :mail
##
# media returns the hash of media. The media hash is keyed by mime-type
# such as 'text/plain' and the value mapped to the key is an array of
# media that are of that type.
attr_reader :media
##
# Carrier is the domain name of the carrier. If the carrier is not known
# the carrier will be set to 'mms2r.media'
attr_reader :carrier
##
# Base working dir where media for a unique mms message are dropped
attr_reader :media_dir
##
# Determine if return-path or from is going to be used to desiginate the
# origin carrier. If the domain in the From header is listed in
# conf/from.yaml then that is the carrier domain. Else if there is a
# Return-Path header its address's domain is the carrier doamin, else
# use From header's address domain.
def self.domain(mail)
return_path = case
when mail.return_path
mail.return_path ? mail.return_path.split('@').last : ''
else
''
end
from_domain = case
when mail.from && mail.from.first
mail.from.first.split('@').last
else
''
end
f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
from = YAML::load_file(f)
ret = case
when from.include?(from_domain)
from_domain
when return_path.present?
return_path
else
from_domain
end
ret
end
##
# Initialize a new MMS2R::Media comprised of a mail.
#
# Specify options to initialize with:
# :logger => some_logger for logging
# :process => :lazy, for non-greedy processing upon initialization
#
# #process will have to be called explicitly if the lazy process option
# is chosen.
def initialize(mail, opts={})
@mail = mail
@logger = opts[:logger]
log("#{self.class} created", :info)
@carrier = self.class.domain(mail)
@dir_count = 0
sha = Digest::SHA1.hexdigest("#{@carrier}-#{Time.now.to_i}-#{rand}")
@media_dir = File.expand_path(
File.join(self.tmp_dir(),
"#{self.safe_message_id(@mail.message_id)}_#{sha}"))
@media = {}
@was_processed = false
@number = nil
@subject = nil
@body = nil
@exif = nil
@default_media = nil
@default_text = nil
@default_html = nil
f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
@aliases = YAML::load_file(f)
conf = "#{@aliases[@carrier] || @carrier}.yml"
f = File.expand_path(File.join(self.conf_dir(), conf))
c = File.exist?(f) ? YAML::load_file(f) : {}
@config = self.class.initialize_config(c)
processor_module = MMS2R::CARRIERS[@carrier]
extend processor_module if processor_module
lazy = (opts[:process] == :lazy) rescue false
self.process() unless lazy
end
##
# Get the phone number associated with this MMS if it exists. The value
# returned is simplistic, it is just the user name of the from address
# before the @ symbol. Validation of the number is left to you. Most
# carriers are using the real phone number as the username.
def number
unless @number
params = config['number']
if params && params.any? && (header = mail.header[params[0]])
@number = header.to_s.gsub(params[1], params[2])
end
if @number.nil? || @number.blank?
@number = mail.from.first.split(/@|\//).first rescue ""
end
end
@number
end
##
# Return the Subject for this message, returns "" for default carrier
# subject such as 'Multimedia message' for ATT&T carrier.
def subject
unless @subject
subject = mail.subject.strip rescue ""
ignores = config['ignore']['text/plain']
if ignores && ignores.detect{|s| s == subject}
@subject = ""
else
@subject = transform_text('text/plain', subject).last
end
end
@subject
end
# Convenience method that returns a string including all the text of the
# default text/plain file found. If the plain text is blank then it returns
# stripped down version of the title and body of default text/html. Returns
# empty string if no body text is found.
def body
text_file = default_text
@body = text_file ? IO.readlines(text_file.path).join.strip : ""
if @body.blank? && html_file = default_html
html = Nokogiri::HTML(IO.read(html_file.path))
@body = (html.xpath("//head/title").map(&:text) + html.xpath("//body/*").map(&:text)).join(" ")
end
@body
end
# Returns a File with the most likely candidate for the user-submitted
# media. Given that most MMS messages only have one file attached, this
# method will try to return that file. Singleton methods are added to
# the File object so it can be used in place of a CGI upload (local_path,
# original_filename, size, and content_type) such as in conjunction with
# AttachementFu. The largest file found in terms of bytes is returned.
#
# Returns nil if there are not any video or image Files found.
def default_media
@default_media ||= attachment(['video', 'image', 'application', 'text'])
end
# Returns a File with the most likely candidate that is text, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_text
@default_text ||= attachment(['text/plain'])
end
# Returns a File with the most likely candidate that is html, or nil
# otherwise. It also adds singleton methods to the File object so it can be
# used in place of a CGI upload (local_path, original_filename, size, and
# content_type) such as in conjunction with AttachmentFu. The largest file
# found in terms of bytes is returned.
#
# Returns nil if there are not any text Files found
def default_html
@default_html ||= attachment(['text/html'])
end
##
# process is a template method and collects all the media in a MMS.
# Override helper methods to this template to clean out advertising and/or
# ignore media that are advertising. This method should not be overridden
# unless there is an extreme special case in processing the media of a MMS
# (like Sprint)
#
# Helper methods for the process template:
# * ignore_media? -- true if the media contained in a part should be ignored.
# * process_media -- retrieves media to temporary file, returns path to file.
# * transform_text -- called by process_media, strips out advertising.
# * temp_file -- creates a temporary filepath based on information from the part.
#
# Block support:
# Call process() with a block to automatically iterate through media.
# For example, to process and receive only media of video type:
# mms.process do |media_type, file|
# results << file if media_type =~ /video/
# end
#
# note: purge must be explicitly called to remove the media files
# mms2r extracts from an mms message.
def process() # :yields: media_type, file
unless @was_processed
log("#{self.class} processing", :info)
parts = mail.multipart? ? mail.parts : [mail]
# Double check for multipart/related, if it exists replace it with its
# children parts. Do this twice as multipart/alternative can have
# children and we want to fold everything down
for i in 1..2
flat = []
parts.each do |p|
if p.multipart?
p.parts.each {|mp| flat << mp }
else
flat << p
end
end
parts = flat.dup
end
# get to work
parts.each do |p|
t = p.part_type?
unless ignore_media?(t,p)
t,f = process_media(p)
add_file(t,f) unless t.nil? || f.nil?
end
end
@was_processed = true
end
# when process acts upon a block
if block_given?
media.each do |k, v|
yield(k, v)
end
end
end
##
# Helper for process template method to determine if media contained in a
# part should be ignored. Producers should override this method to return
# true for media such as images that are advertising, carrier logos, etc.
# See the ignore section in the discussion of the built-in configuration.
def ignore_media?(type, part)
ignores = config['ignore'][type] || []
ignore = ignores.detect{ |test| filename?(part) == test}
ignore ||= ignores.detect{ |test| filename?(part) =~ test if test.is_a?(Regexp) }
ignore ||= ignores.detect{ |test| part.body.decoded.strip =~ test if test.is_a?(Regexp) }
ignore ||= (part.body.decoded.strip.size == 0 ? true : nil)
ignore.nil? ? false : true
end
##
# Helper for process template method to decode the part based on its type
# and write its content to a temporary file. Returns path to temporary
# file that holds the content. Parts with a main type of text will have
# their contents transformed with a call to transform_text
#
# Producers should only override this method if the parts of the MMS need
# special treatment besides what is expected for a normal mime part (like
# Sprint).
#
# Returns a tuple of content type, file path
def process_media(part)
# Mail body auto-magically decodes quoted
# printable for text/html type.
file = temp_file(part)
if part.part_type? =~ /^text\// ||
part.part_type? == 'application/smil'
type, content = transform_text_part(part)
mode = 'wb'
else
if part.part_type? == 'application/octet-stream'
type = type_from_filename(filename?(part))
else
type = part.part_type?
end
content = part.body.decoded
mode = 'wb' # open with binary bit for Windows for non text
end
return type, nil if content.nil? || content.empty?
log("#{self.class} writing file #{file}", :info)
File.open(file, mode){ |f| f.write(content) }
return type, file
end
##
# Helper for process_media template method to transform text.
# See the transform section in the discussion of the built-in
# configuration.
def transform_text(type, text, original_encoding = 'ISO-8859-1')
return type, text if !config['transform'] || !(transforms = config['transform'][type])
if RUBY_VERSION < "1.9"
#convert to UTF-8
begin
c = Iconv.new('UTF-8', original_encoding )
utf_t = c.iconv(text)
rescue Exception => e
utf_t = text
end
else
utf_t = text.encoding == "ASCII-8BIT" ? text.force_encoding("ISO-8859-1").encode("UTF-8") : text
end
transforms.each do |transform|
next unless transform.size == 2
p = transform.first
r = transform.last
utf_t = utf_t.gsub(p, r) rescue utf_t
end
return type, utf_t
end
##
# Helper for process_media template method to transform text.
def transform_text_part(part)
type = part.part_type?
text = part.body.decoded.strip
transform_text(type, text)
end
##
# Helper for process template method to name a temporary filepath based on
# information in the part. This version attempts to honor the name of the
# media as labeled in the part header and creates a unique temporary
# directory for writing the file so filename collision does not occur.
# Consumers of this method expect the directory structure to the file
# exists, if the method is overridden it is mandatory that this behavior is
# retained.
def temp_file(part)
file_name = filename?(part)
File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
end
##
# Purges the unique MMS2R::Media.media_dir directory created
# for this producer and all of the media that it contains.
def purge()
log("#{self.class} purging #{@media_dir} and all its contents", :info)
FileUtils.rm_rf(@media_dir)
end
##
# Helper to add a file to the media hash.
def add_file(type, file)
media[type] = [] unless media[type]
media[type] << file
end
##
# Helper to temp_file to create a unique temporary directory that is a
# child of tmp_dir This version is based on the message_id of the mail.
def msg_tmp_dir()
@dir_count += 1
dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
FileUtils.mkdir_p(dir)
dir
end
##
# returns a filename declared for a part, or a default if its not defined
def filename?(part)
name = part.filename
if (name.nil? || name.empty?)
if part.content_id && (matched = /^<(.+)>$/.match(part.content_id))
name = matched[1]
else
name = "#{Time.now.to_f}.#{self.default_ext(part.part_type?)}"
end
end
# FIXME FWIW, janky look for dot extension 1 to 4 chars long
name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
# handle excessively large filenames
if name.size > 255
ext = File.extname(name)
base = File.basename(name, ext)
name = "#{base[0, 255 - ext.size]}#{ext}"
end
name
end
def aliases
@aliases
end
##
# Best guess of the mobile device type. Simple heuristics thus far by
# inspecting mail headers and jpeg/tiff exif metadata.
# Smart phone types are
# :iphone :blackberry :dash :droid
# If the message is from a carrier known to MMS2R, and not a smart phone
# its type is returned as :handset
# Otherwise device type is :unknown
def device_type?
file = attachment(['image'])
if file
original = file.original_filename
@exif = case original
when /\.je?pg$/i
EXIFR::JPEG.new(file)
when /\.tiff?$/i
EXIFR::TIFF.new(file)
end
if @exif
models = config['device_types']['models'] rescue {}
models.each do |model, regex|
return model if @exif.model =~ regex
end
makes = config['device_types']['makes'] rescue {}
makes.each do |make, regex|
return make if @exif.make =~ regex
end
+ softwares = config['device_types']['software'] rescue {}
+ softwares.each do |software, regex|
+ return software if @exif.software =~ regex
+ end
end
end
headers = config['device_types']['headers'] rescue {}
headers.keys.each do |header|
if mail.header[header.downcase]
# headers[header] refers to a hash of smart phone types with regex values
# that if they match, the header signals the type should be returned
headers[header].each do |type, regex|
return type if mail.header[header.downcase].decoded =~ regex
end
end
end
return :handset if File.exist?( File.expand_path(
File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
) )
:unknown
end
##
# exif object on default image from exifr gem
def exif
device_type? unless @exif
@exif
end
##
# The source of the MMS was some sort of mobile or smart phone
def is_mobile?
self.device_type? != :unknown
end
##
# Get the temporary directory where media files are written to.
def self.tmp_dir
@@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
end
##
# Set the temporary directory where media files are written to.
def self.tmp_dir=(d)
@@tmp_dir=d
end
##
# Get the directory where conf files are stored.
def self.conf_dir
@@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
end
##
# Set the directory where conf files are stored.
def self.conf_dir=(d)
@@conf_dir=d
end
##
# Helper to create a safe directory path element based on the mail message
# id.
def self.safe_message_id(mid)
mid.nil? ? "#{Time.now.to_i}" : mid.gsub(/\$|<|>|@|\./, "")
end
##
# Returns a default file extension based on a content type
def self.default_ext(content_type)
if MMS2R::EXT[content_type]
MMS2R::EXT[content_type]
elsif content_type
content_type.split('/').last
end
end
##
# Joins the generic mms2r configuration with the carrier specific
# configuration.
def self.initialize_config(c)
f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
conf = YAML::load_file(f)
conf['ignore'] ||= {} unless conf['ignore']
conf['transform'] = {} unless conf['transform']
conf['number'] = [] unless conf['number']
return conf unless c
kinds = ['ignore', 'transform']
kinds.each do |kind|
if c[kind]
c[kind].each do |type,array|
conf[kind][type] = [] unless conf[kind][type]
conf[kind][type] += array
end
end
end
conf['number'] = c['number'] if c['number']
conf
end
def log(message, level = :info)
@logger.send(level, message) unless @logger.nil?
end
##
# convenience accessor for self.class.conf_dir
def conf_dir
self.class.conf_dir
end
##
# convenience accessor for self.class.conf_dir
def tmp_dir
self.class.tmp_dir
end
##
# convenience accessor for self.class.default_ext
def default_ext(type)
self.class.default_ext(type)
end
##
# convenience accessor for self.class.safe_message_id
def safe_message_id(message_id)
self.class.safe_message_id(message_id)
end
##
# convenience accessor for self.class.initialize_confg
def initialize_config(config)
self.class.initialize_config(config)
end
private
##
# accessor for the config
def config
@config
end
##
# guess content type from filename
def type_from_filename(filename)
ext = filename.split('.').last
ent = MMS2R::EXT.detect{|k,v| v == ext}
ent.nil? ? nil : ent.first
end
##
# used by #default_media and #text to return the biggest attachment type
# listed in the types array
def attachment(types)
# get all the files that are of the major types passed in
files = []
types.each do |type|
media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
files += media[key]
end
end
return nil if files.empty?
# set temp holders
file = nil # explicitly declare the file and size
size = 0
mime_type = nil
#get the largest file
files.each do |path|
if File.size(path) > size
size = File.size(path)
file = File.new(path)
media.each do |type,_files|
mime_type = type if _files.detect{ |_path| _path == path }
end
end
end
return nil if file.nil?
# These singleton methods implement the interface necessary to be used
# as a drop-in replacement for files uploaded with CGI.rb.
# This helps if you want to use the files with, for example,
# attachment_fu.
def file.local_path
self.path
end
def file.original_filename
File.basename(self.path)
end
def file.size
File.size(self.path)
end
# this one is kind of confusing because it needs a closure.
class << file
self
end.send(:define_method, :content_type) { mime_type }
file
end
end
end
diff --git a/test/fixtures/sprint-blackberry-01.mail b/test/fixtures/sprint-blackberry-01.mail
new file mode 100644
index 0000000..f0fdad6
--- /dev/null
+++ b/test/fixtures/sprint-blackberry-01.mail
@@ -0,0 +1,1644 @@
+Return-Path: <[email protected]>
+Delivered-To: unknown
+Received: from imap.gmail.com (209.85.225.109) by ntk with IMAP4-SSL; 30 Oct
+ 2011 06:10:03 -0000
+Delivered-To: [email protected]
+Received: by 10.216.10.213 with SMTP id 63cs4880wev;
+ Sat, 29 Oct 2011 23:07:11 -0700 (PDT)
+Received: by 10.224.189.7 with SMTP id dc7mr8092483qab.90.1319954829144;
+ Sat, 29 Oct 2011 23:07:09 -0700 (PDT)
+Received: from snt0-omc2-s31.snt0.hotmail.com (snt0-omc2-s31.snt0.hotmail.com. [65.55.90.106])
+ by mx.google.com with ESMTP id 12si8277724vci.60.2011.10.29.23.07.08;
+ Sat, 29 Oct 2011 23:07:09 -0700 (PDT)
+Received-SPF: pass (google.com: domain of [email protected] designates 65.55.90.106 as permitted sender) client-ip=65.55.90.106;
+Authentication-Results: mx.google.com; spf=pass (google.com: domain of [email protected] designates 65.55.90.106 as permitted sender) [email protected]
+Received: from SNT121-DS23 ([65.55.90.73]) by snt0-omc2-s31.snt0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675);
+ Sat, 29 Oct 2011 23:07:08 -0700
+X-Originating-IP: [10.8.209.166]
+X-Originating-Email: [[email protected]]
+Message-ID: <[email protected]>
+Content-Type: multipart/mixed;
+ boundary="_99db4215-8df5-4407-9408-286fd34bd3a9_"
+MIME-Version: 1.0
+From: "tommy tutone " <[email protected]>
+To: "Cellphotobot " <[email protected]>
+Date: Sun, 30 Oct 2011 06:07:08 +0000
+Subject: Washington-20111030-00056.jpg
+X-OriginalArrivalTime: 30 Oct 2011 06:07:08.0134 (UTC) FILETIME=[27BFC060:01CC96CA]
+
+--_99db4215-8df5-4407-9408-286fd34bd3a9_
+Content-Type: text/plain; charset="iso-8859-15"
+Content-Transfer-Encoding: quoted-printable
+
+Sent on the Sprint=AE Now Network from my BlackBerry=AE
+
+
+--_99db4215-8df5-4407-9408-286fd34bd3a9_
+Content-Description: =?utf-8?B?V2FzaGluZ3Rvbi0yMDExMTAzMC0wMDA1Ni5qcGc=?=
+Content-Type: image/jpeg;
+ name="=?utf-8?B?V2FzaGluZ3Rvbi0yMDExMTAzMC0wMDA1Ni5qcGc=?="
+Content-Disposition: attachment;
+ filename="=?utf-8?B?V2FzaGluZ3Rvbi0yMDExMTAzMC0wMDA1Ni5qcGc=?="
+Content-Transfer-Encoding: base64
+
+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
+yQeM0mWnroOzgkUiup//2Q==
+
+--_99db4215-8df5-4407-9408-286fd34bd3a9_--
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 22982e2..3e0e1cc 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,102 +1,102 @@
# do it like rake http://ozmm.org/posts/do_it_like_rake.html
%W{ test/unit set net/http net/https pp tempfile mocha }.each do |g|
begin
require g
rescue LoadError
require 'rubygems'
require g
end
end
# NOTE when we upgrade to test-unit 2.x.x or greater we'll not need redgreen,
# it's baked into test-unit
begin require 'redgreen'; rescue LoadError; end
require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'mms2r')
module MMS2R
module TestHelper
def assert_file_size(file, size)
assert_not_nil(file, "file was nil")
assert(File::exist?(file), "file #{file} does not exist")
assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
end
def fixture(file)
File.join(File.expand_path(File.dirname(__FILE__)), "fixtures", file)
end
def fixture_data(name)
open(fixture(name)).read
end
def mail_fixture(file)
fixture(file)
end
def mail(name)
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 => ['[email protected]'],
:return_path => '<[email protected]>',
:message_id => 'abcd0123',
:multipart? => true,
:header => {})
part = stub('part',
:part_type? => "image/#{jpeg ? 'jpeg' : 'tiff'}",
:body => Mail::Body.new('abc'),
:multipart? => false,
: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
EXIFR::TIFF.expects(:new).at_least_once.returns(exif)
end
mail
end
end
end
class Hash
def except(*keys)
rejected = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
reject { |key,| rejected.include?(key) }
end
def except!(*keys)
replace(except(*keys))
end
end
# monkey patch Net::HTTP so un caged requests don't go over the wire
module Net #:nodoc:
class HTTP #:nodoc:
alias :old_net_http_request :request
alias :old_net_http_connect :connect
def request(req, body = nil, &block)
prot = use_ssl ? "https" : "http"
uri_cls = use_ssl ? URI::HTTPS : URI::HTTP
query = req.path.split('?',2)
opts = {:host => self.address,
:port => self.port, :path => query[0]}
opts[:query] = query[1] if query[1]
uri = uri_cls.build(opts)
raise ArgumentError.new("#{req.method} method to #{uri} not being handled in testing")
end
def connect
raise ArgumentError.new("connect not being handled in testing")
end
end
end
diff --git a/test/test_mms2r_media.rb b/test/test_mms2r_media.rb
index efb9081..5527789 100644
--- a/test/test_mms2r_media.rb
+++ b/test/test_mms2r_media.rb
@@ -260,585 +260,592 @@ class TestMms2rMedia < Test::Unit::TestCase
mms = MMS2R::Media.new(mail)
assert_equal '', mms.subject
end
def test_subject_with_subject_ignored
s = 'hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns({'ignore' => {'text/plain' => [s]}})
assert_equal '', mms.subject
end
def test_subject_with_subject_transformed
s = 'Default Subject: hello world'
mail = stub_mail
mail.stubs(:subject).returns(s)
mms = MMS2R::Media.new(mail)
mms.stubs(:config).returns(
{ 'ignore' => {},
'transform' => {'text/plain' => [[/Default Subject: (.+)/, '\1']]}})
assert_equal 'hello world', mms.subject
end
def test_attachment_should_return_nil_if_files_for_type_are_not_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({})
assert_nil mms.send(:attachment, ['text'])
end
def test_attachment_should_return_nil_if_empty_files_are_found
mms = MMS2R::Media.new stub_mail
mms.stubs(:media).returns({'text/plain' => [Tempfile.new('test')]})
assert_nil mms.send(:attachment, ['text'])
end
def test_type_from_filename
mms = MMS2R::Media.new stub_mail
assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
end
def test_type_from_filename_should_be_nil
mms = MMS2R::Media.new stub_mail
assert_nil mms.send(:type_from_filename, "example.example")
end
def test_attachment_should_return_duck_typed_file
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
size = File.size(temp_text_file("hello world"))
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
duck_file = mms.send(:attachment, ['text'])
assert_not_nil duck_file
assert_equal true, File::exist?(duck_file)
assert_equal true, File::exist?(temp_big)
assert_equal temp_big, duck_file.local_path
assert_equal File.basename(temp_big), duck_file.original_filename
assert_equal size, duck_file.size
assert_equal 'text/plain', duck_file.content_type
end
def test_empty_body
mms = MMS2R::Media.new stub_mail
mms.stubs(:default_text).returns(nil)
assert_equal "", mms.body
end
def test_body
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
mms.stubs(:default_text).returns(File.new(temp_big))
body = mms.body
assert_equal "hello world", body
end
def test_body_when_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
mms.stubs(:default_html).returns(File.new(temp_big))
assert_equal "hello world teapot", mms.body
end
def test_default_text
mms = MMS2R::Media.new stub_mail
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'text/plain' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_text.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_text.local_path
end
def test_default_html
mms = MMS2R::Media.new stub_mail(:body => '')
temp_big = temp_text_file("<html><head><title>hello</title></head><body><p>world</p><p>teapot</p><body></html>")
temp_small = temp_text_file("<html><head><title>hello</title></head><body>world<body></html>")
mms.stubs(:media).returns({'text/html' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_html.local_path
# second time through shouldn't setup the @default_text by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_html.local_path
end
def test_default_media
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big = temp_text_file("hello world")
temp_small = temp_text_file("hello")
mms.stubs(:media).returns({'image/jpeg' => [temp_small, temp_big]})
assert_equal temp_big, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big, mms.default_media.local_path
end
def test_default_media_treats_image_and_video_equally
mms = MMS2R::Media.new stub_mail
#it doesn't matter that these are text files, we just need say they are images
temp_big_image = temp_text_file("hello world")
temp_small_image = temp_text_file("hello")
temp_big_video = temp_text_file("hello world again")
temp_small_video = temp_text_file("hello again")
mms.stubs(:media).returns({'image/jpeg' => [temp_small_image, temp_big_image],
'video/mpeg' => [temp_small_video, temp_big_video],
})
assert_equal temp_big_video, mms.default_media.local_path
# second time through shouldn't setup the @default_media by calling attachment
mms.expects(:attachment).never
assert_equal temp_big_video, mms.default_media.local_path
end
#def test_default_media_treats_gif_and_jpg_equally
# #it doesn't matter that these are text files, we just need say they are images
# temp_big = temp_text_file("hello world")
# temp_small = temp_text_file("hello")
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/jpeg' => [temp_big], 'image/gif' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
# mms = MMS2R::Media.new stub_mail
# mms.stubs(:media).returns({'image/gif' => [temp_big], 'image/jpg' => [temp_small]})
# assert_equal temp_big, mms.default_media.local_path
#end
def test_purge
mms = MMS2R::Media.new stub_mail
mms.purge
assert_equal false, File.exist?(mms.media_dir)
end
def test_ignore_media_by_filename_equality
name = 'foo.txt'
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [name]}})
# type is not in the ingore
part = stub(:body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and filename are in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal true, mms.ignore_media?(type, part)
# type but not file name are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_filename
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'foo.txt', mms.filename?(part)
end
def test_long_filename
name = 'x' * 300 + '.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal 'x' * 251 + '.txt', mms.filename?(part)
end
def test_filename_when_file_extension_missing_part
name = 'foo'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.txt', mms.filename?(part)
name = 'foo.janky'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain')
assert_equal 'foo.janky.txt', mms.filename?(part)
end
def test_ignore_media_by_filename_regexp
name = 'foo.txt'
regexp = /foo\.txt/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => [regexp, 'nil.txt']}})
# type is not in the ingore
part = stub(:filename => name, :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the filename are in the ingore
part = stub(:filename => name)
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for filename are in the ignore
part = stub(:filename => 'bar.txt', :body => Mail::Body.new('a'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_by_regexp_on_file_content
name = 'foo.txt'
content = "aaaaaaahello worldbbbbbbbbb"
regexp = /.*Hello World.*/i
type = 'text/plain'
mms = MMS2R::Media.new stub_mail
mms.stubs(:config).returns({'ignore' => {type => ['nil.txt', regexp]}})
part = stub(:filename => name, :body => Mail::Body.new(content))
# type is not in the ingore
assert_equal false, mms.ignore_media?('text/test', part)
# type and regexp for the content are in the ingore
assert_equal true, mms.ignore_media?(type, part)
# type but not regexp for content are in the ignore
part = stub(:filename => name, :body => Mail::Body.new('no teapots'))
assert_equal false, mms.ignore_media?(type, part)
end
def test_ignore_media_when_file_content_is_empty
mms = MMS2R::Media.new stub_mail
# there is no conf but the part's body is empty
part = stub(:filename => 'foo.txt', :body => Mail::Body.new)
assert_equal true, mms.ignore_media?('text/test', part)
# there is no conf but the part's body is white space
part = stub(:filename => 'foo.txt', :body => Mail::Body.new("\t\n\t\n "))
assert_equal true, mms.ignore_media?('text/test', part)
end
def test_add_file
mail = stub_mail
mail.stubs(:from).returns(['[email protected]'])
mms = MMS2R::Media.new(mail)
mms.stubs(:media).returns({})
assert_nil mms.media['text/html']
mms.add_file('text/html', '/tmp/foo.html')
assert_equal ['/tmp/foo.html'], mms.media['text/html']
mms.add_file('text/html', '/tmp/bar.html')
assert_equal ['/tmp/foo.html', '/tmp/bar.html'], mms.media['text/html']
end
def test_temp_file
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name)
assert_equal name, File.basename(mms.temp_file(part))
end
def test_process_media_for_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', 'hello world'])
result = mms.process_media(part)
assert_equal 'text/plain', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_with_empty_text
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['text/plain', nil])
part = stub(:filename => name, :content_type => 'text/plain', :part_type? => 'text/plain', :main_type => 'text')
assert_equal ['text/plain', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['text/plain', ''])
assert_equal ['text/plain', nil], mms.process_media(part)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_smil
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
mms.stubs(:transform_text_part).returns(['application/smil', nil])
part = stub(:filename => name, :content_type => 'application/smil', :part_type? => 'application/smil', :main_type => 'application')
assert_equal ['application/smil', nil], mms.process_media(part)
mms.stubs(:transform_text_part).returns(['application/smil', 'hello world'])
result = mms.process_media(part)
assert_equal 'application/smil', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_application_octet_stream_when_image
name = 'fake.jpg'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :content_type => 'application/octet-stream', :part_type? => 'application/octet-stream', :body => Mail::Body.new("data"), :main_type => 'application')
result = mms.process_media(part)
assert_equal 'image/jpeg', result.first
assert_match(/fake\.jpg$/, result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process_media_for_all_other_media
name = 'foo.txt'
mms = MMS2R::Media.new stub_mail
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new(nil))
assert_equal ['faux/text', nil], mms.process_media(part)
part = stub(:filename => name, :main_type => 'faux', :part_type? => 'faux/text', :body => Mail::Body.new('hello world'))
result = mms.process_media(part)
assert_equal 'faux/text', result.first
assert_equal 'hello world', IO.read(result.last)
mms.purge # have to call purge since a file is put to disk as side effect
end
def test_process
mms = MMS2R::Media.new stub_mail
assert_equal 1, mms.media.size
assert_not_nil mms.media['text/plain']
assert_equal 1, mms.media['text/plain'].size
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
mms.purge
end
def test_process_with_multipart_double_parts
mail = mail('apple-double-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_not_nil mms.media['application/applefile']
assert_equal 1, mms.media['application/applefile'].size
assert_not_nil mms.media['image/jpeg']
assert_equal 1, mms.media['image/jpeg'].size
assert_match(/DSCN1715\.jpg$/, mms.media['image/jpeg'].first)
assert_file_size mms.media['image/jpeg'].first, 337
mms.purge
end
def test_process_with_multipart_alternative_parts
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('a'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
assert_equal 2, mms.media.size
assert_not_nil mms.media['text/plain']
assert_not_nil mms.media['text/html']
assert_equal 1, mms.media['text/plain'].size
assert_equal 1, mms.media['text/html'].size
assert_equal 'message.txt', File.basename(mms.media['text/plain'].first)
assert_equal 'message.html', File.basename(mms.media['text/html'].first)
assert_equal true, File.exist?(mms.media['text/plain'].first)
assert_equal true, File.exist?(mms.media['text/html'].first)
assert_equal 1, File.size(mms.media['text/plain'].first)
assert_equal 1, File.size(mms.media['text/html'].first)
mms.purge
end
def test_process_when_media_is_ignored
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new(''), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new(''), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
mms = MMS2R::Media.new(mail, :process => :lazy)
mms.stubs(:config).returns({'ignore' => {'text/plain' => ['message.txt'],
'text/html' => ['message.html']}})
assert_nothing_raised { mms.process }
# the multipart/alternative should get flattend to text and html and then
# what's flattened is ignored
assert_equal 0, mms.media.size
mms.purge
end
def test_process_when_yielding_to_a_block
mail = stub_mail
plain = stub('plain', :filename => 'message.txt', :content_type => 'text/plain', :part_type? => 'text/plain', :body => Mail::Body.new('a'), :main_type => 'text')
plain.stubs(:multipart?).at_least_once.returns(false)
html = stub('html', :filename => 'message.html', :content_type => 'text/html', :part_type? => 'text/html', :body => Mail::Body.new('b'), :main_type => 'text')
html.stubs(:multipart?).at_least_once.returns(false)
multi = stub('multi', :content_type => 'multipart/alternative', :part_type? => 'multipart/alternative', :parts => [plain, html])
multi.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:multipart?).at_least_once.returns(true)
mail.stubs(:parts).at_least_once.returns([multi])
# the multipart/alternative should get flattend to text and html
mms = MMS2R::Media.new(mail)
assert_equal 2, mms.media.size
mms.process do |type, files|
assert_equal 1, files.size
assert_equal true, type == 'text/plain' || type == 'text/html'
assert_equal true, File.basename(files.first) == 'message.txt' ||
File.basename(files.first) == 'message.html'
assert_equal true, File::exist?(files.first)
end
mms.purge
end
def test_domain_from_return_path
mail = mock()
mail.expects(:from).at_least_once.returns([])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'null.example.com', domain
end
def test_domain_from_from_yaml
f = File.join(MMS2R::Media.conf_dir, 'from.yml')
YAML.expects(:load_file).once.with(f).returns(['example.com'])
mail = mock()
mail.expects(:from).at_least_once.returns(['[email protected]'])
mail.expects(:return_path).at_least_once.returns('[email protected]')
domain = MMS2R::Media.domain(mail)
assert_equal 'example.com', domain
end
def test_unknown_device_type
mail = mail('generic.mail')
mms = MMS2R::Media.new(mail)
assert_equal :unknown, mms.device_type?
assert_equal false, mms.is_mobile?
end
def test_iphone_device_type_by_header
iphones = ['att-iphone-01.mail',
'iphone-image-01.mail']
iphones.each do |iphone|
mail = mail(iphone)
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?, "fixture #{iphone} was not a iphone"
assert_equal true, mms.is_mobile?
end
end
def test_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal 'iPhone', mms.exif.model
end
def test_iphone_device_type_by_exif
mail = smart_phone_mock
mms = MMS2R::Media.new(mail)
assert_equal :iphone, mms.device_type?
assert_equal true, mms.is_mobile?
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_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)
assert_equal :dash, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_droid_device_type_by_exif
mail = smart_phone_mock('Motorola', 'Droid')
mms = MMS2R::Media.new(mail)
assert_equal :droid, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_eris_device_type_by_exif
mail = smart_phone_mock('HTC', 'Eris')
mms = MMS2R::Media.new(mail)
assert_equal :htc, mms.device_type?
assert_equal true, mms.is_mobile?
end
def test_htc_hero_device_type_by_exif
mail = smart_phone_mock('HTC', 'HERO200')
mms = MMS2R::Media.new(mail)
assert_equal :htc, 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|
mail = smart_phone_mock(handset.first, handset.last)
mms = MMS2R::Media.new(mail)
assert_equal true, mms.is_mobile?, "mms with make #{mms.exif.make}, and model #{mms.exif.model}, should be considered a mobile device"
end
end
def test_blackberry_device_type
berries = ['att-blackberry.mail',
'suncom-blackberry.mail',
'tmobile-blackberry-02.mail',
'tmobile-blackberry.mail',
'tmo.blackberry.net-image-01.mail',
'verizon-blackberry.mail',
'verizon-blackberry.mail']
berries.each do |berry|
mms = MMS2R::Media.new(mail(berry))
assert_equal :blackberry, mms.device_type?, "fixture #{berry} was not a blackberrry"
assert_equal true, mms.is_mobile?
end
end
def test_handset_device_type
mail = mail('att-image-01.mail')
mms = MMS2R::Media.new(mail)
assert_equal :handset, mms.device_type?
assert_equal true, mms.is_mobile?
end
end
diff --git a/test/test_sprint.rb b/test/test_sprint.rb
new file mode 100644
index 0000000..8d3d535
--- /dev/null
+++ b/test/test_sprint.rb
@@ -0,0 +1,17 @@
+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 "", mms.body
+ assert_equal 1, mms.media.size
+ assert_equal 1, mms.media['image/jpeg'].size
+
+ mms.purge
+ end
+end
|
blodt/ext.entry_reedirect.ee_addon
|
068d714393a4edf049a58408cb8de31d275360a3
|
Took jQuery out of noConflict mode for Structure screen compatibility
|
diff --git a/README.markdown b/README.markdown
index 59f8cf5..d8758c5 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,16 +1,17 @@
Entry REEdirect is an ExpressionEngine extension that allows you to control, on a per-weblog basis, where authors land after publishing or updating entries in the ExpressionEngine control panel.
For each weblog you have four redirect location options for both **new entries** and **updated entries**:
- **Default Preview** - EE's built-in success screen with ugly entry preview
- **Publish Form** - new entry screen for the same weblog you just published to
- **Edit Entry** - keep editing the entry you just published or updated
- **Manage Entries** - the Edit tab, filtered to display entries from the weblog you just published to
+- **Structure module** - if the [Structure module](http://buildwithstructure.com) is installed, you can choose to redirect to the main Structure screen
In all cases the author will see a "success" message for their new entry or update, along with the entry's title and an "Edit this entry" link. This success message can optionally disappear after a specified length of time, and has a "close" link as well.
The Extension Settings screen offers optional one-click setting of all of your weblogs to the same option for both new entries and updated entries.
Entries submitted via SAEFs will be be unaffected by this extension.
Entry REEdirect requires jQuery for the Control Panel (loading jQuery 1.3 or newer), and has been tested with ExpressionEngine 1.6.8.
\ No newline at end of file
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 6e7e0d8..2d983da 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,534 +1,532 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.5';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = 'http://github.com/amphibian/ext.entry_reedirect.ee_addon';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings_form($current)
{
global $DB, $DSP, $IN, $LANG, $PREFS;
$locations = array('default','new','remain','edit');
// Check to see if the Structure module is installed
$structure = $DB->query("SELECT module_id FROM exp_modules WHERE module_name = 'Structure'");
if($structure->num_rows > 0)
{
$locations[] = 'structure';
}
$weblogs = $DB->query("SELECT blog_title, weblog_id
FROM exp_weblogs
WHERE site_id = '".$DB->escape_str($PREFS->ini('site_id'))."'
ORDER BY blog_title ASC");
// Start building the page
$DSP->crumbline = TRUE;
$DSP->title = $LANG->line('extension_settings');
$DSP->crumb = $DSP->anchor(BASE.AMP.'C=admin'.AMP.'area=utilities', $LANG->line('utilities')).
$DSP->crumb_item($DSP->anchor(BASE.AMP.'C=admin'.AMP.'M=utilities'.AMP.'P=extensions_manager', $LANG->line('extensions_manager')));
$DSP->crumb .= $DSP->crumb_item($this->name);
$DSP->right_crumb($LANG->line('disable_extension'), BASE.AMP.'C=admin'.AMP.'M=utilities'.AMP.'P=toggle_extension_confirm'.AMP.'which=disable'.AMP.'name='.$IN->GBL('name'));
$DSP->body = $DSP->form_open(
array(
'action' => 'C=admin'.AMP.'M=utilities'.AMP.'P=save_extension_settings',
'name' => 'entry_reedirect',
'id' => 'entry_reedirect'
),
array('name' => get_class($this))
);
// $DSP->body .= '<pre>'.print_r($current, TRUE).'</pre>';
$DSP->body .= $DSP->heading($this->name.NBS.$DSP->qspan('defaultLight', $this->version), 1);
// Open the table
$DSP->body .= $DSP->table('tableBorder', '0', '', '100%');
$DSP->body .= $DSP->tr();
$DSP->body .= $DSP->td('tableHeading', '30%');
$DSP->body .= ucfirst($PREFS->ini('weblog_nomenclature'));
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td('tableHeading', '30%');
$DSP->body .= $LANG->line('redirect_after_new');
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td('tableHeading', '30%');
$DSP->body .= $LANG->line('redirect_after_update');
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
// Global location controls
$DSP->body .= $DSP->tr();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; font-weight: bold; margin: 0; padding: 6px;">';
$DSP->body .= $LANG->line('global_redirect');
$DSP->body .= $DSP->td_c();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $DSP->input_select_header('global_new_entry_redirect');
$DSP->body .= $DSP->input_select_option('none', $LANG->line('none'), 1);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'));
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $DSP->input_select_header('global_updated_entry_redirect');
$DSP->body .= $DSP->input_select_option('none', $LANG->line('none'), 1);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'));
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
// Per-weblog settings
$i = 1;
foreach($weblogs->result as $value)
{
$class = ($i % 2) ? 'tableCellTwo' : 'tableCellOne';
extract($value);
$DSP->body .= $DSP->tr();
$DSP->body .= $DSP->td($class);
$DSP->body .= $blog_title;
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td($class);
$DSP->body .= $DSP->input_select_header('new_redirect_weblog_id_'.$weblog_id);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'), ( isset($current['new_redirect_weblog_id_'.$weblog_id]) && $current['new_redirect_weblog_id_'.$weblog_id] == $location) ? 1 : '');
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td($class);
$DSP->body .= $DSP->input_select_header('updated_redirect_weblog_id_'.$weblog_id);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'), ( isset($current['updated_redirect_weblog_id_'.$weblog_id]) && $current['updated_redirect_weblog_id_'.$weblog_id] == $location) ? 1 : '');
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
$i++;
}
// Setting for message display
$DSP->body .= $DSP->tr();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $LANG->line('hide_success_message');
$DSP->body .= $DSP->td_c();
$DSP->body .= '<td colspan="2" class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $DSP->input_text('hide_success_message', (isset($current['hide_success_message'])) ? $current['hide_success_message'] : '5', 10, '2', '', '50px');
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
// Wrap it up
$DSP->body .= $DSP->table_c();
$DSP->body .= $DSP->qdiv('itemWrapperTop', $DSP->input_submit());
$DSP->body .= $DSP->form_c();
}
// END
function save_settings()
{
global $DB;
// Get all settings
$settings = $this->get_settings(TRUE);
unset($_POST['name']);
unset($_POST['global_new_entry_redirect']);
unset($_POST['global_updated_entry_redirect']);
// Only update the settings we just posted
// (Leave other sites' settings alone)
foreach($_POST as $k => $v)
{
$settings[$k] = $v;
}
$data = array('settings' => addslashes(serialize($settings)));
$update = $DB->update_string('exp_extensions', $data, "class = 'Entry_reedirect'");
$DB->query($update);
}
function get_settings($all_sites = FALSE)
{
global $DB, $PREFS, $REGX;
$site = $PREFS->ini('site_id');
$get_settings = $DB->query("SELECT settings FROM exp_extensions WHERE class = 'Entry_reedirect' LIMIT 1");
if ($get_settings->num_rows > 0 && $get_settings->row['settings'] != '')
{
$settings = $REGX->array_stripslashes(unserialize($get_settings->row['settings']));
$settings = ($all_sites == TRUE) ? $settings : $settings[$site];
}
else
{
$settings = array();
}
return $settings;
}
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
$redirect = (!empty($this->settings) && isset($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])) ? $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']] : '';
$default = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
if($redirect)
{
switch($redirect)
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'structure':
$location = BASE.AMP.
'C=modules'.AMP.
'M=Structure'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = $default;
}
}
else
{
$location = $default;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $IN, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if($IN->GBL('P') == 'extension_settings' && $IN->GBL('name') == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
- jQuery.noConflict();
- jQuery(document).ready(function($)
+ $(document).ready(function()
{
$("select[name=global_new_entry_redirect]").change(function(){
var setValue = $(this).val();
if(setValue != "none")
{
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
else
{
$("select[name^=new_redirect]").removeAttr("disabled");
}
});
$("select[name=global_updated_entry_redirect]").change(function(){
var setValue = $(this).val();
if(setValue != "none")
{
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
else
{
$("select[name^=updated_redirect]").removeAttr("disabled");
}
});
$("form#entry_reedirect").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
});
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
- $find = array();
- $replace = array();
+ $find = array("<div id='contentNB'>", "<div id='content'>", "</head>");
if(isset($_GET['reedirect_entry_id']))
{
// Success message goes bye-bye? If so, add the callback.
$auto_hide = ($this->settings['hide_success_message']) ? ',function(){
setTimeout(
function(){
$("div#entry_reedirect_message").slideUp();
}
,'.($this->settings['hide_success_message']*1000).'
);
}' : '';
-
- $find[] = "<div id='contentNB'>";
-
+
+ // Build the success message
$get_title = $DB->query("SELECT title FROM exp_weblog_titles
WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
- $message = "<div id='contentNB'>
- ".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
+ $LANG->fetch_language_file('publish');
+
+ $message = '
+ <div id="entry_reedirect_message"><div>'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
if($_GET['M'] != 'edit_entry')
{
$message .= ': '.$DSP->span_c();
$message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
$LANG->line('edit_this_entry')).
$DSP->span_c();
}
else
{
$message .= $DSP->span_c();
}
- $message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
- .$DSP->div_c().$DSP->div_c();
-
- $replace[] = $message;
-
- $find[] = '</head>';
-
- $replace[] = '
+ $message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>';
+ $message .= $DSP->div_c().$DSP->div_c();
+
+ // CSS and JS for the success message
+ $head = '
<style type="text/css">
#entry_reedirect_message { border-bottom:1px solid #CCC9A4; position: fixed; width: 100%; left: 0; top: 0; display: none; }
* html #entry_reedirect_message { position: absolute; }
#entry_reedirect_message div { padding: 10px 15px; background-color: rgb(252,252,222); }
#entry_reedirect_message > div { background-color: rgba(252,252,222,0.95); }
a#reedirectClose { display: block; position: absolute; right: 15px; top: 7px; padding: 0 3px; border: 1px solid #CCC9A4; font-size: 18px; line-height: 18px; color: #CCC9A4; text-decoration: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; }
a#reedirectClose:hover { background-color: #CCC9A4; color: rgb(252,252,222); }
</style>
<script type="text/javascript">
- <!-- Added by Entry REEdirect -->
- jQuery.noConflict();
- jQuery(document).ready(function($)
+ $(document).ready(function()
{
$("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
$("a#reedirectClose").click(function(){
$("div#entry_reedirect_message").slideUp();
return false;
});
});
</script>
-
- </head>
';
+ $replace = array(
+ "<div id='contentNB'>$message",
+ "<div id='content'>$message",
+ $head."</head>"
+ );
+
$out = str_replace($find, $replace, $out);
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$hooks = array(
'weblog_standalone_insert_entry' => 'grab_return_url',
'submit_new_entry_redirect' => 'redirect_location',
'show_full_control_panel_end' => 'cp_changes'
);
foreach($hooks as $hook => $method)
{
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => $method,
'hook' => $hook,
'settings' => '',
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
311e8ce6f2802f23343ee0af9b001d48293dd3ce
|
Added option to redirect to Structure module; fixed IE 6 javascript error
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 1461804..6e7e0d8 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,519 +1,534 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
- var $version = '1.0.4';
+ var $version = '1.0.5';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = 'http://github.com/amphibian/ext.entry_reedirect.ee_addon';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings_form($current)
{
global $DB, $DSP, $IN, $LANG, $PREFS;
$locations = array('default','new','remain','edit');
-
+
+ // Check to see if the Structure module is installed
+ $structure = $DB->query("SELECT module_id FROM exp_modules WHERE module_name = 'Structure'");
+ if($structure->num_rows > 0)
+ {
+ $locations[] = 'structure';
+ }
+
$weblogs = $DB->query("SELECT blog_title, weblog_id
FROM exp_weblogs
WHERE site_id = '".$DB->escape_str($PREFS->ini('site_id'))."'
ORDER BY blog_title ASC");
// Start building the page
$DSP->crumbline = TRUE;
$DSP->title = $LANG->line('extension_settings');
$DSP->crumb = $DSP->anchor(BASE.AMP.'C=admin'.AMP.'area=utilities', $LANG->line('utilities')).
$DSP->crumb_item($DSP->anchor(BASE.AMP.'C=admin'.AMP.'M=utilities'.AMP.'P=extensions_manager', $LANG->line('extensions_manager')));
$DSP->crumb .= $DSP->crumb_item($this->name);
$DSP->right_crumb($LANG->line('disable_extension'), BASE.AMP.'C=admin'.AMP.'M=utilities'.AMP.'P=toggle_extension_confirm'.AMP.'which=disable'.AMP.'name='.$IN->GBL('name'));
$DSP->body = $DSP->form_open(
array(
'action' => 'C=admin'.AMP.'M=utilities'.AMP.'P=save_extension_settings',
'name' => 'entry_reedirect',
'id' => 'entry_reedirect'
),
array('name' => get_class($this))
);
// $DSP->body .= '<pre>'.print_r($current, TRUE).'</pre>';
$DSP->body .= $DSP->heading($this->name.NBS.$DSP->qspan('defaultLight', $this->version), 1);
// Open the table
$DSP->body .= $DSP->table('tableBorder', '0', '', '100%');
$DSP->body .= $DSP->tr();
$DSP->body .= $DSP->td('tableHeading', '30%');
$DSP->body .= ucfirst($PREFS->ini('weblog_nomenclature'));
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td('tableHeading', '30%');
$DSP->body .= $LANG->line('redirect_after_new');
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td('tableHeading', '30%');
$DSP->body .= $LANG->line('redirect_after_update');
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
// Global location controls
$DSP->body .= $DSP->tr();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; font-weight: bold; margin: 0; padding: 6px;">';
$DSP->body .= $LANG->line('global_redirect');
$DSP->body .= $DSP->td_c();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $DSP->input_select_header('global_new_entry_redirect');
$DSP->body .= $DSP->input_select_option('none', $LANG->line('none'), 1);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'));
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $DSP->input_select_header('global_updated_entry_redirect');
$DSP->body .= $DSP->input_select_option('none', $LANG->line('none'), 1);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'));
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
// Per-weblog settings
$i = 1;
foreach($weblogs->result as $value)
{
$class = ($i % 2) ? 'tableCellTwo' : 'tableCellOne';
extract($value);
$DSP->body .= $DSP->tr();
$DSP->body .= $DSP->td($class);
$DSP->body .= $blog_title;
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td($class);
$DSP->body .= $DSP->input_select_header('new_redirect_weblog_id_'.$weblog_id);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'), ( isset($current['new_redirect_weblog_id_'.$weblog_id]) && $current['new_redirect_weblog_id_'.$weblog_id] == $location) ? 1 : '');
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->td($class);
$DSP->body .= $DSP->input_select_header('updated_redirect_weblog_id_'.$weblog_id);
foreach($locations as $location)
{
$DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'), ( isset($current['updated_redirect_weblog_id_'.$weblog_id]) && $current['updated_redirect_weblog_id_'.$weblog_id] == $location) ? 1 : '');
}
$DSP->body .= $DSP->input_select_footer();
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
$i++;
}
// Setting for message display
$DSP->body .= $DSP->tr();
$DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $LANG->line('hide_success_message');
$DSP->body .= $DSP->td_c();
$DSP->body .= '<td colspan="2" class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
$DSP->body .= $DSP->input_text('hide_success_message', (isset($current['hide_success_message'])) ? $current['hide_success_message'] : '5', 10, '2', '', '50px');
$DSP->body .= $DSP->td_c();
$DSP->body .= $DSP->tr_c();
// Wrap it up
$DSP->body .= $DSP->table_c();
$DSP->body .= $DSP->qdiv('itemWrapperTop', $DSP->input_submit());
$DSP->body .= $DSP->form_c();
}
// END
function save_settings()
{
global $DB;
// Get all settings
$settings = $this->get_settings(TRUE);
unset($_POST['name']);
unset($_POST['global_new_entry_redirect']);
unset($_POST['global_updated_entry_redirect']);
// Only update the settings we just posted
// (Leave other sites' settings alone)
foreach($_POST as $k => $v)
{
$settings[$k] = $v;
}
$data = array('settings' => addslashes(serialize($settings)));
$update = $DB->update_string('exp_extensions', $data, "class = 'Entry_reedirect'");
$DB->query($update);
}
function get_settings($all_sites = FALSE)
{
global $DB, $PREFS, $REGX;
$site = $PREFS->ini('site_id');
$get_settings = $DB->query("SELECT settings FROM exp_extensions WHERE class = 'Entry_reedirect' LIMIT 1");
if ($get_settings->num_rows > 0 && $get_settings->row['settings'] != '')
{
$settings = $REGX->array_stripslashes(unserialize($get_settings->row['settings']));
$settings = ($all_sites == TRUE) ? $settings : $settings[$site];
}
else
{
$settings = array();
}
return $settings;
}
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
$redirect = (!empty($this->settings) && isset($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])) ? $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']] : '';
$default = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
if($redirect)
{
switch($redirect)
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
+ case 'structure':
+ $location = BASE.AMP.
+ 'C=modules'.AMP.
+ 'M=Structure'.AMP.
+ 'weblog_id='.$data['weblog_id'].AMP.
+ 'reedirect_entry_id='.$entry_id.AMP.
+ 'U='.$type;
+ break;
default:
$location = $default;
}
}
else
{
$location = $default;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $IN, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if($IN->GBL('P') == 'extension_settings' && $IN->GBL('name') == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
jQuery.noConflict();
jQuery(document).ready(function($)
{
$("select[name=global_new_entry_redirect]").change(function(){
var setValue = $(this).val();
if(setValue != "none")
{
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
else
{
$("select[name^=new_redirect]").removeAttr("disabled");
}
});
$("select[name=global_updated_entry_redirect]").change(function(){
var setValue = $(this).val();
if(setValue != "none")
{
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
else
{
$("select[name^=updated_redirect]").removeAttr("disabled");
}
});
- $("form[name=entry_reedirect]").submit(function(){
+ $("form#entry_reedirect").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
});
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
$find = array();
$replace = array();
if(isset($_GET['reedirect_entry_id']))
{
// Success message goes bye-bye? If so, add the callback.
$auto_hide = ($this->settings['hide_success_message']) ? ',function(){
setTimeout(
function(){
$("div#entry_reedirect_message").slideUp();
}
,'.($this->settings['hide_success_message']*1000).'
);
}' : '';
$find[] = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles
WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = "<div id='contentNB'>
".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
if($_GET['M'] != 'edit_entry')
{
$message .= ': '.$DSP->span_c();
$message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
$LANG->line('edit_this_entry')).
$DSP->span_c();
}
else
{
$message .= $DSP->span_c();
}
$message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
.$DSP->div_c().$DSP->div_c();
$replace[] = $message;
$find[] = '</head>';
$replace[] = '
<style type="text/css">
#entry_reedirect_message { border-bottom:1px solid #CCC9A4; position: fixed; width: 100%; left: 0; top: 0; display: none; }
* html #entry_reedirect_message { position: absolute; }
#entry_reedirect_message div { padding: 10px 15px; background-color: rgb(252,252,222); }
#entry_reedirect_message > div { background-color: rgba(252,252,222,0.95); }
a#reedirectClose { display: block; position: absolute; right: 15px; top: 7px; padding: 0 3px; border: 1px solid #CCC9A4; font-size: 18px; line-height: 18px; color: #CCC9A4; text-decoration: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; }
a#reedirectClose:hover { background-color: #CCC9A4; color: rgb(252,252,222); }
</style>
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
jQuery.noConflict();
jQuery(document).ready(function($)
{
$("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
$("a#reedirectClose").click(function(){
$("div#entry_reedirect_message").slideUp();
return false;
});
});
</script>
</head>
';
$out = str_replace($find, $replace, $out);
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$hooks = array(
'weblog_standalone_insert_entry' => 'grab_return_url',
'submit_new_entry_redirect' => 'redirect_location',
'show_full_control_panel_end' => 'cp_changes'
);
foreach($hooks as $hook => $method)
{
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => $method,
'hook' => $hook,
'settings' => '',
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
diff --git a/language/english/lang.entry_reedirect.php b/language/english/lang.entry_reedirect.php
index 72555e6..b844c7a 100644
--- a/language/english/lang.entry_reedirect.php
+++ b/language/english/lang.entry_reedirect.php
@@ -1,13 +1,14 @@
<?php
global $PREFs;
$L = array(
'default_lang' => 'Default Preview',
'new_lang' => 'Publish Form',
'remain_lang' => 'Edit Entry',
'edit_lang' => 'Manage Entries',
+ 'structure_lang' => 'Structure Module',
'none' => '--',
'redirect_after_new' => 'Redirect after publishing new entries',
'redirect_after_update' => 'Redirect after updating existing entries',
'global_redirect' => 'Quick-set all '.$PREFS->ini('weblog_nomenclature').'s',
'hide_success_message' => 'Seconds until success message disappears (\'0\' for persistent)'
);
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
c8fbf1082623421d31715edb540e40fdff3be6d3
|
Redesigned settings screen, now MSM-aware; put jQuery in noConflict mode
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index be8750f..65d4eef 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,404 +1,519 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
- var $version = '1.0.3';
+ var $version = '1.0.4';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = 'http://github.com/amphibian/ext.entry_reedirect.ee_addon';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
- function settings()
+ function settings_form($current)
{
- global $DB, $LANG, $PREFS;
+ global $DB, $DSP, $IN, $LANG, $PREFS;
+
+ $locations = array('default','new','remain','edit');
- $settings = array();
+ $weblogs = $DB->query("SELECT blog_title, weblog_id
+ FROM exp_weblogs
+ WHERE site_id = '".$DB->escape_str($PREFS->ini('site_id'))."'
+ ORDER BY blog_title ASC");
+
+ // Start building the page
+ $DSP->crumbline = TRUE;
- $locations = array(
- 'default' => 'Default Preview',
- 'new' => 'Publish Form',
- 'remain' => 'Edit Entry',
- 'edit' => 'Manage Entries'
- );
+ $DSP->title = $LANG->line('extension_settings');
+ $DSP->crumb = $DSP->anchor(BASE.AMP.'C=admin'.AMP.'area=utilities', $LANG->line('utilities')).
+ $DSP->crumb_item($DSP->anchor(BASE.AMP.'C=admin'.AMP.'M=utilities'.AMP.'P=extensions_manager', $LANG->line('extensions_manager')));
+ $DSP->crumb .= $DSP->crumb_item($this->name);
- $global_locations = $locations;
- $global_locations['none'] = 'None';
+ $DSP->right_crumb($LANG->line('disable_extension'), BASE.AMP.'C=admin'.AMP.'M=utilities'.AMP.'P=toggle_extension_confirm'.AMP.'which=disable'.AMP.'name='.$IN->GBL('name'));
- $settings['hide_success_message'] = '5';
- $settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
- $settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
+ $DSP->body = $DSP->form_open(
+ array(
+ 'action' => 'C=admin'.AMP.'M=utilities'.AMP.'P=save_extension_settings',
+ 'name' => 'entry_reedirect',
+ 'id' => 'entry_reedirect'
+ ),
+ array('name' => get_class($this))
+ );
+
+ // $DSP->body .= '<pre>'.print_r($current, TRUE).'</pre>';
- $query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
- if($query->num_rows > 0)
+ $DSP->body .= $DSP->heading($this->name, 1);
+
+ // Open the table
+ $DSP->body .= $DSP->table('tableBorder', '0', '', '100%');
+ $DSP->body .= $DSP->tr();
+
+ $DSP->body .= $DSP->td('tableHeading', '30%');
+ $DSP->body .= ucfirst($PREFS->ini('weblog_nomenclature'));
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->td('tableHeading', '30%');
+ $DSP->body .= $LANG->line('redirect_after_new');
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->td('tableHeading', '30%');
+ $DSP->body .= $LANG->line('redirect_after_update');
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->tr_c();
+
+ // Global location controls
+ $DSP->body .= $DSP->tr();
+
+ $DSP->body .= '<td class="box" style="border-width: 0 0 1px; font-weight: bold; margin: 0; padding: 6px;">';
+ $DSP->body .= $LANG->line('global_redirect');
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
+ $DSP->body .= $DSP->input_select_header('global_new_entry_redirect');
+ $DSP->body .= $DSP->input_select_option('none', $LANG->line('none'), 1);
+ foreach($locations as $location)
+ {
+ $DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'));
+ }
+ $DSP->body .= $DSP->input_select_footer();
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
+ $DSP->body .= $DSP->input_select_header('global_updated_entry_redirect');
+ $DSP->body .= $DSP->input_select_option('none', $LANG->line('none'), 1);
+ foreach($locations as $location)
{
- foreach($query->result as $value)
+ $DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'));
+ }
+ $DSP->body .= $DSP->input_select_footer();
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->tr_c();
+
+ // Per-weblog settings
+ $i = 1;
+ foreach($weblogs->result as $value)
+ {
+ $class = ($i % 2) ? 'tableCellTwo' : 'tableCellOne';
+ extract($value);
+
+ $DSP->body .= $DSP->tr();
+
+ $DSP->body .= $DSP->td($class);
+ $DSP->body .= $blog_title;
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->td($class);
+ $DSP->body .= $DSP->input_select_header('new_redirect_weblog_id_'.$weblog_id);
+ foreach($locations as $location)
+ {
+ $DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'), ( isset($current['new_redirect_weblog_id_'.$weblog_id]) && $current['new_redirect_weblog_id_'.$weblog_id] == $location) ? 1 : '');
+ }
+ $DSP->body .= $DSP->input_select_footer();
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->td($class);
+ $DSP->body .= $DSP->input_select_header('updated_redirect_weblog_id_'.$weblog_id);
+ foreach($locations as $location)
{
- $LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
- $settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
- $LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
- $settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
+ $DSP->body .= $DSP->input_select_option($location, $LANG->line($location.'_lang'), ( isset($current['updated_redirect_weblog_id_'.$weblog_id]) && $current['updated_redirect_weblog_id_'.$weblog_id] == $location) ? 1 : '');
+ }
+ $DSP->body .= $DSP->input_select_footer();
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->tr_c();
+
+ $i++;
}
+
+ // Setting for message display
+ $DSP->body .= $DSP->tr();
+
+ $DSP->body .= '<td class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
+ $DSP->body .= $LANG->line('hide_success_message');
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= '<td colspan="2" class="box" style="border-width: 0 0 1px; margin: 0; padding: 6px;">';
+ $DSP->body .= $DSP->input_text('hide_success_message', (isset($current['hide_success_message'])) ? $current['hide_success_message'] : '5', 10, '2', '', '50px');
+ $DSP->body .= $DSP->td_c();
+
+ $DSP->body .= $DSP->tr_c();
- return $settings;
+ // Wrap it up
+ $DSP->body .= $DSP->table_c();
+ $DSP->body .= $DSP->qdiv('itemWrapperTop', $DSP->input_submit());
+ $DSP->body .= $DSP->form_c();
}
// END
+ function save_settings()
+ {
+ global $DB;
+
+ // Get all settings
+ $settings = $this->get_settings(TRUE);
+
+ unset($_POST['name']);
+ unset($_POST['global_new_entry_redirect']);
+ unset($_POST['global_updated_entry_redirect']);
+
+ // Only update the settings we just posted
+ // (Leave other sites' settings alone)
+ foreach($_POST as $k => $v)
+ {
+ $settings[$k] = $v;
+ }
+
+ $data = array('settings' => addslashes(serialize($settings)));
+ $update = $DB->update_string('exp_extensions', $data, "class = 'Entry_reedirect'");
+ $DB->query($update);
+ }
+
+
+ function get_settings($all_sites = FALSE)
+ {
+ global $DB, $PREFS, $REGX;
+ $site = $PREFS->ini('site_id');
+
+ $get_settings = $DB->query("SELECT settings FROM exp_extensions WHERE class = 'Entry_reedirect' LIMIT 1");
+ if ($get_settings->num_rows > 0 && $get_settings->row['settings'] != '')
+ {
+ $settings = $REGX->array_stripslashes(unserialize($get_settings->row['settings']));
+ $settings = ($all_sites == TRUE) ? $settings : $settings[$site];
+ }
+ else
+ {
+ $settings = array();
+ }
+ return $settings;
+ }
+
+
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
- $redirect = ($this->settings) ? $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']] : '';
+ $redirect = (!empty($this->settings) && isset($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])) ? $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']] : '';
$default = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
if($redirect)
{
switch($redirect)
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = $default;
}
}
else
{
$location = $default;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
- global $DB, $EXT, $DSP, $LANG;
+ global $DB, $EXT, $DSP, $IN, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
- if( (isset($_GET['P']) && $_GET['P'] == 'extension_settings') && $_GET['name'] == 'entry_reedirect')
+ if($IN->GBL('P') == 'extension_settings' && $IN->GBL('name') == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
- $(document).ready(function()
- {
- if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
- {
- $("select[name^=new_redirect]").attr("disabled", "disabled");
- }
- if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
+ jQuery.noConflict();
+ jQuery(document).ready(function($)
+ {
+ $("select[name=global_new_entry_redirect]").change(function(){
+ var setValue = $(this).val();
+ if(setValue != "none")
{
- $("select[name^=updated_redirect]").attr("disabled", "disabled");
- }
- $("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
- var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
- });
- $("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
- var setValue = $(this).val();
- $("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
- $("select[name^=updated_redirect]").attr("disabled", "disabled");
-
- });
- $("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
+ }
+ else
+ {
$("select[name^=new_redirect]").removeAttr("disabled");
- });
- $("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
+ }
+ });
+ $("select[name=global_updated_entry_redirect]").change(function(){
+ var setValue = $(this).val();
+ if(setValue != "none")
+ {
+ $("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
+ $("select[name^=updated_redirect]").attr("disabled", "disabled");
+ }
+ else
+ {
$("select[name^=updated_redirect]").removeAttr("disabled");
- });
- $("form[name=settings_entry_reedirect]").submit(function(){
- $("select[name*=redirect_weblog_id]").removeAttr("disabled");
- });
- }
- );
+ }
+ });
+ $("form[name=entry_reedirect]").submit(function(){
+ $("select[name*=redirect_weblog_id]").removeAttr("disabled");
+ });
+ });
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
$find = array();
$replace = array();
if(isset($_GET['reedirect_entry_id']))
{
// Success message goes bye-bye? If so, add the callback.
$auto_hide = ($this->settings['hide_success_message']) ? ',function(){
setTimeout(
function(){
$("div#entry_reedirect_message").slideUp();
}
,'.($this->settings['hide_success_message']*1000).'
);
}' : '';
$find[] = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles
WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = "<div id='contentNB'>
".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
if($_GET['M'] != 'edit_entry')
{
$message .= ': '.$DSP->span_c();
$message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
$LANG->line('edit_this_entry')).
$DSP->span_c();
}
else
{
$message .= $DSP->span_c();
}
$message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
.$DSP->div_c().$DSP->div_c();
$replace[] = $message;
$find[] = '</head>';
$replace[] = '
<style type="text/css">
- #entry_reedirect_message {
- border-bottom:1px solid #CCC9A4;
- position: fixed;
- width: 100%;
- left: 0;
- top: 0;
- display: none;
- }
- * html #entry_reedirect_message {
- position: absolute;
- }
- #entry_reedirect_message div {
- padding: 10px 15px;
- background-color: rgb(252,252,222);
- }
- #entry_reedirect_message > div {
- background-color: rgba(252,252,222,0.95);
- }
- a#reedirectClose {
- display: block;
- position: absolute;
- right: 15px;
- top: 7px;
- padding: 0 3px;
- border: 1px solid #CCC9A4;
- font-size: 18px;
- line-height: 18px;
- color: #CCC9A4;
- text-decoration: none;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- }
- a#reedirectClose:hover {
- background-color: #CCC9A4;
- color: rgb(252,252,222);
- }
+ #entry_reedirect_message { border-bottom:1px solid #CCC9A4; position: fixed; width: 100%; left: 0; top: 0; display: none; }
+ * html #entry_reedirect_message { position: absolute; }
+ #entry_reedirect_message div { padding: 10px 15px; background-color: rgb(252,252,222); }
+ #entry_reedirect_message > div { background-color: rgba(252,252,222,0.95); }
+ a#reedirectClose { display: block; position: absolute; right: 15px; top: 7px; padding: 0 3px; border: 1px solid #CCC9A4; font-size: 18px; line-height: 18px; color: #CCC9A4; text-decoration: none; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; }
+ a#reedirectClose:hover { background-color: #CCC9A4; color: rgb(252,252,222); }
</style>
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
- $(document).ready(function(){
+ jQuery.noConflict();
+ jQuery(document).ready(function($)
+ {
$("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
$("a#reedirectClose").click(function(){
$("div#entry_reedirect_message").slideUp();
return false;
});
});
</script>
</head>
';
$out = str_replace($find, $replace, $out);
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$hooks = array(
'weblog_standalone_insert_entry' => 'grab_return_url',
'submit_new_entry_redirect' => 'redirect_location',
'show_full_control_panel_end' => 'cp_changes'
);
foreach($hooks as $hook => $method)
{
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => $method,
'hook' => $hook,
'settings' => '',
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
diff --git a/language/english/lang.entry_reedirect.php b/language/english/lang.entry_reedirect.php
index 1e26080..72555e6 100644
--- a/language/english/lang.entry_reedirect.php
+++ b/language/english/lang.entry_reedirect.php
@@ -1,12 +1,13 @@
<?php
-
+global $PREFs;
$L = array(
- 'Default Preview' => 'Default Preview',
- 'Publish Form' => 'Publish Form',
- 'Edit Entry' => 'Edit Entry',
- 'Manage Entries' => 'Manage Entries',
- 'None' => 'None',
- 'global_new_entry_redirect' => 'Global redirect after publishing new entries:',
- 'global_updated_entry_redirect' => 'Global redirect after updating entries:',
+ 'default_lang' => 'Default Preview',
+ 'new_lang' => 'Publish Form',
+ 'remain_lang' => 'Edit Entry',
+ 'edit_lang' => 'Manage Entries',
+ 'none' => '--',
+ 'redirect_after_new' => 'Redirect after publishing new entries',
+ 'redirect_after_update' => 'Redirect after updating existing entries',
+ 'global_redirect' => 'Quick-set all '.$PREFS->ini('weblog_nomenclature').'s',
'hide_success_message' => 'Seconds until success message disappears (\'0\' for persistent)'
);
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
86c1b2961210975869ce6fb5ed46f349e5caba13
|
Added docs URL
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 5476e02..be8750f 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,404 +1,404 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.3';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
- var $docs_url = '';
+ var $docs_url = 'http://github.com/amphibian/ext.entry_reedirect.ee_addon';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
$redirect = ($this->settings) ? $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']] : '';
$default = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
if($redirect)
{
switch($redirect)
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = $default;
}
}
else
{
$location = $default;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if( (isset($_GET['P']) && $_GET['P'] == 'extension_settings') && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
$find = array();
$replace = array();
if(isset($_GET['reedirect_entry_id']))
{
// Success message goes bye-bye? If so, add the callback.
$auto_hide = ($this->settings['hide_success_message']) ? ',function(){
setTimeout(
function(){
$("div#entry_reedirect_message").slideUp();
}
,'.($this->settings['hide_success_message']*1000).'
);
}' : '';
$find[] = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles
WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = "<div id='contentNB'>
".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
if($_GET['M'] != 'edit_entry')
{
$message .= ': '.$DSP->span_c();
$message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
$LANG->line('edit_this_entry')).
$DSP->span_c();
}
else
{
$message .= $DSP->span_c();
}
$message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
.$DSP->div_c().$DSP->div_c();
$replace[] = $message;
$find[] = '</head>';
$replace[] = '
<style type="text/css">
#entry_reedirect_message {
border-bottom:1px solid #CCC9A4;
position: fixed;
width: 100%;
left: 0;
top: 0;
display: none;
}
* html #entry_reedirect_message {
position: absolute;
}
#entry_reedirect_message div {
padding: 10px 15px;
background-color: rgb(252,252,222);
}
#entry_reedirect_message > div {
background-color: rgba(252,252,222,0.95);
}
a#reedirectClose {
display: block;
position: absolute;
right: 15px;
top: 7px;
padding: 0 3px;
border: 1px solid #CCC9A4;
font-size: 18px;
line-height: 18px;
color: #CCC9A4;
text-decoration: none;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
a#reedirectClose:hover {
background-color: #CCC9A4;
color: rgb(252,252,222);
}
</style>
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function(){
$("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
$("a#reedirectClose").click(function(){
$("div#entry_reedirect_message").slideUp();
return false;
});
});
</script>
</head>
';
$out = str_replace($find, $replace, $out);
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$hooks = array(
'weblog_standalone_insert_entry' => 'grab_return_url',
'submit_new_entry_redirect' => 'redirect_location',
'show_full_control_panel_end' => 'cp_changes'
);
foreach($hooks as $hook => $method)
{
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => $method,
'hook' => $hook,
- 'settings' => serialize($this->settings),
+ 'settings' => '',
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
2e22bf35c6ff27c3d1f3f4a6e0135617c347e7b0
|
Further fixes for potential undefined variables notices
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 4511f13..5476e02 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,404 +1,404 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.3';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
- $redirect = $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']];
+ $redirect = ($this->settings) ? $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']] : '';
$default = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
if($redirect)
{
switch($redirect)
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = $default;
}
}
else
{
$location = $default;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if( (isset($_GET['P']) && $_GET['P'] == 'extension_settings') && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
$find = array();
$replace = array();
if(isset($_GET['reedirect_entry_id']))
{
// Success message goes bye-bye? If so, add the callback.
$auto_hide = ($this->settings['hide_success_message']) ? ',function(){
setTimeout(
function(){
$("div#entry_reedirect_message").slideUp();
}
,'.($this->settings['hide_success_message']*1000).'
);
}' : '';
$find[] = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles
WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = "<div id='contentNB'>
".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
if($_GET['M'] != 'edit_entry')
{
$message .= ': '.$DSP->span_c();
$message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
$LANG->line('edit_this_entry')).
$DSP->span_c();
}
else
{
$message .= $DSP->span_c();
}
$message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
.$DSP->div_c().$DSP->div_c();
$replace[] = $message;
$find[] = '</head>';
$replace[] = '
<style type="text/css">
#entry_reedirect_message {
border-bottom:1px solid #CCC9A4;
position: fixed;
width: 100%;
left: 0;
top: 0;
display: none;
}
* html #entry_reedirect_message {
position: absolute;
}
#entry_reedirect_message div {
padding: 10px 15px;
background-color: rgb(252,252,222);
}
#entry_reedirect_message > div {
background-color: rgba(252,252,222,0.95);
}
a#reedirectClose {
display: block;
position: absolute;
right: 15px;
top: 7px;
padding: 0 3px;
border: 1px solid #CCC9A4;
font-size: 18px;
line-height: 18px;
color: #CCC9A4;
text-decoration: none;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
a#reedirectClose:hover {
background-color: #CCC9A4;
color: rgb(252,252,222);
}
</style>
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function(){
$("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
$("a#reedirectClose").click(function(){
$("div#entry_reedirect_message").slideUp();
return false;
});
});
</script>
</head>
';
$out = str_replace($find, $replace, $out);
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$hooks = array(
'weblog_standalone_insert_entry' => 'grab_return_url',
'submit_new_entry_redirect' => 'redirect_location',
'show_full_control_panel_end' => 'cp_changes'
);
foreach($hooks as $hook => $method)
{
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => $method,
'hook' => $hook,
'settings' => serialize($this->settings),
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
0b376f935111ee8dabd0fb181a5ac811c7e18b45
|
Added default settings array.
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 7d779b3..4511f13 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,404 +1,404 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.3';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
$redirect = $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']];
$default = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
if($redirect)
{
switch($redirect)
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = $default;
}
}
else
{
$location = $default;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if( (isset($_GET['P']) && $_GET['P'] == 'extension_settings') && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
$find = array();
$replace = array();
if(isset($_GET['reedirect_entry_id']))
{
// Success message goes bye-bye? If so, add the callback.
$auto_hide = ($this->settings['hide_success_message']) ? ',function(){
setTimeout(
function(){
$("div#entry_reedirect_message").slideUp();
}
,'.($this->settings['hide_success_message']*1000).'
);
}' : '';
$find[] = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles
WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = "<div id='contentNB'>
".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
if($_GET['M'] != 'edit_entry')
{
$message .= ': '.$DSP->span_c();
$message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
$LANG->line('edit_this_entry')).
$DSP->span_c();
}
else
{
$message .= $DSP->span_c();
}
$message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
.$DSP->div_c().$DSP->div_c();
$replace[] = $message;
$find[] = '</head>';
$replace[] = '
<style type="text/css">
#entry_reedirect_message {
border-bottom:1px solid #CCC9A4;
position: fixed;
width: 100%;
left: 0;
top: 0;
display: none;
}
* html #entry_reedirect_message {
position: absolute;
}
#entry_reedirect_message div {
padding: 10px 15px;
background-color: rgb(252,252,222);
}
#entry_reedirect_message > div {
background-color: rgba(252,252,222,0.95);
}
a#reedirectClose {
display: block;
position: absolute;
right: 15px;
top: 7px;
padding: 0 3px;
border: 1px solid #CCC9A4;
font-size: 18px;
line-height: 18px;
color: #CCC9A4;
text-decoration: none;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
a#reedirectClose:hover {
background-color: #CCC9A4;
color: rgb(252,252,222);
}
</style>
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function(){
$("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
$("a#reedirectClose").click(function(){
$("div#entry_reedirect_message").slideUp();
return false;
});
});
</script>
</head>
';
$out = str_replace($find, $replace, $out);
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$hooks = array(
'weblog_standalone_insert_entry' => 'grab_return_url',
'submit_new_entry_redirect' => 'redirect_location',
'show_full_control_panel_end' => 'cp_changes'
);
foreach($hooks as $hook => $method)
{
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => $method,
'hook' => $hook,
- 'settings' => "",
+ 'settings' => serialize($this->settings),
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
47975f6ac1b4deee11436a9168a168b99c9bbb9a
|
Fixed some PHP notices, some code cleanup
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 84995d4..7d779b3 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,415 +1,404 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.3';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
+ $redirect = $this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']];
+ $default = BASE.AMP.
+ 'C=edit'.AMP.
+ 'M=view_entry'.AMP.
+ 'weblog_id='.$data['weblog_id'].AMP.
+ 'entry_id='.$entry_id.AMP.
+ 'U='.$type;
- switch($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])
+ if($redirect)
{
- case 'new':
- $location = BASE.AMP.
- 'C=publish'.AMP.
- 'M=entry_form'.AMP.
- 'weblog_id='.$data['weblog_id'].AMP.
- 'reedirect_entry_id='.$entry_id.AMP.
- 'U='.$type;
- break;
- case 'remain':
- $location = BASE.AMP.
- 'C=edit'.AMP.
- 'M=edit_entry'.AMP.
- 'weblog_id='.$data['weblog_id'].AMP.
- 'entry_id='.$entry_id.AMP.
- 'reedirect_entry_id='.$entry_id.AMP.
- 'U='.$type;
- break;
- case 'edit':
- $location = BASE.AMP.
- 'C=edit'.AMP.
- 'M=view_entries'.AMP.
- 'weblog_id='.$data['weblog_id'].AMP.
- 'reedirect_entry_id='.$entry_id.AMP.
- 'U='.$type;
- break;
- default:
- $location = BASE.AMP.
- 'C=edit'.AMP.
- 'M=view_entry'.AMP.
- 'weblog_id='.$data['weblog_id'].AMP.
- 'entry_id='.$entry_id.AMP.
- 'U='.$type;
+ switch($redirect)
+ {
+ case 'new':
+ $location = BASE.AMP.
+ 'C=publish'.AMP.
+ 'M=entry_form'.AMP.
+ 'weblog_id='.$data['weblog_id'].AMP.
+ 'reedirect_entry_id='.$entry_id.AMP.
+ 'U='.$type;
+ break;
+ case 'remain':
+ $location = BASE.AMP.
+ 'C=edit'.AMP.
+ 'M=edit_entry'.AMP.
+ 'weblog_id='.$data['weblog_id'].AMP.
+ 'entry_id='.$entry_id.AMP.
+ 'reedirect_entry_id='.$entry_id.AMP.
+ 'U='.$type;
+ break;
+ case 'edit':
+ $location = BASE.AMP.
+ 'C=edit'.AMP.
+ 'M=view_entries'.AMP.
+ 'weblog_id='.$data['weblog_id'].AMP.
+ 'reedirect_entry_id='.$entry_id.AMP.
+ 'U='.$type;
+ break;
+ default:
+ $location = $default;
+ }
+ }
+ else
+ {
+ $location = $default;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if( (isset($_GET['P']) && $_GET['P'] == 'extension_settings') && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
$find = array();
$replace = array();
if(isset($_GET['reedirect_entry_id']))
{
// Success message goes bye-bye? If so, add the callback.
$auto_hide = ($this->settings['hide_success_message']) ? ',function(){
setTimeout(
function(){
$("div#entry_reedirect_message").slideUp();
}
,'.($this->settings['hide_success_message']*1000).'
);
}' : '';
$find[] = "<div id='contentNB'>";
- $get_title = $DB->query("SELECT title FROM exp_weblog_titles
- WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
- $title = $get_title->row['title'];
-
- $message = "<div id='contentNB'>
- ".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
- if($_GET['U'] == 'new')
- {
- $message .= $LANG->line('entry_has_been_added');
- }
- elseif($_GET['U'] == 'updated')
- {
- $message .= $LANG->line('entry_has_been_updated');
- }
-
- if($_GET['M'] != 'edit_entry')
- {
- $message .= ': '.$DSP->span_c();
- $message .= $DSP->qspan('defaultBold', $title).
- $DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
- $DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
- 'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
- $LANG->line('edit_this_entry')).
- $DSP->span_c();
- }
- else
- {
- $message .= $DSP->span_c();
- }
-
- $message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
- .$DSP->div_c().$DSP->div_c();
+ $get_title = $DB->query("SELECT title FROM exp_weblog_titles
+ WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
+ $title = $get_title->row['title'];
+
+ $message = "<div id='contentNB'>
+ ".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
+ if($_GET['U'] == 'new')
+ {
+ $message .= $LANG->line('entry_has_been_added');
+ }
+ elseif($_GET['U'] == 'updated')
+ {
+ $message .= $LANG->line('entry_has_been_updated');
+ }
+
+ if($_GET['M'] != 'edit_entry')
+ {
+ $message .= ': '.$DSP->span_c();
+ $message .= $DSP->qspan('defaultBold', $title).
+ $DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
+ $DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
+ 'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
+ $LANG->line('edit_this_entry')).
+ $DSP->span_c();
+ }
+ else
+ {
+ $message .= $DSP->span_c();
+ }
+
+ $message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
+ .$DSP->div_c().$DSP->div_c();
$replace[] = $message;
$find[] = '</head>';
$replace[] = '
<style type="text/css">
#entry_reedirect_message {
border-bottom:1px solid #CCC9A4;
position: fixed;
width: 100%;
left: 0;
top: 0;
display: none;
}
* html #entry_reedirect_message {
position: absolute;
}
#entry_reedirect_message div {
padding: 10px 15px;
background-color: rgb(252,252,222);
}
#entry_reedirect_message > div {
background-color: rgba(252,252,222,0.95);
}
a#reedirectClose {
display: block;
position: absolute;
right: 15px;
top: 7px;
padding: 0 3px;
border: 1px solid #CCC9A4;
font-size: 18px;
line-height: 18px;
color: #CCC9A4;
text-decoration: none;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
a#reedirectClose:hover {
background-color: #CCC9A4;
color: rgb(252,252,222);
}
</style>
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function(){
$("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
$("a#reedirectClose").click(function(){
$("div#entry_reedirect_message").slideUp();
return false;
});
});
</script>
</head>
';
$out = str_replace($find, $replace, $out);
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
- $DB->query($DB->insert_string('exp_extensions',
- array(
- 'extension_id' => '',
- 'class' => "Entry_reedirect",
- 'method' => "grab_return_url",
- 'hook' => "weblog_standalone_insert_entry",
- 'settings' => "",
- 'priority' => 10,
- 'version' => $this->version,
- 'enabled' => "y"
- )
- )
- );
-
- $DB->query($DB->insert_string('exp_extensions',
- array(
- 'extension_id' => '',
- 'class' => "Entry_reedirect",
- 'method' => "redirect_location",
- 'hook' => "submit_new_entry_redirect",
- 'settings' => "",
- 'priority' => 10,
- 'version' => $this->version,
- 'enabled' => "y"
- )
- )
- );
-
- $DB->query($DB->insert_string('exp_extensions',
- array(
- 'extension_id' => '',
- 'class' => "Entry_reedirect",
- 'method' => "cp_changes",
- 'hook' => "show_full_control_panel_end",
- 'settings' => "",
- 'priority' => 10,
- 'version' => $this->version,
- 'enabled' => "y"
+ $hooks = array(
+ 'weblog_standalone_insert_entry' => 'grab_return_url',
+ 'submit_new_entry_redirect' => 'redirect_location',
+ 'show_full_control_panel_end' => 'cp_changes'
+ );
+
+ foreach($hooks as $hook => $method)
+ {
+ $DB->query($DB->insert_string('exp_extensions',
+ array(
+ 'extension_id' => '',
+ 'class' => "Entry_reedirect",
+ 'method' => $method,
+ 'hook' => $hook,
+ 'settings' => "",
+ 'priority' => 10,
+ 'version' => $this->version,
+ 'enabled' => "y"
+ )
)
- )
- );
-
+ );
+ }
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
6a25859edb9038e778dacb2d6a06bca76d758824
|
Turned success message into an overlay and added a close link.
|
diff --git a/README.markdown b/README.markdown
index a698918..59f8cf5 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,16 +1,16 @@
Entry REEdirect is an ExpressionEngine extension that allows you to control, on a per-weblog basis, where authors land after publishing or updating entries in the ExpressionEngine control panel.
For each weblog you have four redirect location options for both **new entries** and **updated entries**:
- **Default Preview** - EE's built-in success screen with ugly entry preview
- **Publish Form** - new entry screen for the same weblog you just published to
- **Edit Entry** - keep editing the entry you just published or updated
- **Manage Entries** - the Edit tab, filtered to display entries from the weblog you just published to
-In all cases the author will see a "success" message for their new entry or update, along with the entry's title and an "Edit this entry" link. This success message can optionally disappear after a specified length of time.
+In all cases the author will see a "success" message for their new entry or update, along with the entry's title and an "Edit this entry" link. This success message can optionally disappear after a specified length of time, and has a "close" link as well.
The Extension Settings screen offers optional one-click setting of all of your weblogs to the same option for both new entries and updated entries.
Entries submitted via SAEFs will be be unaffected by this extension.
Entry REEdirect requires jQuery for the Control Panel (loading jQuery 1.3 or newer), and has been tested with ExpressionEngine 1.6.8.
\ No newline at end of file
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 7154f9f..84995d4 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,351 +1,415 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
- var $version = '1.0.2';
+ var $version = '1.0.3';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
switch($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if( (isset($_GET['P']) && $_GET['P'] == 'extension_settings') && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
+
// Display success messages
+ $find = array();
+ $replace = array();
+
if(isset($_GET['reedirect_entry_id']))
{
- $target = "<div id='contentNB'>";
+ // Success message goes bye-bye? If so, add the callback.
+ $auto_hide = ($this->settings['hide_success_message']) ? ',function(){
+ setTimeout(
+ function(){
+ $("div#entry_reedirect_message").slideUp();
+ }
+ ,'.($this->settings['hide_success_message']*1000).'
+ );
+ }' : '';
- $get_title = $DB->query("SELECT title FROM exp_weblog_titles WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
- $title = $get_title->row['title'];
+ $find[] = "<div id='contentNB'>";
- $message = $target.'<div id="entry_reedirect_message" class="box">'.$DSP->span('success');
- if($_GET['U'] == 'new')
- {
- $message .= $LANG->line('entry_has_been_added');
- }
- elseif($_GET['U'] == 'updated')
- {
- $message .= $LANG->line('entry_has_been_updated');
- }
-
- if($_GET['M'] != 'edit_entry')
- {
- $message .= ': '.$DSP->span_c();
- $message .= $DSP->qspan('defaultBold', $title).
- $DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
- $DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'], $LANG->line('edit_this_entry')).
- $DSP->span_c();
- }
- else
- {
- $message .= $DSP->span_c();
- }
+ $get_title = $DB->query("SELECT title FROM exp_weblog_titles
+ WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
+ $title = $get_title->row['title'];
+
+ $message = "<div id='contentNB'>
+ ".'<div id="entry_reedirect_message"><div>'.$DSP->span('success');
+ if($_GET['U'] == 'new')
+ {
+ $message .= $LANG->line('entry_has_been_added');
+ }
+ elseif($_GET['U'] == 'updated')
+ {
+ $message .= $LANG->line('entry_has_been_updated');
+ }
+
+ if($_GET['M'] != 'edit_entry')
+ {
+ $message .= ': '.$DSP->span_c();
+ $message .= $DSP->qspan('defaultBold', $title).
+ $DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
+ $DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.
+ 'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'],
+ $LANG->line('edit_this_entry')).
+ $DSP->span_c();
+ }
+ else
+ {
+ $message .= $DSP->span_c();
+ }
+
+ $message .= '<a href="#" id="reedirectClose" title="Hide this notice">×</a>'
+ .$DSP->div_c().$DSP->div_c();
- $message .= $DSP->div_c();
+ $replace[] = $message;
- $out = str_replace($target, $message, $out);
+ $find[] = '</head>';
- // Success message goes bye-bye?
- if($this->settings['hide_success_message'])
- {
- $target = '</head>';
- $js = '
+ $replace[] = '
+ <style type="text/css">
+ #entry_reedirect_message {
+ border-bottom:1px solid #CCC9A4;
+ position: fixed;
+ width: 100%;
+ left: 0;
+ top: 0;
+ display: none;
+ }
+ * html #entry_reedirect_message {
+ position: absolute;
+ }
+ #entry_reedirect_message div {
+ padding: 10px 15px;
+ background-color: rgb(252,252,222);
+ }
+ #entry_reedirect_message > div {
+ background-color: rgba(252,252,222,0.95);
+ }
+ a#reedirectClose {
+ display: block;
+ position: absolute;
+ right: 15px;
+ top: 7px;
+ padding: 0 3px;
+ border: 1px solid #CCC9A4;
+ font-size: 18px;
+ line-height: 18px;
+ color: #CCC9A4;
+ text-decoration: none;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ }
+ a#reedirectClose:hover {
+ background-color: #CCC9A4;
+ color: rgb(252,252,222);
+ }
+ </style>
+
<script type="text/javascript">
- <!-- Added by Entry REEdirect -->
- $(document).ready(function(){setTimeout(function(){$("div#entry_reedirect_message").slideUp();},'.($this->settings['hide_success_message']*1000).');});
+ <!-- Added by Entry REEdirect -->
+ $(document).ready(function(){
+ $("div#entry_reedirect_message").slideDown("normal"'.$auto_hide.');
+ $("a#reedirectClose").click(function(){
+ $("div#entry_reedirect_message").slideUp();
+ return false;
+ });
+ });
</script>
+
</head>
- ';
+ ';
+
+ $out = str_replace($find, $replace, $out);
- $out = str_replace($target, $js, $out);
- }
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "grab_return_url",
'hook' => "weblog_standalone_insert_entry",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "redirect_location",
'hook' => "submit_new_entry_redirect",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "cp_changes",
'hook' => "show_full_control_panel_end",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
a00f642a5137c49b482feb6a58ae0e4b68698d69
|
Fixed potential PHP "undefined variable" notices
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 9fd366f..7154f9f 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,351 +1,351 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.2';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
switch($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
- if($_GET['P'] == 'extension_settings' && $_GET['name'] == 'entry_reedirect')
+ if( (isset($_GET['P']) && $_GET['P'] == 'extension_settings') && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
if(isset($_GET['reedirect_entry_id']))
{
$target = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = $target.'<div id="entry_reedirect_message" class="box">'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
if($_GET['M'] != 'edit_entry')
{
$message .= ': '.$DSP->span_c();
$message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'], $LANG->line('edit_this_entry')).
$DSP->span_c();
}
else
{
$message .= $DSP->span_c();
}
$message .= $DSP->div_c();
$out = str_replace($target, $message, $out);
// Success message goes bye-bye?
if($this->settings['hide_success_message'])
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function(){setTimeout(function(){$("div#entry_reedirect_message").slideUp();},'.($this->settings['hide_success_message']*1000).');});
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
}
// May as well make the other success messages a little nicer
// (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
- if($_GET['C'] == 'edit' && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
+ if( isset($_GET['C']) && $_GET['C'] == 'edit' && isset($_GET['M']) && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
{
$target = "/<div class='success' >\s*([^<]*)\s*/";
$message = '<div class="box"><span class="success">$1</span>';
$out = preg_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "grab_return_url",
'hook' => "weblog_standalone_insert_entry",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "redirect_location",
'hook' => "submit_new_entry_redirect",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "cp_changes",
'hook' => "show_full_control_panel_end",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
9462757a9072f826cf1e2d0f19b0419b3f07651e
|
Tweaked display of default bulk-update and deletion notices. Just for fun.
|
diff --git a/README.markdown b/README.markdown
index 2d3bb90..a698918 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,16 +1,16 @@
Entry REEdirect is an ExpressionEngine extension that allows you to control, on a per-weblog basis, where authors land after publishing or updating entries in the ExpressionEngine control panel.
-For each weblog you have three redirect location options for both **new entries** and **updated entries**:
+For each weblog you have four redirect location options for both **new entries** and **updated entries**:
- **Default Preview** - EE's built-in success screen with ugly entry preview
- **Publish Form** - new entry screen for the same weblog you just published to
- **Edit Entry** - keep editing the entry you just published or updated
- **Manage Entries** - the Edit tab, filtered to display entries from the weblog you just published to
In all cases the author will see a "success" message for their new entry or update, along with the entry's title and an "Edit this entry" link. This success message can optionally disappear after a specified length of time.
-The Extension Settings screen offers optional one-click setting of all of your weblogs to the same option for both new entries and updated entries. (This feature requires that jQuery for the Control Panel be installed.)
+The Extension Settings screen offers optional one-click setting of all of your weblogs to the same option for both new entries and updated entries.
Entries submitted via SAEFs will be be unaffected by this extension.
-Entry REEdirect has been tested on ExpressionEngine 1.6.8.
\ No newline at end of file
+Entry REEdirect requires jQuery for the Control Panel (loading jQuery 1.3 or newer), and has been tested with ExpressionEngine 1.6.8.
\ No newline at end of file
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 3f78ae6..9fd366f 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,336 +1,351 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.2';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
switch($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if($_GET['P'] == 'extension_settings' && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
if(isset($_GET['reedirect_entry_id']))
{
$target = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = $target.'<div id="entry_reedirect_message" class="box">'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
- $message .= $DSP->span_c();
+
if($_GET['M'] != 'edit_entry')
{
- $message .= $DSP->qspan('',': ' . $title).
+ $message .= ': '.$DSP->span_c();
+ $message .= $DSP->qspan('defaultBold', $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'], $LANG->line('edit_this_entry')).
$DSP->span_c();
}
+ else
+ {
+ $message .= $DSP->span_c();
+ }
+
$message .= $DSP->div_c();
$out = str_replace($target, $message, $out);
// Success message goes bye-bye?
if($this->settings['hide_success_message'])
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function(){setTimeout(function(){$("div#entry_reedirect_message").slideUp();},'.($this->settings['hide_success_message']*1000).');});
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
- }
+ }
+
+ // May as well make the other success messages a little nicer
+ // (Delete and multi-entry category update. No message for multi-entry edit for some reason.)
+ if($_GET['C'] == 'edit' && ($_GET['M'] == 'delete_entries' || $_GET['M'] == 'entry_category_update'))
+ {
+ $target = "/<div class='success' >\s*([^<]*)\s*/";
+ $message = '<div class="box"><span class="success">$1</span>';
+ $out = preg_replace($target, $message, $out);
+ }
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "grab_return_url",
'hook' => "weblog_standalone_insert_entry",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "redirect_location",
'hook' => "submit_new_entry_redirect",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "cp_changes",
'hook' => "show_full_control_panel_end",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
d1b6b39e9763613f8722b021f1e9d1aa77031de1
|
Added option to hide success message after N seconds.
|
diff --git a/README.markdown b/README.markdown
index 5d9b31b..2d3bb90 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,16 +1,16 @@
Entry REEdirect is an ExpressionEngine extension that allows you to control, on a per-weblog basis, where authors land after publishing or updating entries in the ExpressionEngine control panel.
For each weblog you have three redirect location options for both **new entries** and **updated entries**:
- **Default Preview** - EE's built-in success screen with ugly entry preview
- **Publish Form** - new entry screen for the same weblog you just published to
- **Edit Entry** - keep editing the entry you just published or updated
- **Manage Entries** - the Edit tab, filtered to display entries from the weblog you just published to
-In all cases the author will see a "success" message for their new entry or update, along with the entry's title and an "Edit this entry" link.
+In all cases the author will see a "success" message for their new entry or update, along with the entry's title and an "Edit this entry" link. This success message can optionally disappear after a specified length of time.
The Extension Settings screen offers optional one-click setting of all of your weblogs to the same option for both new entries and updated entries. (This feature requires that jQuery for the Control Panel be installed.)
Entries submitted via SAEFs will be be unaffected by this extension.
Entry REEdirect has been tested on ExpressionEngine 1.6.8.
\ No newline at end of file
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index feb94d9..3f78ae6 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,343 +1,336 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
- var $version = '1.0.1';
+ var $version = '1.0.2';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
+ $settings['hide_success_message'] = '5';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
- $settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
+ $settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
- // (No access to this variable from the other, more appropriate hooks)
+ // (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
switch($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if($_GET['P'] == 'extension_settings' && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
if(isset($_GET['reedirect_entry_id']))
{
$target = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = $target.'<div id="entry_reedirect_message" class="box">'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
$message .= $DSP->span_c();
if($_GET['M'] != 'edit_entry')
{
$message .= $DSP->qspan('',': ' . $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'], $LANG->line('edit_this_entry')).
$DSP->span_c();
}
$message .= $DSP->div_c();
$out = str_replace($target, $message, $out);
-
- // Success message goes bye-bye after 5 seconds
- $target = '</head>';
- $js = '
- <script type="text/javascript">
- <!-- Added by Entry REEdirect -->
- $(document).ready(function()
- {
- setTimeout(function(){$("div#entry_reedirect_message").slideUp();},5000);
- }
- );
- </script>
- </head>
- ';
-
- $out = str_replace($target, $js, $out);
-
+ // Success message goes bye-bye?
+ if($this->settings['hide_success_message'])
+ {
+ $target = '</head>';
+ $js = '
+ <script type="text/javascript">
+ <!-- Added by Entry REEdirect -->
+ $(document).ready(function(){setTimeout(function(){$("div#entry_reedirect_message").slideUp();},'.($this->settings['hide_success_message']*1000).');});
+ </script>
+ </head>
+ ';
+
+ $out = str_replace($target, $js, $out);
+ }
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "grab_return_url",
'hook' => "weblog_standalone_insert_entry",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "redirect_location",
'hook' => "submit_new_entry_redirect",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "cp_changes",
'hook' => "show_full_control_panel_end",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
- if ($current < '1.0.1')
- {
- // Do upgrade stuff here.
- }
-
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
diff --git a/language/english/lang.entry_reedirect.php b/language/english/lang.entry_reedirect.php
index f5ad643..1e26080 100644
--- a/language/english/lang.entry_reedirect.php
+++ b/language/english/lang.entry_reedirect.php
@@ -1,11 +1,12 @@
<?php
$L = array(
'Default Preview' => 'Default Preview',
'Publish Form' => 'Publish Form',
'Edit Entry' => 'Edit Entry',
'Manage Entries' => 'Manage Entries',
'None' => 'None',
'global_new_entry_redirect' => 'Global redirect after publishing new entries:',
'global_updated_entry_redirect' => 'Global redirect after updating entries:',
+ 'hide_success_message' => 'Seconds until success message disappears (\'0\' for persistent)'
);
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
6381b18d6f744bac362ba868112f0e5cf1fd1cac
|
Success messages now disappar after 5 seconds
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index f77437d..feb94d9 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,326 +1,343 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
var $version = '1.0.1';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
'remain' => 'Edit Entry',
'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
switch($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'remain':
$location = BASE.AMP.
'C=edit'.AMP.
'M=edit_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
- // Add the message
+ // Edits to the control panel output
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if($_GET['P'] == 'extension_settings' && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
<!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
-
// Display success messages
if(isset($_GET['reedirect_entry_id']))
{
$target = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
- $message = $target.$DSP->div('box').$DSP->span('success');
+ $message = $target.'<div id="entry_reedirect_message" class="box">'.$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
$message .= $DSP->span_c();
if($_GET['M'] != 'edit_entry')
{
$message .= $DSP->qspan('',': ' . $title).
$DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
$DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'], $LANG->line('edit_this_entry')).
$DSP->span_c();
}
$message .= $DSP->div_c();
$out = str_replace($target, $message, $out);
- }
+
+
+ // Success message goes bye-bye after 5 seconds
+ $target = '</head>';
+ $js = '
+ <script type="text/javascript">
+ <!-- Added by Entry REEdirect -->
+ $(document).ready(function()
+ {
+ setTimeout(function(){$("div#entry_reedirect_message").slideUp();},5000);
+ }
+ );
+ </script>
+ </head>
+ ';
+
+ $out = str_replace($target, $js, $out);
+
+ }
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "grab_return_url",
'hook' => "weblog_standalone_insert_entry",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "redirect_location",
'hook' => "submit_new_entry_redirect",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "cp_changes",
'hook' => "show_full_control_panel_end",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
if ($current < '1.0.1')
{
// Do upgrade stuff here.
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
1a831482d190f74fc6c6dd6f608280e1e9ffe61f
|
Added option to keep editing the entry you just published or updated
|
diff --git a/README.markdown b/README.markdown
index 7005302..5d9b31b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,15 +1,16 @@
Entry REEdirect is an ExpressionEngine extension that allows you to control, on a per-weblog basis, where authors land after publishing or updating entries in the ExpressionEngine control panel.
For each weblog you have three redirect location options for both **new entries** and **updated entries**:
- **Default Preview** - EE's built-in success screen with ugly entry preview
- **Publish Form** - new entry screen for the same weblog you just published to
-- **Edit Entries** - the Edit tab, filtered to display entries from the weblog you just published to
+- **Edit Entry** - keep editing the entry you just published or updated
+- **Manage Entries** - the Edit tab, filtered to display entries from the weblog you just published to
In all cases the author will see a "success" message for their new entry or update, along with the entry's title and an "Edit this entry" link.
The Extension Settings screen offers optional one-click setting of all of your weblogs to the same option for both new entries and updated entries. (This feature requires that jQuery for the Control Panel be installed.)
Entries submitted via SAEFs will be be unaffected by this extension.
Entry REEdirect has been tested on ExpressionEngine 1.6.8.
\ No newline at end of file
|
blodt/ext.entry_reedirect.ee_addon
|
4fca82aaa6cf4c99d790b9098807df26e89db4ff
|
Added option to keep editing the entry after publish or update
|
diff --git a/extensions/ext.entry_reedirect.php b/extensions/ext.entry_reedirect.php
index 241e836..f77437d 100644
--- a/extensions/ext.entry_reedirect.php
+++ b/extensions/ext.entry_reedirect.php
@@ -1,310 +1,326 @@
<?php
if(!defined('EXT'))
{
exit('Invalid file request');
}
class Entry_reedirect
{
var $settings = array();
var $name = 'Entry REEdirect';
- var $version = '1.0.0';
+ var $version = '1.0.1';
var $description = 'Choose where users are redirected after publishing/updating new entries in the control panel.';
var $settings_exist = 'y';
var $docs_url = '';
// -------------------------------
// Constructor - Extensions use this for settings
// -------------------------------
function Entry_reedirect($settings='')
{
$this->settings = $settings;
}
// END
// --------------------------------
// Settings
// --------------------------------
function settings()
{
global $DB, $LANG, $PREFS;
$settings = array();
$locations = array(
'default' => 'Default Preview',
'new' => 'Publish Form',
- 'edit' => 'Edit Entries'
+ 'remain' => 'Edit Entry',
+ 'edit' => 'Manage Entries'
);
$global_locations = $locations;
$global_locations['none'] = 'None';
$settings['global_new_entry_redirect'] = array('r', $global_locations, 'none');
$settings['global_updated_entry_redirect'] = array('r', $global_locations, 'none');
$query = $DB->query("SELECT blog_title, weblog_id FROM exp_weblogs ORDER BY blog_title ASC");
if($query->num_rows > 0)
{
foreach($query->result as $value)
{
$LANG->language['new_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after publishing new " . strtoupper($value['blog_title']) . ' entries:';
$settings['new_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default');
$LANG->language['updated_redirect_weblog_id_'.$value['weblog_id']] = "Redirect after updating " . strtoupper($value['blog_title']) . ' entries:';
$settings['updated_redirect_weblog_id_'.$value['weblog_id']] = array('s', $locations, 'default'); }
}
return $settings;
}
// END
// --------------------------------
// Put $_POST['return_url'] into a global variable so we can access it later
// (No access to this variable from the other, more appropriate hooks)
// --------------------------------
function grab_return_url() {
global $saef_return_url;
$saef_return_url = ($_POST['return_url']) ? $_POST['return_url'] : '';
}
// END
// --------------------------------
// Do the redirect
// --------------------------------
function redirect_location($entry_id, $data, $cp_call) {
if($cp_call == TRUE)
{
$type = ($_POST['entry_id']) ? 'updated' : 'new';
switch($this->settings[$type.'_redirect_weblog_id_'.$data['weblog_id']])
{
case 'new':
$location = BASE.AMP.
'C=publish'.AMP.
'M=entry_form'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
+ case 'remain':
+ $location = BASE.AMP.
+ 'C=edit'.AMP.
+ 'M=edit_entry'.AMP.
+ 'weblog_id='.$data['weblog_id'].AMP.
+ 'entry_id='.$entry_id.AMP.
+ 'reedirect_entry_id='.$entry_id.AMP.
+ 'U='.$type;
+ break;
case 'edit':
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entries'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'reedirect_entry_id='.$entry_id.AMP.
'U='.$type;
break;
default:
$location = BASE.AMP.
'C=edit'.AMP.
'M=view_entry'.AMP.
'weblog_id='.$data['weblog_id'].AMP.
'entry_id='.$entry_id.AMP.
'U='.$type;
}
}
else
{
global $FNS, $saef_return_url;
$FNS->template_type = 'webpage';
$location = ($saef_return_url == '') ? $FNS->fetch_site_index() : $FNS->create_url($saef_return_url, 1, 1);
}
return $location;
}
// END
// --------------------------------
// Add the message
// --------------------------------
function cp_changes($out) {
global $DB, $EXT, $DSP, $LANG;
if ($EXT->last_call !== FALSE)
{
$out = $EXT->last_call;
}
// Add jQuery to extension settings page
if($_GET['P'] == 'extension_settings' && $_GET['name'] == 'entry_reedirect')
{
$target = '</head>';
$js = '
<script type="text/javascript">
+ <!-- Added by Entry REEdirect -->
$(document).ready(function()
{
if($("input[type=radio][name=global_new_entry_redirect]:checked").val() != "none")
{
$("select[name^=new_redirect]").attr("disabled", "disabled");
}
if($("input[type=radio][name=global_updated_entry_redirect]:checked").val() != "none")
{
$("select[name^=updated_redirect]").attr("disabled", "disabled");
}
$("input[type=radio][name=global_new_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=new_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=new_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value!=none]").click(function(){
var setValue = $(this).val();
$("select[name^=updated_redirect] option[value=" + setValue + "]").attr("selected", "selected");
$("select[name^=updated_redirect]").attr("disabled", "disabled");
});
$("input[type=radio][name=global_new_entry_redirect][value=none]").click(function(){
$("select[name^=new_redirect]").removeAttr("disabled");
});
$("input[type=radio][name=global_updated_entry_redirect][value=none]").click(function(){
$("select[name^=updated_redirect]").removeAttr("disabled");
});
$("form[name=settings_entry_reedirect]").submit(function(){
$("select[name*=redirect_weblog_id]").removeAttr("disabled");
});
}
);
</script>
</head>
';
$out = str_replace($target, $js, $out);
}
// Display success messages
if(isset($_GET['reedirect_entry_id']))
{
$target = "<div id='contentNB'>";
$get_title = $DB->query("SELECT title FROM exp_weblog_titles WHERE entry_id = " . $DB->escape_str($_GET['reedirect_entry_id']) . " LIMIT 1");
$title = $get_title->row['title'];
$message = $target.$DSP->div('box').$DSP->span('success');
if($_GET['U'] == 'new')
{
$message .= $LANG->line('entry_has_been_added');
}
elseif($_GET['U'] == 'updated')
{
$message .= $LANG->line('entry_has_been_updated');
}
- $message .= $DSP->span_c().$DSP->qspan('',': ' . $title).
- $DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
- $DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'], $LANG->line('edit_this_entry')).
- $DSP->span_c().$DSP->div_c();
+ $message .= $DSP->span_c();
+ if($_GET['M'] != 'edit_entry')
+ {
+ $message .= $DSP->qspan('',': ' . $title).
+ $DSP->span('defaultSmall').$DSP->qspan('defaultLight', ' | ').
+ $DSP->anchor(BASE.AMP.'C=edit'.AMP.'M=edit_entry'.AMP.'weblog_id='.$_GET['weblog_id'].AMP.'entry_id='.$_GET['reedirect_entry_id'], $LANG->line('edit_this_entry')).
+ $DSP->span_c();
+ }
+ $message .= $DSP->div_c();
$out = str_replace($target, $message, $out);
}
return $out;
}
// END
// --------------------------------
// Activate Extension
// --------------------------------
function activate_extension()
{
global $DB;
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "grab_return_url",
'hook' => "weblog_standalone_insert_entry",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "redirect_location",
'hook' => "submit_new_entry_redirect",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
$DB->query($DB->insert_string('exp_extensions',
array(
'extension_id' => '',
'class' => "Entry_reedirect",
'method' => "cp_changes",
'hook' => "show_full_control_panel_end",
'settings' => "",
'priority' => 10,
'version' => $this->version,
'enabled' => "y"
)
)
);
}
// END
// --------------------------------
// Update Extension
// --------------------------------
function update_extension($current='')
{
global $DB;
if ($current == '' OR $current == $this->version)
{
return FALSE;
}
if ($current < '1.0.1')
{
// Do upgrade stuff here.
}
$DB->query("UPDATE exp_extensions
SET version = '".$DB->escape_str($this->version)."'
WHERE class = 'Entry_reedirect'");
}
// END
// --------------------------------
// Disable Extension
// --------------------------------
function disable_extension()
{
global $DB;
$DB->query("DELETE FROM exp_extensions WHERE class = 'Entry_reedirect'");
}
// END
}
// END CLASS
\ No newline at end of file
diff --git a/language/english/lang.entry_reedirect.php b/language/english/lang.entry_reedirect.php
index 46dd1a5..f5ad643 100644
--- a/language/english/lang.entry_reedirect.php
+++ b/language/english/lang.entry_reedirect.php
@@ -1,10 +1,11 @@
<?php
$L = array(
'Default Preview' => 'Default Preview',
'Publish Form' => 'Publish Form',
- 'Edit Entries' => 'Edit Entries',
+ 'Edit Entry' => 'Edit Entry',
+ 'Manage Entries' => 'Manage Entries',
'None' => 'None',
'global_new_entry_redirect' => 'Global redirect after publishing new entries:',
'global_updated_entry_redirect' => 'Global redirect after updating entries:',
);
\ No newline at end of file
|
michaelmontano/snowflakepy
|
5ffd0931df7ce2ba2e1d19d17d8d447f77e39060
|
adding BSD license
|
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..09da1d6
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2011, BackType, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+ disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of the original authors nor the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
michaelmontano/snowflakepy
|
65cce2bdaa2df9e8f2c3ba6b29494ceed3cecdf3
|
adding get_timestamp_from_id
|
diff --git a/src/idworker.py b/src/idworker.py
index b10e43c..5ce5d97 100644
--- a/src/idworker.py
+++ b/src/idworker.py
@@ -1,84 +1,87 @@
import time
TWEPOCH = 1288834974657
WORKER_ID_BITS = 5
DATACENTER_ID_BITS = 5
MAX_WORKER_ID = (1 << WORKER_ID_BITS) - 1
MAX_DATACENTER_ID = (1 << DATACENTER_ID_BITS) - 1
SEQUENCE_BITS = 12
WORKER_ID_SHIFT = SEQUENCE_BITS
DATACENTER_ID_SHIFT = SEQUENCE_BITS + WORKER_ID_BITS
TIMESTAMP_SHIFT = SEQUENCE_BITS + WORKER_ID_BITS + DATACENTER_ID_BITS
SEQUENCE_MASK = (1 << SEQUENCE_BITS)
def gen_id(timestamp, datacenter_id, worker_id, sequence):
return (timestamp - TWEPOCH) << TIMESTAMP_SHIFT | \
(datacenter_id << DATACENTER_ID_SHIFT) | \
(worker_id << WORKER_ID_SHIFT) | \
sequence
+def get_timestamp_from_id(id_):
+ return (id_ >> TIMESTAMP_SHIFT) + TWEPOCH
+
class IdWorker(object):
def __init__(self, worker_id, datacenter_id):
assert worker_id >= 0 and worker_id <= MAX_WORKER_ID
assert datacenter_id >= 0 and datacenter_id <= MAX_DATACENTER_ID
self.worker_id = worker_id
self.datacenter_id = datacenter_id
self.sequence = 0
self.last_timestamp = -1
print "worker starting. timestamp left shift %d, datacenter_id bits %d, worker_id bits %d, sequence bits %d, worker_id %d" \
%(TIMESTAMP_SHIFT, DATACENTER_ID_BITS, WORKER_ID_BITS, SEQUENCE_BITS, self.worker_id)
def get_id(self):
return self.next_id()
def get_worker_id(self):
return self.worker_id
def get_datacenter_id(self):
return self.datacenter_id
def get_timestamp(self):
return int(time.time()*1000)
def next_id(self):
timestamp = self.time_gen()
if self.last_timestamp > timestamp:
print "clock is moving backwards. Rejecting requests until %d" %self.last_timestamp
raise Exception, "Clock moved backwards. Refusing to generate id for %d milliseconds" %(self.last_timestamp - timestamp)
if self.last_timestamp == timestamp:
self.sequence = (self.sequence + 1) % SEQUENCE_MASK
if self.sequence == 0:
timestamp = self.til_next_millis(self.last_timestamp)
else:
self.sequence = 0
self.last_timestamp = timestamp
return gen_id(timestamp, self.datacenter_id, self.worker_id, self.sequence)
def til_next_millis(self, last_timestamp):
timestamp = self.time_gen()
while last_timestamp == timestamp:
timestamp = self.time_gen()
return timestamp
def time_gen(self):
return int(time.time()*1000)
class WakingIdWorker(IdWorker):
def __init__(self, *args, **kwargs):
super(WakingIdWorker, self).__init__(*args, **kwargs)
self.sleeps = 0
def til_next_millis(self, last_timestamp):
timestamp = self.time_gen()
while last_timestamp == timestamp:
timestamp = self.time_gen()
self.sleeps += 1
return timestamp
\ No newline at end of file
diff --git a/test/test_idworker.py b/test/test_idworker.py
index 21c8a96..84cf2cb 100644
--- a/test/test_idworker.py
+++ b/test/test_idworker.py
@@ -1,96 +1,104 @@
import sys
sys.path = ['..'] + sys.path
from src import idworker
import time
WORKER_MASK = 0x000000000001F000
DATACENTER_MASK = 0x00000000003E0000
TIMESTAMP_MASK = 0xFFFFFFFFFFC00000
def test_generate_id():
worker = idworker.IdWorker(1, 1)
tid = worker.next_id()
assert tid > 0
def test_generate_timestamp():
worker = idworker.IdWorker(1, 1)
t = int(time.time()*1000)
assert (worker.get_timestamp() - t) < 50
def test_get_worker_id():
worker = idworker.IdWorker(1, 1)
assert worker.get_worker_id() == 1
def test_get_datacenter_id():
worker = idworker.IdWorker(1, 1)
assert worker.get_datacenter_id() == 1
def test_mask_worker_id():
worker_id = 0x1F
datacenter_id = 0
worker = idworker.IdWorker(worker_id, datacenter_id)
tid = worker.next_id()
assert (tid & WORKER_MASK) >> idworker.WORKER_ID_SHIFT == worker_id
def test_mask_datacenter_id():
worker_id = 0
datacenter_id = 0x1F
worker = idworker.IdWorker(worker_id, datacenter_id)
tid = worker.next_id()
assert (tid & DATACENTER_MASK) >> idworker.DATACENTER_ID_SHIFT == datacenter_id
def test_mask_timestamp():
t = int(time.time()*1000)
worker_id = 1
datacenter_id = 1
worker = idworker.IdWorker(worker_id, datacenter_id)
tid = worker.next_id()
assert ((tid & TIMESTAMP_MASK) >> idworker.TIMESTAMP_SHIFT) + idworker.TWEPOCH >= t
def test_roll_over_sequence_id():
worker_id = 4
datacenter_id = 4
worker = idworker.IdWorker(worker_id, datacenter_id)
start_sequence = 0xFFFFFF-20
end_sequence = 0xFFFFFF+20
worker.sequence = start_sequence
for i in range(start_sequence, end_sequence + 1):
tid = worker.next_id()
assert (tid & WORKER_MASK) >> idworker.WORKER_ID_SHIFT == worker_id
def test_generate_increasing_ids():
worker = idworker.IdWorker(1, 1)
last_id = 0
for i in range(100):
tid = worker.next_id()
assert tid > last_id
last_id = tid
def test_generate_one_million_ids_quickly():
worker = idworker.IdWorker(31, 31)
t1 = int(time.time()*1000)
for i in range(100000):
tid = worker.next_id()
assert tid
t2 = int(time.time()*1000)
rate = 100000.0/(t2 - t1)
print 'generated 100000 ids in %d ms, or %s ids/ms' %(t2 - t1, rate)
assert rate > 100
def test_sleep_on_same_id():
worker = idworker.WakingIdWorker(1, 1)
worker.sequence = 4095
tid1 = worker.next_id()
worker.sequence = 4095
tid2 = worker.next_id()
assert worker.sleeps > 0
def test_generate_unique_ids():
worker = idworker.IdWorker(31, 31)
s = set()
n = 200000
for i in range(n):
tid = worker.next_id()
s.add(tid)
- assert len(s) == n
\ No newline at end of file
+ assert len(s) == n
+
+def test_get_timestamp_from_id():
+ worker = idworker.WakingIdWorker(1, 1)
+ ts = worker.get_timestamp()
+ id_ = idworker.gen_id(ts, 0, 0, 0)
+ id_ts = idworker.get_timestamp_from_id(id_)
+ print ts, id_ts
+ assert id_ts == ts
\ No newline at end of file
|
michaelmontano/snowflakepy
|
fe2f90ca24c1ff102b4e15a7a64d375ba194b2cb
|
ignore pyc files
|
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
|
michaelmontano/snowflakepy
|
59adc3ab7ed57cdf7e0a206f19321ffa03152167
|
adding examples to print_usage for server and client
|
diff --git a/src/snowflakeserver.py b/src/snowflakeserver.py
index 1f1f4be..7b30208 100644
--- a/src/snowflakeserver.py
+++ b/src/snowflakeserver.py
@@ -1,52 +1,53 @@
import sys
sys.path = ['..'] + sys.path
import zope
from twisted.internet import reactor
from thrift.transport import TSocket
from thrift.transport import TTransport
from thrift.transport import TTwisted
from thrift.protocol import TBinaryProtocol
from lib.genpy.snowflake import Snowflake
from lib.genpy.snowflake.ttypes import *
import idworker
class SnowflakeServer(object):
zope.interface.implements(Snowflake.Iface)
def __init__(self, worker_id, datacenter_id):
self.worker = idworker.IdWorker(worker_id, datacenter_id)
def get_worker_id(self):
return self.worker.get_worker_id()
def get_datacenter_id(self):
return self.worker.get_datacenter_id()
def get_timestamp(self):
return self.worker.get_timestamp()
def get_id(self):
return self.worker.get_id()
def print_usage():
print 'python snowflakeserver.py <port> <worker_id> <datacenter_id>'
+ print 'e.g. python snowflakeserver.py 1111 1 1'
def main():
if len(sys.argv) != 4:
return print_usage()
port = int(sys.argv[1])
worker_id = int(sys.argv[2])
datacenter_id = int(sys.argv[3])
reactor.listenTCP(port, TTwisted.ThriftServerFactory(
processor=Snowflake.Processor(SnowflakeServer(worker_id, datacenter_id)),
iprot_factory=TBinaryProtocol.TBinaryProtocolFactory()
))
reactor.run()
if __name__ == '__main__':
sys.exit(main())
\ No newline at end of file
diff --git a/test/test_client.py b/test/test_client.py
index d389a5c..c9d9f09 100644
--- a/test/test_client.py
+++ b/test/test_client.py
@@ -1,40 +1,41 @@
import sys
sys.path = ['..'] + sys.path
from thrift import Thrift
from thrift.transport import TSocket
from thrift.transport import TTransport
from thrift.protocol import TBinaryProtocol
from lib.genpyblocking.snowflake import Snowflake
from lib.genpyblocking.snowflake.ttypes import *
def print_usage():
print 'python test_client.py <port> <get_worker_id|get_datacenter_id|get_timestamp|get_id>'
+ print 'e.g. python test_client.py 1111 get_id'
def main():
if len(sys.argv) != 3:
return print_usage()
port = int(sys.argv[1])
service = sys.argv[2]
transport = TSocket.TSocket('localhost', port)
transport = TTransport.TFramedTransport(transport)
prot = TBinaryProtocol.TBinaryProtocol(transport)
client = Snowflake.Client(prot)
transport.open()
if service == 'get_worker_id':
print client.get_worker_id()
elif service == 'get_datacenter_id':
print client.get_datacenter_id()
elif service == 'get_timestamp':
print client.get_timestamp()
elif service == 'get_id':
print client.get_id()
else:
print_usage()
if __name__ == '__main__':
sys.exit(main())
\ No newline at end of file
|
michaelmontano/snowflakepy
|
810a33a756f5fc7a27c0aaee901532c1ecb97501
|
snowflakeserver and test_client
|
diff --git a/src/snowflakeserver.py b/src/snowflakeserver.py
new file mode 100644
index 0000000..1f1f4be
--- /dev/null
+++ b/src/snowflakeserver.py
@@ -0,0 +1,52 @@
+import sys
+sys.path = ['..'] + sys.path
+
+import zope
+from twisted.internet import reactor
+
+from thrift.transport import TSocket
+from thrift.transport import TTransport
+from thrift.transport import TTwisted
+from thrift.protocol import TBinaryProtocol
+
+from lib.genpy.snowflake import Snowflake
+from lib.genpy.snowflake.ttypes import *
+
+import idworker
+
+class SnowflakeServer(object):
+ zope.interface.implements(Snowflake.Iface)
+
+ def __init__(self, worker_id, datacenter_id):
+ self.worker = idworker.IdWorker(worker_id, datacenter_id)
+
+ def get_worker_id(self):
+ return self.worker.get_worker_id()
+
+ def get_datacenter_id(self):
+ return self.worker.get_datacenter_id()
+
+ def get_timestamp(self):
+ return self.worker.get_timestamp()
+
+ def get_id(self):
+ return self.worker.get_id()
+
+def print_usage():
+ print 'python snowflakeserver.py <port> <worker_id> <datacenter_id>'
+
+def main():
+ if len(sys.argv) != 4:
+ return print_usage()
+
+ port = int(sys.argv[1])
+ worker_id = int(sys.argv[2])
+ datacenter_id = int(sys.argv[3])
+ reactor.listenTCP(port, TTwisted.ThriftServerFactory(
+ processor=Snowflake.Processor(SnowflakeServer(worker_id, datacenter_id)),
+ iprot_factory=TBinaryProtocol.TBinaryProtocolFactory()
+ ))
+ reactor.run()
+
+if __name__ == '__main__':
+ sys.exit(main())
\ No newline at end of file
diff --git a/test/test_client.py b/test/test_client.py
new file mode 100644
index 0000000..d389a5c
--- /dev/null
+++ b/test/test_client.py
@@ -0,0 +1,40 @@
+import sys
+sys.path = ['..'] + sys.path
+
+from thrift import Thrift
+from thrift.transport import TSocket
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol
+
+from lib.genpyblocking.snowflake import Snowflake
+from lib.genpyblocking.snowflake.ttypes import *
+
+def print_usage():
+ print 'python test_client.py <port> <get_worker_id|get_datacenter_id|get_timestamp|get_id>'
+
+def main():
+ if len(sys.argv) != 3:
+ return print_usage()
+
+ port = int(sys.argv[1])
+ service = sys.argv[2]
+
+ transport = TSocket.TSocket('localhost', port)
+ transport = TTransport.TFramedTransport(transport)
+ prot = TBinaryProtocol.TBinaryProtocol(transport)
+ client = Snowflake.Client(prot)
+ transport.open()
+
+ if service == 'get_worker_id':
+ print client.get_worker_id()
+ elif service == 'get_datacenter_id':
+ print client.get_datacenter_id()
+ elif service == 'get_timestamp':
+ print client.get_timestamp()
+ elif service == 'get_id':
+ print client.get_id()
+ else:
+ print_usage()
+
+if __name__ == '__main__':
+ sys.exit(main())
\ No newline at end of file
|
michaelmontano/snowflakepy
|
5ee5f91913f7d77c7e5d8eff359d33559d7a7c98
|
don't use relative imports, instead add .. to path
|
diff --git a/test/test_idworker.py b/test/test_idworker.py
index d0acf33..21c8a96 100644
--- a/test/test_idworker.py
+++ b/test/test_idworker.py
@@ -1,93 +1,96 @@
-from ..src import idworker
+import sys
+sys.path = ['..'] + sys.path
+
+from src import idworker
import time
WORKER_MASK = 0x000000000001F000
DATACENTER_MASK = 0x00000000003E0000
TIMESTAMP_MASK = 0xFFFFFFFFFFC00000
def test_generate_id():
worker = idworker.IdWorker(1, 1)
tid = worker.next_id()
assert tid > 0
def test_generate_timestamp():
worker = idworker.IdWorker(1, 1)
t = int(time.time()*1000)
assert (worker.get_timestamp() - t) < 50
def test_get_worker_id():
worker = idworker.IdWorker(1, 1)
assert worker.get_worker_id() == 1
def test_get_datacenter_id():
worker = idworker.IdWorker(1, 1)
assert worker.get_datacenter_id() == 1
def test_mask_worker_id():
worker_id = 0x1F
datacenter_id = 0
worker = idworker.IdWorker(worker_id, datacenter_id)
tid = worker.next_id()
assert (tid & WORKER_MASK) >> idworker.WORKER_ID_SHIFT == worker_id
def test_mask_datacenter_id():
worker_id = 0
datacenter_id = 0x1F
worker = idworker.IdWorker(worker_id, datacenter_id)
tid = worker.next_id()
assert (tid & DATACENTER_MASK) >> idworker.DATACENTER_ID_SHIFT == datacenter_id
def test_mask_timestamp():
t = int(time.time()*1000)
worker_id = 1
datacenter_id = 1
worker = idworker.IdWorker(worker_id, datacenter_id)
tid = worker.next_id()
assert ((tid & TIMESTAMP_MASK) >> idworker.TIMESTAMP_SHIFT) + idworker.TWEPOCH >= t
def test_roll_over_sequence_id():
worker_id = 4
datacenter_id = 4
worker = idworker.IdWorker(worker_id, datacenter_id)
start_sequence = 0xFFFFFF-20
end_sequence = 0xFFFFFF+20
worker.sequence = start_sequence
for i in range(start_sequence, end_sequence + 1):
tid = worker.next_id()
assert (tid & WORKER_MASK) >> idworker.WORKER_ID_SHIFT == worker_id
def test_generate_increasing_ids():
worker = idworker.IdWorker(1, 1)
last_id = 0
for i in range(100):
tid = worker.next_id()
assert tid > last_id
last_id = tid
def test_generate_one_million_ids_quickly():
worker = idworker.IdWorker(31, 31)
t1 = int(time.time()*1000)
for i in range(100000):
tid = worker.next_id()
assert tid
t2 = int(time.time()*1000)
rate = 100000.0/(t2 - t1)
print 'generated 100000 ids in %d ms, or %s ids/ms' %(t2 - t1, rate)
assert rate > 100
def test_sleep_on_same_id():
worker = idworker.WakingIdWorker(1, 1)
worker.sequence = 4095
tid1 = worker.next_id()
worker.sequence = 4095
tid2 = worker.next_id()
assert worker.sleeps > 0
def test_generate_unique_ids():
worker = idworker.IdWorker(31, 31)
s = set()
n = 200000
for i in range(n):
tid = worker.next_id()
s.add(tid)
assert len(s) == n
\ No newline at end of file
|
michaelmontano/snowflakepy
|
38d5a9e02b44ac8a404f43766a0871abf0d1b4bb
|
python thrift libraries (blocking and non-blocking using Twisted)
|
diff --git a/genthrift.sh b/genthrift.sh
new file mode 100644
index 0000000..da6297c
--- /dev/null
+++ b/genthrift.sh
@@ -0,0 +1,4 @@
+rm -rf lib/genpyblocking rm -rf lib/genpy
+thrift --gen py --gen py:twisted thrift/snowflake.thrift
+mv gen-py lib/genpyblocking
+mv gen-py.twisted lib/genpy
\ No newline at end of file
diff --git a/lib/__init__.py b/lib/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/genpy/__init__.py b/lib/genpy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/genpy/snowflake/Snowflake-remote b/lib/genpy/snowflake/Snowflake-remote
new file mode 100755
index 0000000..127e837
--- /dev/null
+++ b/lib/genpy/snowflake/Snowflake-remote
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+import sys
+import pprint
+from urlparse import urlparse
+from thrift.transport import TTransport
+from thrift.transport import TSocket
+from thrift.transport import THttpClient
+from thrift.protocol import TBinaryProtocol
+
+import Snowflake
+from ttypes import *
+
+if len(sys.argv) <= 1 or sys.argv[1] == '--help':
+ print ''
+ print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
+ print ''
+ print 'Functions:'
+ print ' i64 get_worker_id()'
+ print ' i64 get_datacenter_id()'
+ print ' i64 get_timestamp()'
+ print ' i64 get_id()'
+ print ''
+ sys.exit(0)
+
+pp = pprint.PrettyPrinter(indent = 2)
+host = 'localhost'
+port = 9090
+uri = ''
+framed = False
+http = False
+argi = 1
+
+if sys.argv[argi] == '-h':
+ parts = sys.argv[argi+1].split(':')
+ host = parts[0]
+ port = int(parts[1])
+ argi += 2
+
+if sys.argv[argi] == '-u':
+ url = urlparse(sys.argv[argi+1])
+ parts = url[1].split(':')
+ host = parts[0]
+ if len(parts) > 1:
+ port = int(parts[1])
+ else:
+ port = 80
+ uri = url[2]
+ http = True
+ argi += 2
+
+if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
+ framed = True
+ argi += 1
+
+cmd = sys.argv[argi]
+args = sys.argv[argi+1:]
+
+if http:
+ transport = THttpClient.THttpClient(host, port, uri)
+else:
+ socket = TSocket.TSocket(host, port)
+ if framed:
+ transport = TTransport.TFramedTransport(socket)
+ else:
+ transport = TTransport.TBufferedTransport(socket)
+protocol = TBinaryProtocol.TBinaryProtocol(transport)
+client = Snowflake.Client(protocol)
+transport.open()
+
+if cmd == 'get_worker_id':
+ if len(args) != 0:
+ print 'get_worker_id requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_worker_id())
+
+elif cmd == 'get_datacenter_id':
+ if len(args) != 0:
+ print 'get_datacenter_id requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_datacenter_id())
+
+elif cmd == 'get_timestamp':
+ if len(args) != 0:
+ print 'get_timestamp requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_timestamp())
+
+elif cmd == 'get_id':
+ if len(args) != 0:
+ print 'get_id requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_id())
+
+transport.close()
diff --git a/lib/genpy/snowflake/Snowflake.py b/lib/genpy/snowflake/Snowflake.py
new file mode 100644
index 0000000..60ac546
--- /dev/null
+++ b/lib/genpy/snowflake/Snowflake.py
@@ -0,0 +1,621 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+from ttypes import *
+from thrift.Thrift import TProcessor
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol
+try:
+ from thrift.protocol import fastbinary
+except:
+ fastbinary = None
+
+from zope.interface import Interface, implements
+from twisted.internet import defer
+from thrift.transport import TTwisted
+
+class Iface(Interface):
+ def get_worker_id():
+ pass
+
+ def get_datacenter_id():
+ pass
+
+ def get_timestamp():
+ pass
+
+ def get_id():
+ pass
+
+
+class Client:
+ implements(Iface)
+
+ def __init__(self, transport, oprot_factory):
+ self._transport = transport
+ self._oprot_factory = oprot_factory
+ self._seqid = 0
+ self._reqs = {}
+
+ def get_worker_id(self, ):
+ self._seqid += 1
+ d = self._reqs[self._seqid] = defer.Deferred()
+ self.send_get_worker_id()
+ return d
+
+ def send_get_worker_id(self, ):
+ oprot = self._oprot_factory.getProtocol(self._transport)
+ oprot.writeMessageBegin('get_worker_id', TMessageType.CALL, self._seqid)
+ args = get_worker_id_args()
+ args.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def recv_get_worker_id(self, iprot, mtype, rseqid):
+ d = self._reqs.pop(rseqid)
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ return d.errback(x)
+ result = get_worker_id_result()
+ result.read(iprot)
+ iprot.readMessageEnd()
+ if result.success != None:
+ return d.callback(result.success)
+ return d.errback(TApplicationException(TApplicationException.MISSING_RESULT, "get_worker_id failed: unknown result"))
+
+ def get_datacenter_id(self, ):
+ self._seqid += 1
+ d = self._reqs[self._seqid] = defer.Deferred()
+ self.send_get_datacenter_id()
+ return d
+
+ def send_get_datacenter_id(self, ):
+ oprot = self._oprot_factory.getProtocol(self._transport)
+ oprot.writeMessageBegin('get_datacenter_id', TMessageType.CALL, self._seqid)
+ args = get_datacenter_id_args()
+ args.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def recv_get_datacenter_id(self, iprot, mtype, rseqid):
+ d = self._reqs.pop(rseqid)
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ return d.errback(x)
+ result = get_datacenter_id_result()
+ result.read(iprot)
+ iprot.readMessageEnd()
+ if result.success != None:
+ return d.callback(result.success)
+ return d.errback(TApplicationException(TApplicationException.MISSING_RESULT, "get_datacenter_id failed: unknown result"))
+
+ def get_timestamp(self, ):
+ self._seqid += 1
+ d = self._reqs[self._seqid] = defer.Deferred()
+ self.send_get_timestamp()
+ return d
+
+ def send_get_timestamp(self, ):
+ oprot = self._oprot_factory.getProtocol(self._transport)
+ oprot.writeMessageBegin('get_timestamp', TMessageType.CALL, self._seqid)
+ args = get_timestamp_args()
+ args.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def recv_get_timestamp(self, iprot, mtype, rseqid):
+ d = self._reqs.pop(rseqid)
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ return d.errback(x)
+ result = get_timestamp_result()
+ result.read(iprot)
+ iprot.readMessageEnd()
+ if result.success != None:
+ return d.callback(result.success)
+ return d.errback(TApplicationException(TApplicationException.MISSING_RESULT, "get_timestamp failed: unknown result"))
+
+ def get_id(self, ):
+ self._seqid += 1
+ d = self._reqs[self._seqid] = defer.Deferred()
+ self.send_get_id()
+ return d
+
+ def send_get_id(self, ):
+ oprot = self._oprot_factory.getProtocol(self._transport)
+ oprot.writeMessageBegin('get_id', TMessageType.CALL, self._seqid)
+ args = get_id_args()
+ args.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def recv_get_id(self, iprot, mtype, rseqid):
+ d = self._reqs.pop(rseqid)
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ return d.errback(x)
+ result = get_id_result()
+ result.read(iprot)
+ iprot.readMessageEnd()
+ if result.success != None:
+ return d.callback(result.success)
+ return d.errback(TApplicationException(TApplicationException.MISSING_RESULT, "get_id failed: unknown result"))
+
+
+class Processor(TProcessor):
+ implements(Iface)
+
+ def __init__(self, handler):
+ self._handler = Iface(handler)
+ self._processMap = {}
+ self._processMap["get_worker_id"] = Processor.process_get_worker_id
+ self._processMap["get_datacenter_id"] = Processor.process_get_datacenter_id
+ self._processMap["get_timestamp"] = Processor.process_get_timestamp
+ self._processMap["get_id"] = Processor.process_get_id
+
+ def process(self, iprot, oprot):
+ (name, type, seqid) = iprot.readMessageBegin()
+ if name not in self._processMap:
+ iprot.skip(TType.STRUCT)
+ iprot.readMessageEnd()
+ x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))
+ oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)
+ x.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+ return defer.succeed(None)
+ else:
+ return self._processMap[name](self, seqid, iprot, oprot)
+
+ def process_get_worker_id(self, seqid, iprot, oprot):
+ args = get_worker_id_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_worker_id_result()
+ d = defer.maybeDeferred(self._handler.get_worker_id, )
+ d.addCallback(self.write_results_success_get_worker_id, result, seqid, oprot)
+ return d
+
+ def write_results_success_get_worker_id(self, success, result, seqid, oprot):
+ result.success = success
+ oprot.writeMessageBegin("get_worker_id", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_get_datacenter_id(self, seqid, iprot, oprot):
+ args = get_datacenter_id_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_datacenter_id_result()
+ d = defer.maybeDeferred(self._handler.get_datacenter_id, )
+ d.addCallback(self.write_results_success_get_datacenter_id, result, seqid, oprot)
+ return d
+
+ def write_results_success_get_datacenter_id(self, success, result, seqid, oprot):
+ result.success = success
+ oprot.writeMessageBegin("get_datacenter_id", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_get_timestamp(self, seqid, iprot, oprot):
+ args = get_timestamp_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_timestamp_result()
+ d = defer.maybeDeferred(self._handler.get_timestamp, )
+ d.addCallback(self.write_results_success_get_timestamp, result, seqid, oprot)
+ return d
+
+ def write_results_success_get_timestamp(self, success, result, seqid, oprot):
+ result.success = success
+ oprot.writeMessageBegin("get_timestamp", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_get_id(self, seqid, iprot, oprot):
+ args = get_id_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_id_result()
+ d = defer.maybeDeferred(self._handler.get_id, )
+ d.addCallback(self.write_results_success_get_id, result, seqid, oprot)
+ return d
+
+ def write_results_success_get_id(self, success, result, seqid, oprot):
+ result.success = success
+ oprot.writeMessageBegin("get_id", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+
+# HELPER FUNCTIONS AND STRUCTURES
+
+class get_worker_id_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_worker_id_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_worker_id_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_worker_id_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_datacenter_id_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_datacenter_id_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_datacenter_id_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_datacenter_id_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_timestamp_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_timestamp_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_timestamp_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_timestamp_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_id_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_id_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_id_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_id_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+
diff --git a/lib/genpy/snowflake/__init__.py b/lib/genpy/snowflake/__init__.py
new file mode 100644
index 0000000..128bb88
--- /dev/null
+++ b/lib/genpy/snowflake/__init__.py
@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'Snowflake']
diff --git a/lib/genpy/snowflake/constants.py b/lib/genpy/snowflake/constants.py
new file mode 100644
index 0000000..2f17ec3
--- /dev/null
+++ b/lib/genpy/snowflake/constants.py
@@ -0,0 +1,9 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+from ttypes import *
+
diff --git a/lib/genpy/snowflake/ttypes.py b/lib/genpy/snowflake/ttypes.py
new file mode 100644
index 0000000..c98f71f
--- /dev/null
+++ b/lib/genpy/snowflake/ttypes.py
@@ -0,0 +1,16 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol
+try:
+ from thrift.protocol import fastbinary
+except:
+ fastbinary = None
+
+
diff --git a/lib/genpyblocking/__init__.py b/lib/genpyblocking/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/genpyblocking/snowflake/Snowflake-remote b/lib/genpyblocking/snowflake/Snowflake-remote
new file mode 100755
index 0000000..127e837
--- /dev/null
+++ b/lib/genpyblocking/snowflake/Snowflake-remote
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+import sys
+import pprint
+from urlparse import urlparse
+from thrift.transport import TTransport
+from thrift.transport import TSocket
+from thrift.transport import THttpClient
+from thrift.protocol import TBinaryProtocol
+
+import Snowflake
+from ttypes import *
+
+if len(sys.argv) <= 1 or sys.argv[1] == '--help':
+ print ''
+ print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
+ print ''
+ print 'Functions:'
+ print ' i64 get_worker_id()'
+ print ' i64 get_datacenter_id()'
+ print ' i64 get_timestamp()'
+ print ' i64 get_id()'
+ print ''
+ sys.exit(0)
+
+pp = pprint.PrettyPrinter(indent = 2)
+host = 'localhost'
+port = 9090
+uri = ''
+framed = False
+http = False
+argi = 1
+
+if sys.argv[argi] == '-h':
+ parts = sys.argv[argi+1].split(':')
+ host = parts[0]
+ port = int(parts[1])
+ argi += 2
+
+if sys.argv[argi] == '-u':
+ url = urlparse(sys.argv[argi+1])
+ parts = url[1].split(':')
+ host = parts[0]
+ if len(parts) > 1:
+ port = int(parts[1])
+ else:
+ port = 80
+ uri = url[2]
+ http = True
+ argi += 2
+
+if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
+ framed = True
+ argi += 1
+
+cmd = sys.argv[argi]
+args = sys.argv[argi+1:]
+
+if http:
+ transport = THttpClient.THttpClient(host, port, uri)
+else:
+ socket = TSocket.TSocket(host, port)
+ if framed:
+ transport = TTransport.TFramedTransport(socket)
+ else:
+ transport = TTransport.TBufferedTransport(socket)
+protocol = TBinaryProtocol.TBinaryProtocol(transport)
+client = Snowflake.Client(protocol)
+transport.open()
+
+if cmd == 'get_worker_id':
+ if len(args) != 0:
+ print 'get_worker_id requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_worker_id())
+
+elif cmd == 'get_datacenter_id':
+ if len(args) != 0:
+ print 'get_datacenter_id requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_datacenter_id())
+
+elif cmd == 'get_timestamp':
+ if len(args) != 0:
+ print 'get_timestamp requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_timestamp())
+
+elif cmd == 'get_id':
+ if len(args) != 0:
+ print 'get_id requires 0 args'
+ sys.exit(1)
+ pp.pprint(client.get_id())
+
+transport.close()
diff --git a/lib/genpyblocking/snowflake/Snowflake.py b/lib/genpyblocking/snowflake/Snowflake.py
new file mode 100644
index 0000000..53f6e9c
--- /dev/null
+++ b/lib/genpyblocking/snowflake/Snowflake.py
@@ -0,0 +1,583 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+from ttypes import *
+from thrift.Thrift import TProcessor
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol
+try:
+ from thrift.protocol import fastbinary
+except:
+ fastbinary = None
+
+
+class Iface:
+ def get_worker_id(self, ):
+ pass
+
+ def get_datacenter_id(self, ):
+ pass
+
+ def get_timestamp(self, ):
+ pass
+
+ def get_id(self, ):
+ pass
+
+
+class Client(Iface):
+ def __init__(self, iprot, oprot=None):
+ self._iprot = self._oprot = iprot
+ if oprot != None:
+ self._oprot = oprot
+ self._seqid = 0
+
+ def get_worker_id(self, ):
+ self.send_get_worker_id()
+ return self.recv_get_worker_id()
+
+ def send_get_worker_id(self, ):
+ self._oprot.writeMessageBegin('get_worker_id', TMessageType.CALL, self._seqid)
+ args = get_worker_id_args()
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_get_worker_id(self, ):
+ (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(self._iprot)
+ self._iprot.readMessageEnd()
+ raise x
+ result = get_worker_id_result()
+ result.read(self._iprot)
+ self._iprot.readMessageEnd()
+ if result.success != None:
+ return result.success
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "get_worker_id failed: unknown result");
+
+ def get_datacenter_id(self, ):
+ self.send_get_datacenter_id()
+ return self.recv_get_datacenter_id()
+
+ def send_get_datacenter_id(self, ):
+ self._oprot.writeMessageBegin('get_datacenter_id', TMessageType.CALL, self._seqid)
+ args = get_datacenter_id_args()
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_get_datacenter_id(self, ):
+ (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(self._iprot)
+ self._iprot.readMessageEnd()
+ raise x
+ result = get_datacenter_id_result()
+ result.read(self._iprot)
+ self._iprot.readMessageEnd()
+ if result.success != None:
+ return result.success
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "get_datacenter_id failed: unknown result");
+
+ def get_timestamp(self, ):
+ self.send_get_timestamp()
+ return self.recv_get_timestamp()
+
+ def send_get_timestamp(self, ):
+ self._oprot.writeMessageBegin('get_timestamp', TMessageType.CALL, self._seqid)
+ args = get_timestamp_args()
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_get_timestamp(self, ):
+ (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(self._iprot)
+ self._iprot.readMessageEnd()
+ raise x
+ result = get_timestamp_result()
+ result.read(self._iprot)
+ self._iprot.readMessageEnd()
+ if result.success != None:
+ return result.success
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "get_timestamp failed: unknown result");
+
+ def get_id(self, ):
+ self.send_get_id()
+ return self.recv_get_id()
+
+ def send_get_id(self, ):
+ self._oprot.writeMessageBegin('get_id', TMessageType.CALL, self._seqid)
+ args = get_id_args()
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_get_id(self, ):
+ (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(self._iprot)
+ self._iprot.readMessageEnd()
+ raise x
+ result = get_id_result()
+ result.read(self._iprot)
+ self._iprot.readMessageEnd()
+ if result.success != None:
+ return result.success
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "get_id failed: unknown result");
+
+
+class Processor(Iface, TProcessor):
+ def __init__(self, handler):
+ self._handler = handler
+ self._processMap = {}
+ self._processMap["get_worker_id"] = Processor.process_get_worker_id
+ self._processMap["get_datacenter_id"] = Processor.process_get_datacenter_id
+ self._processMap["get_timestamp"] = Processor.process_get_timestamp
+ self._processMap["get_id"] = Processor.process_get_id
+
+ def process(self, iprot, oprot):
+ (name, type, seqid) = iprot.readMessageBegin()
+ if name not in self._processMap:
+ iprot.skip(TType.STRUCT)
+ iprot.readMessageEnd()
+ x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))
+ oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)
+ x.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+ return
+ else:
+ self._processMap[name](self, seqid, iprot, oprot)
+ return True
+
+ def process_get_worker_id(self, seqid, iprot, oprot):
+ args = get_worker_id_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_worker_id_result()
+ result.success = self._handler.get_worker_id()
+ oprot.writeMessageBegin("get_worker_id", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_get_datacenter_id(self, seqid, iprot, oprot):
+ args = get_datacenter_id_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_datacenter_id_result()
+ result.success = self._handler.get_datacenter_id()
+ oprot.writeMessageBegin("get_datacenter_id", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_get_timestamp(self, seqid, iprot, oprot):
+ args = get_timestamp_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_timestamp_result()
+ result.success = self._handler.get_timestamp()
+ oprot.writeMessageBegin("get_timestamp", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_get_id(self, seqid, iprot, oprot):
+ args = get_id_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = get_id_result()
+ result.success = self._handler.get_id()
+ oprot.writeMessageBegin("get_id", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+
+# HELPER FUNCTIONS AND STRUCTURES
+
+class get_worker_id_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_worker_id_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_worker_id_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_worker_id_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_datacenter_id_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_datacenter_id_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_datacenter_id_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_datacenter_id_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_timestamp_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_timestamp_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_timestamp_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_timestamp_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_id_args:
+
+ thrift_spec = (
+ )
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_id_args')
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class get_id_result:
+ """
+ Attributes:
+ - success
+ """
+
+ thrift_spec = (
+ (0, TType.I64, 'success', None, None, ), # 0
+ )
+
+ def __init__(self, success=None,):
+ self.success = success
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.I64:
+ self.success = iprot.readI64();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('get_id_result')
+ if self.success != None:
+ oprot.writeFieldBegin('success', TType.I64, 0)
+ oprot.writeI64(self.success)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+
diff --git a/lib/genpyblocking/snowflake/__init__.py b/lib/genpyblocking/snowflake/__init__.py
new file mode 100644
index 0000000..128bb88
--- /dev/null
+++ b/lib/genpyblocking/snowflake/__init__.py
@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'Snowflake']
diff --git a/lib/genpyblocking/snowflake/constants.py b/lib/genpyblocking/snowflake/constants.py
new file mode 100644
index 0000000..2f17ec3
--- /dev/null
+++ b/lib/genpyblocking/snowflake/constants.py
@@ -0,0 +1,9 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+from ttypes import *
+
diff --git a/lib/genpyblocking/snowflake/ttypes.py b/lib/genpyblocking/snowflake/ttypes.py
new file mode 100644
index 0000000..c98f71f
--- /dev/null
+++ b/lib/genpyblocking/snowflake/ttypes.py
@@ -0,0 +1,16 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol
+try:
+ from thrift.protocol import fastbinary
+except:
+ fastbinary = None
+
+
|
michaelmontano/snowflakepy
|
91a9f50cfecbcf80157e628bb1ea5b57e0c745d3
|
description in README
|
diff --git a/README b/README
index e69de29..efd62ab 100644
--- a/README
+++ b/README
@@ -0,0 +1 @@
+A Python implementation of snowflake (http://github.com/twitter/snowflake).
\ No newline at end of file
|
ghjunior/node-facebook
|
a6fa6903a0edec13db214bebd004f826ced0d0bc
|
updating to work with node v0.4.x
|
diff --git a/lib/facebook.js b/lib/facebook.js
index 927568c..998f41c 100755
--- a/lib/facebook.js
+++ b/lib/facebook.js
@@ -1,202 +1,211 @@
var sys = require('sys'),
crypto = require('crypto'),
- http = require('http'),
+ https = require('https'),
querystring = require('querystring'),
phpjs = require('./phpjs'),
EventEmitter = require('events').EventEmitter;
function Facebook (config) {
if (!(this instanceof Facebook)) {
return new Facebook(config);
};
this.appId = '';
this.apiKey = '';
this.appSecret = '';
for (var key in config) {
this[key] = config[key];
};
};
sys.inherits(Facebook, EventEmitter);
module.exports = Facebook;
Facebook.prototype.callRest = function (req, params, callback) {
var self = this;
params['api_key'] = this.appId;
params['format'] = 'json-strings';
this._oauthRequest(req, this.getApiUrl(params['method']), 'POST', 'restserver.php', params, callback);
};
Facebook.prototype.callGraph = function (req, path, callback, method, params) {
var self = this;
method = method || 'GET';
this._oauthRequest(req, Facebook.DOMAIN_MAP['graph'], method, path, {}, callback);
};
Facebook.prototype.getApiUrl = function(method) {
var READ_ONLY_CALLS = {
'admin.getallocation': 1,
'admin.getappproperties': 1,
'admin.getbannedusers': 1,
'admin.getlivestreamvialink': 1,
'admin.getmetrics': 1,
'admin.getrestrictioninfo': 1,
'application.getpublicinfo': 1,
'auth.getapppublickey': 1,
'auth.getsession': 1,
'auth.getsignedpublicsessiondata': 1,
'comments.get': 1,
'connect.getunconnectedfriendscount': 1,
'dashboard.getactivity': 1,
'dashboard.getcount': 1,
'dashboard.getglobalnews': 1,
'dashboard.getnews': 1,
'dashboard.multigetcount': 1,
'dashboard.multigetnews': 1,
'data.getcookies': 1,
'events.get': 1,
'events.getmembers': 1,
'fbml.getcustomtags': 1,
'feed.getappfriendstories': 1,
'feed.getregisteredtemplatebundlebyid': 1,
'feed.getregisteredtemplatebundles': 1,
'fql.multiquery': 1,
'fql.query': 1,
'friends.arefriends': 1,
'friends.get': 1,
'friends.getappusers': 1,
'friends.getlists': 1,
'friends.getmutualfriends': 1,
'gifts.get': 1,
'groups.get': 1,
'groups.getmembers': 1,
'intl.gettranslations': 1,
'links.get': 1,
'notes.get': 1,
'notifications.get': 1,
'pages.getinfo': 1,
'pages.isadmin': 1,
'pages.isappadded': 1,
'pages.isfan': 1,
'permissions.checkavailableapiaccess': 1,
'permissions.checkgrantedapiaccess': 1,
'photos.get': 1,
'photos.getalbums': 1,
'photos.gettags': 1,
'profile.getinfo': 1,
'profile.getinfooptions': 1,
'stream.get': 1,
'stream.getcomments': 1,
'stream.getfilters': 1,
'users.getinfo': 1,
'users.getloggedinuser': 1,
'users.getstandardinfo': 1,
'users.hasapppermission': 1,
'users.isappuser': 1,
'users.isverified': 1,
'video.getuploadlimits': 1
};
var name = 'api';
if (method.toLowerCase() in READ_ONLY_CALLS) {
name = 'api_read';
}
return Facebook.DOMAIN_MAP[name];
}
Facebook.prototype._oauthRequest = function(req, host, method, path, params, callback) {
if (!('access_token' in params)) {
params['access_token'] = this.getAccessToken(req);
}
for (var prop in params) {
if (typeof(params[prop]) != 'string') {
params[prop] = JSON.stringify(params[prop]);
}
}
this.makeRequest(host, method, path, params, callback);
}
Facebook.prototype.makeRequest = function(host, method, path, params, callback) {
params = phpjs.http_build_query(params, null, '&');
- var fb_client = http.createClient('443', host, true);
+ var options = {
+ host: host,
+ port: '443',
+ method: method,
+ path: path,
+ headers: {'host': host, 'User-Agent': 'NodeJS HTTP Client'}
+ };
- if (method == 'GET') {
- path = path + '?' + params;
- var fb_request = fb_client.request(method, path, {'host': host, 'User-Agent': 'NodeJS HTTP Client'});
+ if (method == 'GET') {
+ options.path = path + '?' + params;
+ var fb_request = https.request(options);
} else {
- var fb_request = fb_client.request(method, path, {'host': host, 'User-Agent': 'NodeJS HTTP Client', 'Content-Length': params.length, 'Content-Type': 'application/x-www-form-urlencoded'});
- fb_request.write(params);
+ options.headers = {'host': host, 'User-Agent': 'NodeJS HTTP Client', 'Content-Length': params.length, 'Content-Type': 'application/x-www-form-urlencoded'};
+ var fb_request = https.request(options);
+
+ fb_request.write(params);
}
-
- fb_request.end();
- fb_request.on('response', function (response) {
+ fb_request.on('response', function (response) {
response.setEncoding('utf8');
var chunks = '';
response.on('data', function (chunk) {
chunks += chunk;
});
+
response.on('end', function () {
- callback(chunks);
+ callback(chunks);
});
});
+
+ fb_request.end();
}
/**
* COOKIES AND SESSION
*/
Facebook.prototype.getAccessToken = function(req) {
/*$session = $this->getSession();
// either user session signed, or app signed
if ($session) {
return $session['access_token'];
} else {
return $this->getAppId() .'|'. $this->getApiSecret();
}*/
var cookie = this.getCookie(req.cookies);
return cookie.access_token;
}
Facebook.prototype.getSessionCookieName = function () {
return 'fbs_' + this.appId;
}
Facebook.prototype.getCookie = function(cookies) {
var args = [],
payload = '',
fb_cookie;
fb_cookie = cookies[this.getSessionCookieName()] || '';
args = querystring.parse(fb_cookie.replace(/\\/,'').replace(/"/,''));
var keys = Object.keys(args).sort();
keys.forEach(function(key) {
var value = args[key];
if (key !== 'sig') {
payload += key + '=' + value;
}
});
var digest = crypto.createHash('md5').update(payload + this.appSecret).digest('hex');
if (digest !== args.sig) {
return null;
};
return args;
};
/**
* CONSTANTS
*/
Facebook.DOMAIN_MAP = {
'api' : 'api.facebook.com',
'api_read' : 'api-read.facebook.com',
'graph' : 'graph.facebook.com',
'www' : 'www.facebook.com'
};
|
ghjunior/node-facebook
|
66856e3af6a100754266bb3e0bfc6ed7b28e6445
|
clarifying readme
|
diff --git a/readme.md b/readme.md
index 30573ed..d5f6615 100644
--- a/readme.md
+++ b/readme.md
@@ -1,10 +1,12 @@
# node-facebook
Borrowing some ideas from the [PHP SDK](http://github.com/facebook/php-sdk) to connect to the Facebook API via node.js
+The access_token utilized to make calls is currently retrieved from the request cookie headers. Therefore all calls must pass along a request with a 'cookies' property containing the parsed cookie header (i.e. req.cookies). A more flexible approach will come soon or feel free to fork.
+
Still a lot to add on and move around but it's a start.
Also see:
- [http://coolaj86.github.com/articles/facebook-with-node.js.html](http://coolaj86.github.com/articles/facebook-with-node.js.html)
- [http://developers.facebook.com/docs/authentication/](http://developers.facebook.com/docs/authentication/)
|
nekop/java-examples
|
b44ddcba5f6a437217674f388af646ed1a10f998
|
Move persistence.xml under main tree
|
diff --git a/ee6/jpa/src/test/resources/persistence.xml b/ee6/jpa/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from ee6/jpa/src/test/resources/persistence.xml
rename to ee6/jpa/src/main/resources/META-INF/persistence.xml
diff --git a/ee6/jpa/src/test/java/com/github/nekop/example/jpa/CatTest.java b/ee6/jpa/src/test/java/com/github/nekop/example/jpa/CatTest.java
index 86e4950..461b0fa 100644
--- a/ee6/jpa/src/test/java/com/github/nekop/example/jpa/CatTest.java
+++ b/ee6/jpa/src/test/java/com/github/nekop/example/jpa/CatTest.java
@@ -1,50 +1,50 @@
package com.github.nekop.example.jpa;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.transaction.UserTransaction;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
public class CatTest {
@Deployment
public static JavaArchive createDeployment() {
return ShrinkWrap.create(JavaArchive.class)
.addPackage(Cat.class.getPackage())
- .addAsManifestResource("persistence.xml", "persistence.xml")
+ .addAsManifestResource("META-INF/persistence.xml", "persistence.xml")
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
}
@Inject
UserTransaction ut;
@PersistenceContext
EntityManager em;
@Test
public void testPersist() throws Exception {
System.out.println(em);
ut.begin();
em.createNativeQuery("SET WRITE_DELAY FALSE").executeUpdate();
ut.commit();
ut.begin();
Cat cat = new Cat();
em.persist(cat);
em.flush();
ut.commit();
System.out.println(em.createQuery("from Cat").getSingleResult());
}
}
|
nekop/java-examples
|
9c22ea14dc34b0c7e65706b222971e3be34313bb
|
Add jpa example
|
diff --git a/ee6/jpa/pom.xml b/ee6/jpa/pom.xml
new file mode 100644
index 0000000..6c758c7
--- /dev/null
+++ b/ee6/jpa/pom.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+ Java EE 6 minimal pom.xml, works with JBoss EAP 6.
+
+ https://github.com/nekop/java-examples/blob/master/maven/
+
+ Put your source code, config files, boot the application server and run:
+ $ mvn clean install -Parq-remote
+
+ [Summary]
+ Additional Repository: JBoss Public
+ Compile Deps: Java EE 6 Web Profile
+ Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
+ Profiles: arq-managed, arq-remote
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop.example.jpa</groupId>
+ <artifactId>example-jpa</artifactId>
+ <packaging>war</packaging>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.jboss.spec.jboss-javaee-web-6.0>3.0.3.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
+
+ <version.org.jboss.arquillian.arquillian-bom>1.1.7.Final</version.org.jboss.arquillian.arquillian-bom>
+ <version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
+ <version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
+ <version.junit>4.12</version.junit>
+ <version.maven-surefire-plugin>2.18.1</version.maven-surefire-plugin>
+ <version.maven-compiler-plugin>3.3</version.maven-compiler-plugin>
+ <version.maven-war-plugin>2.6</version.maven-war-plugin>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.org.jboss.arquillian.arquillian-bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- This Java EE 6 API jar is crippled, do NOT use for real projects/testing.
+ Fixed in Java EE 7.
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+ <!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
+ <scope>provided</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.maven-surefire-plugin}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>arq-managed</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>arq-remote</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-remote</artifactId>
+ <version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/ee6/jpa/src/main/java/com/github/nekop/example/jpa/Cat.java b/ee6/jpa/src/main/java/com/github/nekop/example/jpa/Cat.java
new file mode 100644
index 0000000..9f6025a
--- /dev/null
+++ b/ee6/jpa/src/main/java/com/github/nekop/example/jpa/Cat.java
@@ -0,0 +1,31 @@
+package com.github.nekop.example.jpa;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+@Entity
+public class Cat {
+
+ @Id @GeneratedValue
+ private Integer id;
+ private String name;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+
+}
diff --git a/ee6/jpa/src/test/java/com/github/nekop/example/jpa/CatTest.java b/ee6/jpa/src/test/java/com/github/nekop/example/jpa/CatTest.java
new file mode 100644
index 0000000..86e4950
--- /dev/null
+++ b/ee6/jpa/src/test/java/com/github/nekop/example/jpa/CatTest.java
@@ -0,0 +1,50 @@
+package com.github.nekop.example.jpa;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.UserTransaction;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Arquillian.class)
+public class CatTest {
+
+ @Deployment
+ public static JavaArchive createDeployment() {
+ return ShrinkWrap.create(JavaArchive.class)
+ .addPackage(Cat.class.getPackage())
+ .addAsManifestResource("persistence.xml", "persistence.xml")
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Inject
+ UserTransaction ut;
+
+ @PersistenceContext
+ EntityManager em;
+
+ @Test
+ public void testPersist() throws Exception {
+ System.out.println(em);
+
+ ut.begin();
+ em.createNativeQuery("SET WRITE_DELAY FALSE").executeUpdate();
+ ut.commit();
+
+ ut.begin();
+ Cat cat = new Cat();
+ em.persist(cat);
+ em.flush();
+ ut.commit();
+
+ System.out.println(em.createQuery("from Cat").getSingleResult());
+ }
+
+}
diff --git a/ee6/jpa/src/test/resources/persistence.xml b/ee6/jpa/src/test/resources/persistence.xml
new file mode 100644
index 0000000..d3e052e
--- /dev/null
+++ b/ee6/jpa/src/test/resources/persistence.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
+ <persistence-unit name="test" transaction-type="JTA">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+ <shared-cache-mode>ALL</shared-cache-mode>
+ <properties>
+ <property name="hibernate.cache.use_second_level_cache" value="true"/>
+ <property name="hibernate.cache.use_query_cache" value="true"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.max_fetch_depth" value="3"/>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.show_sql" value="true"/>
+ </properties>
+ </persistence-unit>
+</persistence>
|
nekop/java-examples
|
283e806ed68cef552766b7f6dc55bac83d3e0ffb
|
Archive old examples
|
diff --git a/README b/README
deleted file mode 100644
index 41266a1..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-Various examples written in Java.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..dc5c20b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+Various examples written in Java.
+
+Note that old things are moved under "old" directory.
diff --git a/clustered-webapp/.gitignore b/clustered-webapp/.gitignore
new file mode 100644
index 0000000..785d71d
--- /dev/null
+++ b/clustered-webapp/.gitignore
@@ -0,0 +1 @@
+cluster-test.war
diff --git a/ee6/README.md b/ee6/README.md
new file mode 100644
index 0000000..b7a1093
--- /dev/null
+++ b/ee6/README.md
@@ -0,0 +1 @@
+Minimal Java EE 6 examples
\ No newline at end of file
diff --git a/as7-ear/appclient/pom.xml b/old/as7-ear/appclient/pom.xml
similarity index 100%
rename from as7-ear/appclient/pom.xml
rename to old/as7-ear/appclient/pom.xml
diff --git a/as7-ear/appclient/src/main/java/jp/programmers/as7/examples/HelloClient.java b/old/as7-ear/appclient/src/main/java/jp/programmers/as7/examples/HelloClient.java
similarity index 100%
rename from as7-ear/appclient/src/main/java/jp/programmers/as7/examples/HelloClient.java
rename to old/as7-ear/appclient/src/main/java/jp/programmers/as7/examples/HelloClient.java
diff --git a/as7-ear/ear/pom.xml b/old/as7-ear/ear/pom.xml
similarity index 100%
rename from as7-ear/ear/pom.xml
rename to old/as7-ear/ear/pom.xml
diff --git a/as7-ear/ejb/pom.xml b/old/as7-ear/ejb/pom.xml
similarity index 100%
rename from as7-ear/ejb/pom.xml
rename to old/as7-ear/ejb/pom.xml
diff --git a/as7-ear/ejb/src/main/java/jp/programmers/as7/examples/Hello.java b/old/as7-ear/ejb/src/main/java/jp/programmers/as7/examples/Hello.java
similarity index 100%
rename from as7-ear/ejb/src/main/java/jp/programmers/as7/examples/Hello.java
rename to old/as7-ear/ejb/src/main/java/jp/programmers/as7/examples/Hello.java
diff --git a/as7-ear/ejb/src/main/java/jp/programmers/as7/examples/HelloSLSB.java b/old/as7-ear/ejb/src/main/java/jp/programmers/as7/examples/HelloSLSB.java
similarity index 100%
rename from as7-ear/ejb/src/main/java/jp/programmers/as7/examples/HelloSLSB.java
rename to old/as7-ear/ejb/src/main/java/jp/programmers/as7/examples/HelloSLSB.java
diff --git a/as7-ear/pom.xml b/old/as7-ear/pom.xml
similarity index 100%
rename from as7-ear/pom.xml
rename to old/as7-ear/pom.xml
diff --git a/as7-ear/web/pom.xml b/old/as7-ear/web/pom.xml
similarity index 100%
rename from as7-ear/web/pom.xml
rename to old/as7-ear/web/pom.xml
diff --git a/as7-ejb/pom.xml b/old/as7-ejb/pom.xml
similarity index 100%
rename from as7-ejb/pom.xml
rename to old/as7-ejb/pom.xml
diff --git a/as7-ejb/run-client-clustered.sh b/old/as7-ejb/run-client-clustered.sh
similarity index 100%
rename from as7-ejb/run-client-clustered.sh
rename to old/as7-ejb/run-client-clustered.sh
diff --git a/as7-ejb/run-client-iiop.sh b/old/as7-ejb/run-client-iiop.sh
similarity index 100%
rename from as7-ejb/run-client-iiop.sh
rename to old/as7-ejb/run-client-iiop.sh
diff --git a/as7-ejb/run-client-ws.sh b/old/as7-ejb/run-client-ws.sh
similarity index 100%
rename from as7-ejb/run-client-ws.sh
rename to old/as7-ejb/run-client-ws.sh
diff --git a/as7-ejb/run-client.sh b/old/as7-ejb/run-client.sh
similarity index 100%
rename from as7-ejb/run-client.sh
rename to old/as7-ejb/run-client.sh
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java
diff --git a/as7-ejb/src/main/java/jp/programmers/examples/ejb3/startup/StartupBean.java b/old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/startup/StartupBean.java
similarity index 100%
rename from as7-ejb/src/main/java/jp/programmers/examples/ejb3/startup/StartupBean.java
rename to old/as7-ejb/src/main/java/jp/programmers/examples/ejb3/startup/StartupBean.java
diff --git a/as7-ejb/src/main/resources/META-INF/jboss-ejb3.xml b/old/as7-ejb/src/main/resources/META-INF/jboss-ejb3.xml
similarity index 100%
rename from as7-ejb/src/main/resources/META-INF/jboss-ejb3.xml
rename to old/as7-ejb/src/main/resources/META-INF/jboss-ejb3.xml
diff --git a/as7-ejb/src/main/resources/clustered-jboss-ejb-client.properties b/old/as7-ejb/src/main/resources/clustered-jboss-ejb-client.properties
similarity index 100%
rename from as7-ejb/src/main/resources/clustered-jboss-ejb-client.properties
rename to old/as7-ejb/src/main/resources/clustered-jboss-ejb-client.properties
diff --git a/as7-ejb/src/main/resources/finest-logging.properties b/old/as7-ejb/src/main/resources/finest-logging.properties
similarity index 100%
rename from as7-ejb/src/main/resources/finest-logging.properties
rename to old/as7-ejb/src/main/resources/finest-logging.properties
diff --git a/as7-ejb/src/main/resources/nonclustered-jboss-ejb-client.properties b/old/as7-ejb/src/main/resources/nonclustered-jboss-ejb-client.properties
similarity index 100%
rename from as7-ejb/src/main/resources/nonclustered-jboss-ejb-client.properties
rename to old/as7-ejb/src/main/resources/nonclustered-jboss-ejb-client.properties
diff --git a/as7-hello-service/pom.xml b/old/as7-hello-service/pom.xml
similarity index 100%
rename from as7-hello-service/pom.xml
rename to old/as7-hello-service/pom.xml
diff --git a/as7-hello-service/src/main/java/jp/programmers/jboss/hello/Hello.java b/old/as7-hello-service/src/main/java/jp/programmers/jboss/hello/Hello.java
similarity index 100%
rename from as7-hello-service/src/main/java/jp/programmers/jboss/hello/Hello.java
rename to old/as7-hello-service/src/main/java/jp/programmers/jboss/hello/Hello.java
diff --git a/as7-hello-service/src/main/java/jp/programmers/jboss/hello/HelloMBean.java b/old/as7-hello-service/src/main/java/jp/programmers/jboss/hello/HelloMBean.java
similarity index 100%
rename from as7-hello-service/src/main/java/jp/programmers/jboss/hello/HelloMBean.java
rename to old/as7-hello-service/src/main/java/jp/programmers/jboss/hello/HelloMBean.java
diff --git a/as7-hello-service/src/main/resources/META-INF/jboss-beans.xml.example b/old/as7-hello-service/src/main/resources/META-INF/jboss-beans.xml.example
similarity index 100%
rename from as7-hello-service/src/main/resources/META-INF/jboss-beans.xml.example
rename to old/as7-hello-service/src/main/resources/META-INF/jboss-beans.xml.example
diff --git a/as7-hello-service/src/main/resources/META-INF/jboss-service.xml b/old/as7-hello-service/src/main/resources/META-INF/jboss-service.xml
similarity index 100%
rename from as7-hello-service/src/main/resources/META-INF/jboss-service.xml
rename to old/as7-hello-service/src/main/resources/META-INF/jboss-service.xml
diff --git a/customvalve/README.txt b/old/customvalve/README.txt
similarity index 100%
rename from customvalve/README.txt
rename to old/customvalve/README.txt
diff --git a/customvalve/build.properties b/old/customvalve/build.properties
similarity index 100%
rename from customvalve/build.properties
rename to old/customvalve/build.properties
diff --git a/customvalve/build.xml b/old/customvalve/build.xml
similarity index 100%
rename from customvalve/build.xml
rename to old/customvalve/build.xml
diff --git a/customvalve/context.xml b/old/customvalve/context.xml
similarity index 100%
rename from customvalve/context.xml
rename to old/customvalve/context.xml
diff --git a/customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieResponseWrapper.java b/old/customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieResponseWrapper.java
similarity index 100%
rename from customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieResponseWrapper.java
rename to old/customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieResponseWrapper.java
diff --git a/customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieValve.java b/old/customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieValve.java
similarity index 100%
rename from customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieValve.java
rename to old/customvalve/src/main/java/com/redhat/jboss/support/ConfigureSessionCookieValve.java
diff --git a/customvalve/src/main/java/com/redhat/jboss/support/RequestCountValve.java b/old/customvalve/src/main/java/com/redhat/jboss/support/RequestCountValve.java
similarity index 100%
rename from customvalve/src/main/java/com/redhat/jboss/support/RequestCountValve.java
rename to old/customvalve/src/main/java/com/redhat/jboss/support/RequestCountValve.java
diff --git a/customvalve/src/main/java/com/redhat/jboss/support/ResponseWrapper.java b/old/customvalve/src/main/java/com/redhat/jboss/support/ResponseWrapper.java
similarity index 100%
rename from customvalve/src/main/java/com/redhat/jboss/support/ResponseWrapper.java
rename to old/customvalve/src/main/java/com/redhat/jboss/support/ResponseWrapper.java
diff --git a/ee6-ejb-interfaces/deploy.sh b/old/ee6-ejb-interfaces/deploy.sh
similarity index 100%
rename from ee6-ejb-interfaces/deploy.sh
rename to old/ee6-ejb-interfaces/deploy.sh
diff --git a/ee6-ejb-interfaces/ee6-ejb-interfaces-client.rb b/old/ee6-ejb-interfaces/ee6-ejb-interfaces-client.rb
similarity index 100%
rename from ee6-ejb-interfaces/ee6-ejb-interfaces-client.rb
rename to old/ee6-ejb-interfaces/ee6-ejb-interfaces-client.rb
diff --git a/ee6-ejb-interfaces/load.rb b/old/ee6-ejb-interfaces/load.rb
similarity index 100%
rename from ee6-ejb-interfaces/load.rb
rename to old/ee6-ejb-interfaces/load.rb
diff --git a/ee6-ejb-interfaces/pom.xml b/old/ee6-ejb-interfaces/pom.xml
similarity index 100%
rename from ee6-ejb-interfaces/pom.xml
rename to old/ee6-ejb-interfaces/pom.xml
diff --git a/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/Hello.java b/old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/Hello.java
similarity index 100%
rename from ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/Hello.java
rename to old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/Hello.java
diff --git a/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloApplication.java b/old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloApplication.java
similarity index 100%
rename from ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloApplication.java
rename to old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloApplication.java
diff --git a/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Home.java b/old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Home.java
similarity index 100%
rename from ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Home.java
rename to old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Home.java
diff --git a/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Remote.java b/old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Remote.java
similarity index 100%
rename from ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Remote.java
rename to old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloEJB2Remote.java
diff --git a/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloLocal.java b/old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloLocal.java
similarity index 100%
rename from ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloLocal.java
rename to old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloLocal.java
diff --git a/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloRemote.java b/old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloRemote.java
similarity index 100%
rename from ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloRemote.java
rename to old/ee6-ejb-interfaces/src/main/java/com/github/nekop/examples/HelloRemote.java
diff --git a/ee6-ejb-interfaces/src/main/resources/META-INF/jboss-ejb3.xml b/old/ee6-ejb-interfaces/src/main/resources/META-INF/jboss-ejb3.xml
similarity index 100%
rename from ee6-ejb-interfaces/src/main/resources/META-INF/jboss-ejb3.xml
rename to old/ee6-ejb-interfaces/src/main/resources/META-INF/jboss-ejb3.xml
diff --git a/ejb2cmp/pom.xml b/old/ejb2cmp/pom.xml
similarity index 100%
rename from ejb2cmp/pom.xml
rename to old/ejb2cmp/pom.xml
diff --git a/ejb2cmp/src/main/java/jp/programmers/examples/ejb2/cmp/StudentEntityBean.java b/old/ejb2cmp/src/main/java/jp/programmers/examples/ejb2/cmp/StudentEntityBean.java
similarity index 100%
rename from ejb2cmp/src/main/java/jp/programmers/examples/ejb2/cmp/StudentEntityBean.java
rename to old/ejb2cmp/src/main/java/jp/programmers/examples/ejb2/cmp/StudentEntityBean.java
diff --git a/ejb2mdb/QueueSend.bsh b/old/ejb2mdb/QueueSend.bsh
similarity index 100%
rename from ejb2mdb/QueueSend.bsh
rename to old/ejb2mdb/QueueSend.bsh
diff --git a/ejb2mdb/pom.xml b/old/ejb2mdb/pom.xml
similarity index 100%
rename from ejb2mdb/pom.xml
rename to old/ejb2mdb/pom.xml
diff --git a/ejb2mdb/src/main/java/jp/programmers/examples/ejb2/mdb/HelloMDB.java b/old/ejb2mdb/src/main/java/jp/programmers/examples/ejb2/mdb/HelloMDB.java
similarity index 100%
rename from ejb2mdb/src/main/java/jp/programmers/examples/ejb2/mdb/HelloMDB.java
rename to old/ejb2mdb/src/main/java/jp/programmers/examples/ejb2/mdb/HelloMDB.java
diff --git a/ejb2mdb/tmpQueue-service.xml b/old/ejb2mdb/tmpQueue-service.xml
similarity index 100%
rename from ejb2mdb/tmpQueue-service.xml
rename to old/ejb2mdb/tmpQueue-service.xml
diff --git a/ejb2slsb/pom.xml b/old/ejb2slsb/pom.xml
similarity index 100%
rename from ejb2slsb/pom.xml
rename to old/ejb2slsb/pom.xml
diff --git a/ejb2slsb/run-client.sh b/old/ejb2slsb/run-client.sh
similarity index 100%
rename from ejb2slsb/run-client.sh
rename to old/ejb2slsb/run-client.sh
diff --git a/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBBean.java b/old/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBBean.java
similarity index 100%
rename from ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBBean.java
rename to old/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBBean.java
diff --git a/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBClient.java b/old/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBClient.java
similarity index 100%
rename from ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBClient.java
rename to old/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBClient.java
diff --git a/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBLoadClient.java b/old/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBLoadClient.java
similarity index 100%
rename from ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBLoadClient.java
rename to old/ejb2slsb/src/main/java/jp/programmers/examples/ejb2/slsb/HelloSLSBLoadClient.java
diff --git a/ejb3mailmdb/pom.xml b/old/ejb3mailmdb/pom.xml
similarity index 100%
rename from ejb3mailmdb/pom.xml
rename to old/ejb3mailmdb/pom.xml
diff --git a/ejb3mailmdb/src/main/java/jp/programmers/examples/ejb3/mdb/MailMDB.java b/old/ejb3mailmdb/src/main/java/jp/programmers/examples/ejb3/mdb/MailMDB.java
similarity index 100%
rename from ejb3mailmdb/src/main/java/jp/programmers/examples/ejb3/mdb/MailMDB.java
rename to old/ejb3mailmdb/src/main/java/jp/programmers/examples/ejb3/mdb/MailMDB.java
diff --git a/ejb3mdb/QueueSend.bsh b/old/ejb3mdb/QueueSend.bsh
similarity index 100%
rename from ejb3mdb/QueueSend.bsh
rename to old/ejb3mdb/QueueSend.bsh
diff --git a/ejb3mdb/pom.xml b/old/ejb3mdb/pom.xml
similarity index 100%
rename from ejb3mdb/pom.xml
rename to old/ejb3mdb/pom.xml
diff --git a/ejb3mdb/src/main/java/jp/programmers/examples/ejb3/mdb/HelloMDB.java b/old/ejb3mdb/src/main/java/jp/programmers/examples/ejb3/mdb/HelloMDB.java
similarity index 100%
rename from ejb3mdb/src/main/java/jp/programmers/examples/ejb3/mdb/HelloMDB.java
rename to old/ejb3mdb/src/main/java/jp/programmers/examples/ejb3/mdb/HelloMDB.java
diff --git a/ejb3mdb/tmpQueue-service.xml b/old/ejb3mdb/tmpQueue-service.xml
similarity index 100%
rename from ejb3mdb/tmpQueue-service.xml
rename to old/ejb3mdb/tmpQueue-service.xml
diff --git a/ejb3sfsb/pom.xml b/old/ejb3sfsb/pom.xml
similarity index 100%
rename from ejb3sfsb/pom.xml
rename to old/ejb3sfsb/pom.xml
diff --git a/ejb3sfsb/run-client.sh b/old/ejb3sfsb/run-client.sh
similarity index 100%
rename from ejb3sfsb/run-client.sh
rename to old/ejb3sfsb/run-client.sh
diff --git a/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java b/old/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java
similarity index 100%
rename from ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java
rename to old/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/Hello.java
diff --git a/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java b/old/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java
similarity index 100%
rename from ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java
rename to old/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSB.java
diff --git a/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java b/old/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java
similarity index 100%
rename from ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java
rename to old/ejb3sfsb/src/main/java/jp/programmers/examples/ejb3/sfsb/HelloSFSBClient.java
diff --git a/ejb3sfsb/src/main/resources/META-INF/ejb-jar.xml b/old/ejb3sfsb/src/main/resources/META-INF/ejb-jar.xml
similarity index 100%
rename from ejb3sfsb/src/main/resources/META-INF/ejb-jar.xml
rename to old/ejb3sfsb/src/main/resources/META-INF/ejb-jar.xml
diff --git a/ejb3sfsb/src/main/resources/META-INF/jboss.xml b/old/ejb3sfsb/src/main/resources/META-INF/jboss.xml
similarity index 100%
rename from ejb3sfsb/src/main/resources/META-INF/jboss.xml
rename to old/ejb3sfsb/src/main/resources/META-INF/jboss.xml
diff --git a/ejb3sfsb/src/main/resources/client-log4j.xml b/old/ejb3sfsb/src/main/resources/client-log4j.xml
similarity index 100%
rename from ejb3sfsb/src/main/resources/client-log4j.xml
rename to old/ejb3sfsb/src/main/resources/client-log4j.xml
diff --git a/ejb3slsb/iiop.policy b/old/ejb3slsb/iiop.policy
similarity index 100%
rename from ejb3slsb/iiop.policy
rename to old/ejb3slsb/iiop.policy
diff --git a/ejb3slsb/pom.xml b/old/ejb3slsb/pom.xml
similarity index 100%
rename from ejb3slsb/pom.xml
rename to old/ejb3slsb/pom.xml
diff --git a/ejb3slsb/run-client.sh b/old/ejb3slsb/run-client.sh
similarity index 100%
rename from ejb3slsb/run-client.sh
rename to old/ejb3slsb/run-client.sh
diff --git a/ejb3slsb/run-iiop-client.sh b/old/ejb3slsb/run-iiop-client.sh
similarity index 100%
rename from ejb3slsb/run-iiop-client.sh
rename to old/ejb3slsb/run-iiop-client.sh
diff --git a/ejb3slsb/run-ws-client.sh b/old/ejb3slsb/run-ws-client.sh
similarity index 100%
rename from ejb3slsb/run-ws-client.sh
rename to old/ejb3slsb/run-ws-client.sh
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/Hello.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSB.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBClient.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/HelloSLSBLoadClient.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/clustered/ClusteredHelloSLSB.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloHome.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOP.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloIIOPClient.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/iiop/HelloRemote.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloEndpoint.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWS.java
diff --git a/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java b/old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java
similarity index 100%
rename from ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java
rename to old/ejb3slsb/src/main/java/jp/programmers/examples/ejb3/slsb/ws/HelloWSClient.java
diff --git a/ejb3slsb/src/main/resources/META-INF/ejb-jar.xml b/old/ejb3slsb/src/main/resources/META-INF/ejb-jar.xml
similarity index 100%
rename from ejb3slsb/src/main/resources/META-INF/ejb-jar.xml
rename to old/ejb3slsb/src/main/resources/META-INF/ejb-jar.xml
diff --git a/ejb3slsb/src/main/resources/META-INF/jboss.xml b/old/ejb3slsb/src/main/resources/META-INF/jboss.xml
similarity index 100%
rename from ejb3slsb/src/main/resources/META-INF/jboss.xml
rename to old/ejb3slsb/src/main/resources/META-INF/jboss.xml
diff --git a/ejb3slsb/src/main/resources/client-log4j.xml b/old/ejb3slsb/src/main/resources/client-log4j.xml
similarity index 100%
rename from ejb3slsb/src/main/resources/client-log4j.xml
rename to old/ejb3slsb/src/main/resources/client-log4j.xml
diff --git a/elaopmetrics/README b/old/elaopmetrics/README
similarity index 100%
rename from elaopmetrics/README
rename to old/elaopmetrics/README
diff --git a/elaopmetrics/build.properties b/old/elaopmetrics/build.properties
similarity index 100%
rename from elaopmetrics/build.properties
rename to old/elaopmetrics/build.properties
diff --git a/elaopmetrics/build.xml b/old/elaopmetrics/build.xml
similarity index 100%
rename from elaopmetrics/build.xml
rename to old/elaopmetrics/build.xml
diff --git a/elaopmetrics/src/main/java/org/jboss/jbossaop/ValueExpressionMetrics.java b/old/elaopmetrics/src/main/java/org/jboss/jbossaop/ValueExpressionMetrics.java
similarity index 100%
rename from elaopmetrics/src/main/java/org/jboss/jbossaop/ValueExpressionMetrics.java
rename to old/elaopmetrics/src/main/java/org/jboss/jbossaop/ValueExpressionMetrics.java
diff --git a/elaopmetrics/src/main/resources/META-INF/jboss-aop.xml b/old/elaopmetrics/src/main/resources/META-INF/jboss-aop.xml
similarity index 100%
rename from elaopmetrics/src/main/resources/META-INF/jboss-aop.xml
rename to old/elaopmetrics/src/main/resources/META-INF/jboss-aop.xml
diff --git a/jab/pom.xml b/old/jab/pom.xml
similarity index 100%
rename from jab/pom.xml
rename to old/jab/pom.xml
diff --git a/jab/run-all.sh b/old/jab/run-all.sh
similarity index 100%
rename from jab/run-all.sh
rename to old/jab/run-all.sh
diff --git a/jab/run.sh b/old/jab/run.sh
similarity index 100%
rename from jab/run.sh
rename to old/jab/run.sh
diff --git a/jab/src/main/java/jp/programmers/jab/BaseJAB.java b/old/jab/src/main/java/jp/programmers/jab/BaseJAB.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/BaseJAB.java
rename to old/jab/src/main/java/jp/programmers/jab/BaseJAB.java
diff --git a/jab/src/main/java/jp/programmers/jab/Executorz.java b/old/jab/src/main/java/jp/programmers/jab/Executorz.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/Executorz.java
rename to old/jab/src/main/java/jp/programmers/jab/Executorz.java
diff --git a/jab/src/main/java/jp/programmers/jab/JAB.java b/old/jab/src/main/java/jp/programmers/jab/JAB.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/JAB.java
rename to old/jab/src/main/java/jp/programmers/jab/JAB.java
diff --git a/jab/src/main/java/jp/programmers/jab/JABFactory.java b/old/jab/src/main/java/jp/programmers/jab/JABFactory.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/JABFactory.java
rename to old/jab/src/main/java/jp/programmers/jab/JABFactory.java
diff --git a/jab/src/main/java/jp/programmers/jab/JABMain.java b/old/jab/src/main/java/jp/programmers/jab/JABMain.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/JABMain.java
rename to old/jab/src/main/java/jp/programmers/jab/JABMain.java
diff --git a/jab/src/main/java/jp/programmers/jab/JABOptions.java b/old/jab/src/main/java/jp/programmers/jab/JABOptions.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/JABOptions.java
rename to old/jab/src/main/java/jp/programmers/jab/JABOptions.java
diff --git a/jab/src/main/java/jp/programmers/jab/NettyJAB.java b/old/jab/src/main/java/jp/programmers/jab/NettyJAB.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/NettyJAB.java
rename to old/jab/src/main/java/jp/programmers/jab/NettyJAB.java
diff --git a/jab/src/main/java/jp/programmers/jab/NettyNioJAB.java b/old/jab/src/main/java/jp/programmers/jab/NettyNioJAB.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/NettyNioJAB.java
rename to old/jab/src/main/java/jp/programmers/jab/NettyNioJAB.java
diff --git a/jab/src/main/java/jp/programmers/jab/NettyOioJAB.java b/old/jab/src/main/java/jp/programmers/jab/NettyOioJAB.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/NettyOioJAB.java
rename to old/jab/src/main/java/jp/programmers/jab/NettyOioJAB.java
diff --git a/jab/src/main/java/jp/programmers/jab/Recorder.java b/old/jab/src/main/java/jp/programmers/jab/Recorder.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/Recorder.java
rename to old/jab/src/main/java/jp/programmers/jab/Recorder.java
diff --git a/jab/src/main/java/jp/programmers/jab/StandardJAB.java b/old/jab/src/main/java/jp/programmers/jab/StandardJAB.java
similarity index 100%
rename from jab/src/main/java/jp/programmers/jab/StandardJAB.java
rename to old/jab/src/main/java/jp/programmers/jab/StandardJAB.java
diff --git a/jaxrs-jsonp/README.md b/old/jaxrs-jsonp/README.md
similarity index 100%
rename from jaxrs-jsonp/README.md
rename to old/jaxrs-jsonp/README.md
diff --git a/jaxrs-jsonp/pom.xml b/old/jaxrs-jsonp/pom.xml
similarity index 100%
rename from jaxrs-jsonp/pom.xml
rename to old/jaxrs-jsonp/pom.xml
diff --git a/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/HelloJson.java b/old/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/HelloJson.java
similarity index 100%
rename from jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/HelloJson.java
rename to old/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/HelloJson.java
diff --git a/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestBootstrap.java b/old/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestBootstrap.java
similarity index 100%
rename from jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestBootstrap.java
rename to old/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestBootstrap.java
diff --git a/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestMessage.java b/old/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestMessage.java
similarity index 100%
rename from jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestMessage.java
rename to old/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestMessage.java
diff --git a/jaxrs-jsonp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/old/jaxrs-jsonp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
similarity index 100%
rename from jaxrs-jsonp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
rename to old/jaxrs-jsonp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
diff --git a/jboss-debug/README.txt b/old/jboss-debug/README.txt
similarity index 100%
rename from jboss-debug/README.txt
rename to old/jboss-debug/README.txt
diff --git a/jboss-debug/build.properties b/old/jboss-debug/build.properties
similarity index 100%
rename from jboss-debug/build.properties
rename to old/jboss-debug/build.properties
diff --git a/jboss-debug/build.xml b/old/jboss-debug/build.xml
similarity index 100%
rename from jboss-debug/build.xml
rename to old/jboss-debug/build.xml
diff --git a/jboss-debug/etc/example-aop.xml b/old/jboss-debug/etc/example-aop.xml
similarity index 100%
rename from jboss-debug/etc/example-aop.xml
rename to old/jboss-debug/etc/example-aop.xml
diff --git a/jboss-debug/etc/example-log4j.xml b/old/jboss-debug/etc/example-log4j.xml
similarity index 100%
rename from jboss-debug/etc/example-log4j.xml
rename to old/jboss-debug/etc/example-log4j.xml
diff --git a/jboss-debug/etc/example-txrecovery.xml b/old/jboss-debug/etc/example-txrecovery.xml
similarity index 100%
rename from jboss-debug/etc/example-txrecovery.xml
rename to old/jboss-debug/etc/example-txrecovery.xml
diff --git a/jboss-debug/etc/txtest.bsh b/old/jboss-debug/etc/txtest.bsh
similarity index 100%
rename from jboss-debug/etc/txtest.bsh
rename to old/jboss-debug/etc/txtest.bsh
diff --git a/jboss-debug/src/main/java/com/redhat/jboss/support/debug/aop/MethodCallLoggingInterceptor.java b/old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/aop/MethodCallLoggingInterceptor.java
similarity index 100%
rename from jboss-debug/src/main/java/com/redhat/jboss/support/debug/aop/MethodCallLoggingInterceptor.java
rename to old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/aop/MethodCallLoggingInterceptor.java
diff --git a/jboss-debug/src/main/java/com/redhat/jboss/support/debug/log4j/DumpStackTraceFilter.java b/old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/log4j/DumpStackTraceFilter.java
similarity index 100%
rename from jboss-debug/src/main/java/com/redhat/jboss/support/debug/log4j/DumpStackTraceFilter.java
rename to old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/log4j/DumpStackTraceFilter.java
diff --git a/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResource.java b/old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResource.java
similarity index 100%
rename from jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResource.java
rename to old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResource.java
diff --git a/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResourceRecovery.java b/old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResourceRecovery.java
similarity index 100%
rename from jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResourceRecovery.java
rename to old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/MockXAResourceRecovery.java
diff --git a/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/SerializableMockXAResource.java b/old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/SerializableMockXAResource.java
similarity index 100%
rename from jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/SerializableMockXAResource.java
rename to old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/SerializableMockXAResource.java
diff --git a/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/XAResourceWrapper.java b/old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/XAResourceWrapper.java
similarity index 100%
rename from jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/XAResourceWrapper.java
rename to old/jboss-debug/src/main/java/com/redhat/jboss/support/debug/tx/XAResourceWrapper.java
diff --git a/jpa-managed/pom.xml b/old/jpa-managed/pom.xml
similarity index 100%
rename from jpa-managed/pom.xml
rename to old/jpa-managed/pom.xml
diff --git a/jpa-managed/src/main/java/jp/programmers/examples/jpa/Cat.java b/old/jpa-managed/src/main/java/jp/programmers/examples/jpa/Cat.java
similarity index 100%
rename from jpa-managed/src/main/java/jp/programmers/examples/jpa/Cat.java
rename to old/jpa-managed/src/main/java/jp/programmers/examples/jpa/Cat.java
diff --git a/jpa-managed/src/main/resources/META-INF/persistence.xml b/old/jpa-managed/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from jpa-managed/src/main/resources/META-INF/persistence.xml
rename to old/jpa-managed/src/main/resources/META-INF/persistence.xml
diff --git a/jpa-standalone/pom.xml b/old/jpa-standalone/pom.xml
similarity index 100%
rename from jpa-standalone/pom.xml
rename to old/jpa-standalone/pom.xml
diff --git a/jpa-standalone/src/main/java/jp/programmers/examples/jpa/Cat.java b/old/jpa-standalone/src/main/java/jp/programmers/examples/jpa/Cat.java
similarity index 100%
rename from jpa-standalone/src/main/java/jp/programmers/examples/jpa/Cat.java
rename to old/jpa-standalone/src/main/java/jp/programmers/examples/jpa/Cat.java
diff --git a/jpa-standalone/src/main/java/jp/programmers/examples/jpa/MMCat.java b/old/jpa-standalone/src/main/java/jp/programmers/examples/jpa/MMCat.java
similarity index 100%
rename from jpa-standalone/src/main/java/jp/programmers/examples/jpa/MMCat.java
rename to old/jpa-standalone/src/main/java/jp/programmers/examples/jpa/MMCat.java
diff --git a/jpa-standalone/src/main/resources/META-INF/persistence.xml b/old/jpa-standalone/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from jpa-standalone/src/main/resources/META-INF/persistence.xml
rename to old/jpa-standalone/src/main/resources/META-INF/persistence.xml
diff --git a/jpa-standalone/src/test/java/jp/programmers/examples/jpa/CatTest.java b/old/jpa-standalone/src/test/java/jp/programmers/examples/jpa/CatTest.java
similarity index 100%
rename from jpa-standalone/src/test/java/jp/programmers/examples/jpa/CatTest.java
rename to old/jpa-standalone/src/test/java/jp/programmers/examples/jpa/CatTest.java
diff --git a/mockxa/pom.xml b/old/mockxa/pom.xml
similarity index 100%
rename from mockxa/pom.xml
rename to old/mockxa/pom.xml
diff --git a/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResource.java b/old/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResource.java
similarity index 100%
rename from mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResource.java
rename to old/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResource.java
diff --git a/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecovery.java b/old/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecovery.java
similarity index 100%
rename from mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecovery.java
rename to old/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecovery.java
diff --git a/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecoveryRegistrationListener.java b/old/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecoveryRegistrationListener.java
similarity index 100%
rename from mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecoveryRegistrationListener.java
rename to old/mockxa/src/main/java/com/redhat/gss/mockxa/MockXAResourceRecoveryRegistrationListener.java
diff --git a/mockxa/src/main/java/com/redhat/gss/mockxa/SerializableMockXAResource.java b/old/mockxa/src/main/java/com/redhat/gss/mockxa/SerializableMockXAResource.java
similarity index 100%
rename from mockxa/src/main/java/com/redhat/gss/mockxa/SerializableMockXAResource.java
rename to old/mockxa/src/main/java/com/redhat/gss/mockxa/SerializableMockXAResource.java
diff --git a/mockxa/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/old/mockxa/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
similarity index 100%
rename from mockxa/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
rename to old/mockxa/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
diff --git a/mockxa/src/main/webapp/WEB-INF/web.xml b/old/mockxa/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from mockxa/src/main/webapp/WEB-INF/web.xml
rename to old/mockxa/src/main/webapp/WEB-INF/web.xml
diff --git a/mockxa/src/main/webapp/txtest.jsp b/old/mockxa/src/main/webapp/txtest.jsp
similarity index 100%
rename from mockxa/src/main/webapp/txtest.jsp
rename to old/mockxa/src/main/webapp/txtest.jsp
diff --git a/rest/pom.xml b/old/rest/pom.xml
similarity index 100%
rename from rest/pom.xml
rename to old/rest/pom.xml
diff --git a/rest/src/main/java/jp/programmers/examples/HelloRest.java b/old/rest/src/main/java/jp/programmers/examples/HelloRest.java
similarity index 100%
rename from rest/src/main/java/jp/programmers/examples/HelloRest.java
rename to old/rest/src/main/java/jp/programmers/examples/HelloRest.java
diff --git a/rest/src/main/webapp/WEB-INF/web.xml b/old/rest/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from rest/src/main/webapp/WEB-INF/web.xml
rename to old/rest/src/main/webapp/WEB-INF/web.xml
diff --git a/servlet/pom.xml b/old/servlet/pom.xml
similarity index 100%
rename from servlet/pom.xml
rename to old/servlet/pom.xml
diff --git a/servlet/src/main/java/jp/programmers/examples/ContentLengthFilter.java b/old/servlet/src/main/java/jp/programmers/examples/ContentLengthFilter.java
similarity index 100%
rename from servlet/src/main/java/jp/programmers/examples/ContentLengthFilter.java
rename to old/servlet/src/main/java/jp/programmers/examples/ContentLengthFilter.java
diff --git a/servlet/src/main/java/jp/programmers/examples/ContentLengthResponseWrapper.java b/old/servlet/src/main/java/jp/programmers/examples/ContentLengthResponseWrapper.java
similarity index 100%
rename from servlet/src/main/java/jp/programmers/examples/ContentLengthResponseWrapper.java
rename to old/servlet/src/main/java/jp/programmers/examples/ContentLengthResponseWrapper.java
diff --git a/servlet/src/main/java/jp/programmers/examples/DebugSessionListener.java b/old/servlet/src/main/java/jp/programmers/examples/DebugSessionListener.java
similarity index 100%
rename from servlet/src/main/java/jp/programmers/examples/DebugSessionListener.java
rename to old/servlet/src/main/java/jp/programmers/examples/DebugSessionListener.java
diff --git a/servlet/src/main/java/jp/programmers/examples/HelloServlet.java b/old/servlet/src/main/java/jp/programmers/examples/HelloServlet.java
similarity index 100%
rename from servlet/src/main/java/jp/programmers/examples/HelloServlet.java
rename to old/servlet/src/main/java/jp/programmers/examples/HelloServlet.java
diff --git a/servlet/src/main/java/jp/programmers/examples/Redirect.java b/old/servlet/src/main/java/jp/programmers/examples/Redirect.java
similarity index 100%
rename from servlet/src/main/java/jp/programmers/examples/Redirect.java
rename to old/servlet/src/main/java/jp/programmers/examples/Redirect.java
diff --git a/servlet/src/main/java/jp/programmers/examples/SemaphoreFilter.java b/old/servlet/src/main/java/jp/programmers/examples/SemaphoreFilter.java
similarity index 100%
rename from servlet/src/main/java/jp/programmers/examples/SemaphoreFilter.java
rename to old/servlet/src/main/java/jp/programmers/examples/SemaphoreFilter.java
diff --git a/servlet/src/main/java/jp/programmers/examples/SessionFixationProtectionFilter.java b/old/servlet/src/main/java/jp/programmers/examples/SessionFixationProtectionFilter.java
similarity index 100%
rename from servlet/src/main/java/jp/programmers/examples/SessionFixationProtectionFilter.java
rename to old/servlet/src/main/java/jp/programmers/examples/SessionFixationProtectionFilter.java
diff --git a/servlet/src/main/webapp/WEB-INF/jboss-web.xml b/old/servlet/src/main/webapp/WEB-INF/jboss-web.xml
similarity index 100%
rename from servlet/src/main/webapp/WEB-INF/jboss-web.xml
rename to old/servlet/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/servlet/src/main/webapp/WEB-INF/web.xml b/old/servlet/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from servlet/src/main/webapp/WEB-INF/web.xml
rename to old/servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/servlet/src/main/webapp/index.html b/old/servlet/src/main/webapp/index.html
similarity index 100%
rename from servlet/src/main/webapp/index.html
rename to old/servlet/src/main/webapp/index.html
diff --git a/servlet/src/main/webapp/invalidate.jsp b/old/servlet/src/main/webapp/invalidate.jsp
similarity index 100%
rename from servlet/src/main/webapp/invalidate.jsp
rename to old/servlet/src/main/webapp/invalidate.jsp
diff --git a/servlet/src/main/webapp/length/index.jsp b/old/servlet/src/main/webapp/length/index.jsp
similarity index 100%
rename from servlet/src/main/webapp/length/index.jsp
rename to old/servlet/src/main/webapp/length/index.jsp
diff --git a/servlet/src/main/webapp/listener.jsp b/old/servlet/src/main/webapp/listener.jsp
similarity index 100%
rename from servlet/src/main/webapp/listener.jsp
rename to old/servlet/src/main/webapp/listener.jsp
diff --git a/twitter/pom.xml b/old/twitter/pom.xml
similarity index 100%
rename from twitter/pom.xml
rename to old/twitter/pom.xml
diff --git a/twitter/run.sh b/old/twitter/run.sh
similarity index 100%
rename from twitter/run.sh
rename to old/twitter/run.sh
diff --git a/twitter/src/main/java/jp/programmers/examples/twitter/HelloTwitter.java b/old/twitter/src/main/java/jp/programmers/examples/twitter/HelloTwitter.java
similarity index 100%
rename from twitter/src/main/java/jp/programmers/examples/twitter/HelloTwitter.java
rename to old/twitter/src/main/java/jp/programmers/examples/twitter/HelloTwitter.java
diff --git a/xnio3-example/pom.xml b/old/xnio3-example/pom.xml
similarity index 100%
rename from xnio3-example/pom.xml
rename to old/xnio3-example/pom.xml
diff --git a/xnio3-example/run.sh b/old/xnio3-example/run.sh
similarity index 100%
rename from xnio3-example/run.sh
rename to old/xnio3-example/run.sh
diff --git a/xnio3-example/src/main/java/jp/programmers/xnio3/examples/EchoServer.java b/old/xnio3-example/src/main/java/jp/programmers/xnio3/examples/EchoServer.java
similarity index 100%
rename from xnio3-example/src/main/java/jp/programmers/xnio3/examples/EchoServer.java
rename to old/xnio3-example/src/main/java/jp/programmers/xnio3/examples/EchoServer.java
diff --git a/rhgss/jdg-standalone/exec-java.sh b/rhgss/jdg-standalone/exec-java.sh
new file mode 100644
index 0000000..e81457b
--- /dev/null
+++ b/rhgss/jdg-standalone/exec-java.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mvn -e exec:java -Dexec.mainClass=com.redhat.gss.example.JDGStandalone
|
nekop/java-examples
|
254424fa78618142ad1cd8f9dc9019e2496288a5
|
Add simple example
|
diff --git a/rhgss/jdg-standalone/pom.xml b/rhgss/jdg-standalone/pom.xml
index e4a3cb7..7c2a9ad 100644
--- a/rhgss/jdg-standalone/pom.xml
+++ b/rhgss/jdg-standalone/pom.xml
@@ -1,144 +1,144 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.redhat.gss.example.jdg</groupId>
<artifactId>jdg-standalone</artifactId>
<packaging>jar</packaging>
<name>jdg-standalone</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.infinispan.bom>6.1.0.Final-redhat-4</version.org.infinispan.bom>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>redhat</id>
<name>redhat</name>
<url>http://maven.repository.redhat.com/techpreview/all/</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>redhat</id>
<name>redhat</name>
<url>http://maven.repository.redhat.com/techpreview/all/</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-bom</artifactId>
<version>${version.org.infinispan.bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
</plugins>
</build>
</project>
diff --git a/rhgss/jdg-standalone/src/main/java/com/redhat/gss/example/JDGStandalone.java b/rhgss/jdg-standalone/src/main/java/com/redhat/gss/example/JDGStandalone.java
index ab4c1e6..d36a8a1 100644
--- a/rhgss/jdg-standalone/src/main/java/com/redhat/gss/example/JDGStandalone.java
+++ b/rhgss/jdg-standalone/src/main/java/com/redhat/gss/example/JDGStandalone.java
@@ -1,17 +1,45 @@
/*
* To the extent possible under law, Red Hat, Inc. has dedicated all
* copyright to this software to the public domain worldwide, pursuant
* to the CC0 Public Domain Dedication. This software is distributed
* without any warranty.
*
* See <http://creativecommons.org/publicdomain/zero/1.0/>.
*/
package com.redhat.gss.example;
+import org.infinispan.Cache;
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.configuration.global.GlobalConfiguration;
+import org.infinispan.configuration.global.GlobalConfigurationBuilder;
+import org.infinispan.configuration.cache.Configuration;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
+import org.infinispan.configuration.cache.CacheMode;
+
public class JDGStandalone {
- public static void main(String[] args) {
- // todo: implement Infinispan stuff
+ public static void main(String[] args) throws Exception {
+ simple();
}
+ public static void simple() throws Exception {
+ GlobalConfiguration globalConfig =
+ new GlobalConfigurationBuilder()
+ .globalJmxStatistics().allowDuplicateDomains(true)
+ .transport()
+ .defaultTransport()
+ .build();
+ Configuration defaultCacheConfig =
+ new ConfigurationBuilder()
+ .clustering()
+ .cacheMode(CacheMode.DIST_ASYNC)
+ .build();
+ DefaultCacheManager cm = new DefaultCacheManager(globalConfig, defaultCacheConfig);
+ Cache cache = cm.getCache();
+ System.out.println("sleep 20 sec");
+ try {
+ Thread.sleep(20000);
+ } catch (InterruptedException ignore) { }
+ cm.stop();
+ }
}
|
nekop/java-examples
|
17e11696488fe01c200c8e07258dc08c1cca5c48
|
Add jdg examples
|
diff --git a/rhgss/jdg-standalone/pom.xml b/rhgss/jdg-standalone/pom.xml
new file mode 100644
index 0000000..e4a3cb7
--- /dev/null
+++ b/rhgss/jdg-standalone/pom.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.redhat.gss.example.jdg</groupId>
+ <artifactId>jdg-standalone</artifactId>
+ <packaging>jar</packaging>
+ <name>jdg-standalone</name>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.infinispan.bom>6.1.0.Final-redhat-4</version.org.infinispan.bom>
+
+ <version.junit>4.11</version.junit>
+ <version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
+ <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>redhat</id>
+ <name>redhat</name>
+ <url>http://maven.repository.redhat.com/techpreview/all/</url>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>redhat</id>
+ <name>redhat</name>
+ <url>http://maven.repository.redhat.com/techpreview/all/</url>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-bom</artifactId>
+ <version>${version.org.infinispan.bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.maven-surefire-plugin}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/rhgss/jdg-standalone/src/main/java/com/redhat/gss/example/JDGStandalone.java b/rhgss/jdg-standalone/src/main/java/com/redhat/gss/example/JDGStandalone.java
new file mode 100644
index 0000000..ab4c1e6
--- /dev/null
+++ b/rhgss/jdg-standalone/src/main/java/com/redhat/gss/example/JDGStandalone.java
@@ -0,0 +1,17 @@
+/*
+ * To the extent possible under law, Red Hat, Inc. has dedicated all
+ * copyright to this software to the public domain worldwide, pursuant
+ * to the CC0 Public Domain Dedication. This software is distributed
+ * without any warranty.
+ *
+ * See <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+package com.redhat.gss.example;
+
+public class JDGStandalone {
+
+ public static void main(String[] args) {
+ // todo: implement Infinispan stuff
+ }
+
+}
diff --git a/rhgss/jdg-webapp/pom.xml b/rhgss/jdg-webapp/pom.xml
new file mode 100644
index 0000000..8dd68c7
--- /dev/null
+++ b/rhgss/jdg-webapp/pom.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.redhat.gss.example.jdg</groupId>
+ <artifactId>jdg-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>jdg-webapp</name>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
+ <version.org.infinispan.bom>6.1.0.Final-redhat-4</version.org.infinispan.bom>
+
+ <version.org.jboss.arquillian.arquillian-bom>1.1.5.Final</version.org.jboss.arquillian.arquillian-bom>
+ <version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
+ <version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
+ <version.junit>4.11</version.junit>
+ <version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
+ <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
+ <version.maven-war-plugin>2.4</version.maven-war-plugin>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>redhat</id>
+ <name>redhat</name>
+ <url>http://maven.repository.redhat.com/techpreview/all/</url>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>redhat</id>
+ <name>redhat</name>
+ <url>http://maven.repository.redhat.com/techpreview/all/</url>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.org.jboss.arquillian.arquillian-bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-bom</artifactId>
+ <version>${version.org.infinispan.bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- This Java EE 6 API jar is crippled, do NOT use for real projects/testing.
+ Fixed in Java EE 7.
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+ <!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
+ <scope>provided</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.maven-surefire-plugin}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>arq-managed</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>arq-remote</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-remote</artifactId>
+ <version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/rhgss/jdg-webapp/src/main/java/com/redhat/gss/example/JDGTestServlet.java b/rhgss/jdg-webapp/src/main/java/com/redhat/gss/example/JDGTestServlet.java
new file mode 100644
index 0000000..e5bd6e3
--- /dev/null
+++ b/rhgss/jdg-webapp/src/main/java/com/redhat/gss/example/JDGTestServlet.java
@@ -0,0 +1,35 @@
+/*
+ * To the extent possible under law, Red Hat, Inc. has dedicated all
+ * copyright to this software to the public domain worldwide, pursuant
+ * to the CC0 Public Domain Dedication. This software is distributed
+ * without any warranty.
+ *
+ * See <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+package com.redhat.gss.example;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+@WebServlet("/jdgtest")
+public class JDGTestServlet extends HttpServlet {
+
+ private Logger log =
+ LogManager.getLogManager().getLogger(JDGTestServlet.class.getName());
+
+ // TODO: Implement basic Infinispan stuff
+ public void doGet(ServletRequest request,
+ ServletResponse response)
+ throws IOException, ServletException {
+ }
+
+}
|
nekop/java-examples
|
30dc57c22cc8777290ab7bff98b780b7a0a56a52
|
Enable JSONP
|
diff --git a/jaxrs-jsonp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/jaxrs-jsonp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..a3a594f
--- /dev/null
+++ b/jaxrs-jsonp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,7 @@
+<jboss-deployment-structure>
+ <deployment>
+ <dependencies>
+ <module name="org.jboss.resteasy.resteasy-jackson-provider" annotations="true"/>
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
|
nekop/java-examples
|
6f051fbf0616913edf5d9b992fa113672082a2c5
|
Add JAX-RS JSONP example
|
diff --git a/jaxrs-jsonp/README.md b/jaxrs-jsonp/README.md
new file mode 100644
index 0000000..cc9d7ab
--- /dev/null
+++ b/jaxrs-jsonp/README.md
@@ -0,0 +1,7 @@
+To test GET:
+
+> $ curl -v http://localhost:8080/jaxrs-jsonp/rest/hello
+
+To test POST:
+
+> $ curl -v -H "Accept: application/json" -H "Content-type: application/json" -X POST -d '{"message":"hello"}' http://localhost:8080/jaxrs-jsonp/rest/hello
\ No newline at end of file
diff --git a/jaxrs-jsonp/pom.xml b/jaxrs-jsonp/pom.xml
new file mode 100644
index 0000000..2b4182d
--- /dev/null
+++ b/jaxrs-jsonp/pom.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+ Java EE 7 minimal pom.xml, works with WildFly 8.1.
+
+ https://github.com/nekop/java-examples/blob/master/maven/
+
+ Put your source code, config files, boot the application server and run:
+ $ mvn clean install -Parq-remote
+
+ [Summary]
+ Additional Repository: JBoss Public
+ Compile Deps: Java EE 7 Web Profile
+ Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
+ Profiles: arq-managed, arq-remote
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>jaxrs-jsonp</artifactId>
+ <packaging>war</packaging>
+ <name>jaxrs-jsonp</name>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.jboss.arquillian.arquillian-bom>1.1.5.Final</version.org.jboss.arquillian.arquillian-bom>
+ <version.wildfly>8.1.0.Final</version.wildfly>
+ <version.junit>4.11</version.junit>
+ <version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
+ <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
+ <version.maven-war-plugin>2.4</version.maven-war-plugin>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.org.jboss.arquillian.arquillian-bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>7.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.maven-surefire-plugin}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>arq-managed</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-managed</artifactId>
+ <version>${version.wildfly}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>arq-remote</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-remote</artifactId>
+ <version>${version.wildfly}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/HelloJson.java b/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/HelloJson.java
new file mode 100644
index 0000000..c140dcd
--- /dev/null
+++ b/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/HelloJson.java
@@ -0,0 +1,28 @@
+package com.github.nekop.example.jaxrs.jsonp;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloJson {
+
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public Object hello() {
+ System.out.println("HelloJson#hello()");
+ return new RestMessage("hello");
+ }
+
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Object echo(RestMessage message) {
+ System.out.println("HelloJson#echo()");
+ return message;
+ }
+
+}
diff --git a/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestBootstrap.java b/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestBootstrap.java
new file mode 100644
index 0000000..5a26ad3
--- /dev/null
+++ b/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestBootstrap.java
@@ -0,0 +1,7 @@
+package com.github.nekop.example.jaxrs.jsonp;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/rest")
+public class RestBootstrap extends Application { }
diff --git a/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestMessage.java b/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestMessage.java
new file mode 100644
index 0000000..cbfd64f
--- /dev/null
+++ b/jaxrs-jsonp/src/main/java/com/github/nekop/example/jaxrs/jsonp/RestMessage.java
@@ -0,0 +1,22 @@
+package com.github.nekop.example.jaxrs.jsonp;
+
+public class RestMessage {
+
+ public RestMessage() {
+ }
+
+ public RestMessage(String message) {
+ setMessage(message);
+ }
+
+ private String message;
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+}
|
nekop/java-examples
|
6411c1662583fc20c5d374b40f3f1a359a16bc57
|
Add ejb2dep example
|
diff --git a/rhgss/ejb2dep/ear/pom.xml b/rhgss/ejb2dep/ear/pom.xml
new file mode 100644
index 0000000..1a240e8
--- /dev/null
+++ b/rhgss/ejb2dep/ear/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep-ear</artifactId>
+ <name>ejb2dep-ear</name>
+ <version>1.0</version>
+ <packaging>ear</packaging>
+
+ <parent>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-ejb1</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-ejb2</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/rhgss/ejb2dep/ejb1/pom.xml b/rhgss/ejb2dep/ejb1/pom.xml
new file mode 100644
index 0000000..ab90057
--- /dev/null
+++ b/rhgss/ejb2dep/ejb1/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep-ejb1</artifactId>
+ <name>ejb2dep-ejb1</name>
+ <packaging>ejb</packaging>
+ <version>1.0</version>
+
+ <parent>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-ejb2</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xdoclet-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>xdoclet</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ejbdoclet destDir="${project.build.directory}/generated-sources/xdoclet"
+ ejbSpec="2.1">
+ <fileset dir="${project.build.sourceDirectory}">
+ <include name="**/*Bean.java" />
+ <include name="**/*MDB.java" />
+ </fileset>
+ <homeinterface />
+ <remoteinterface />
+ <localinterface />
+ <localhomeinterface />
+ </ejbdoclet>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/rhgss/ejb2dep/ejb1/src/main/java/com/redhat/gss/example/ejb2dep/ejb1/EJB1Bean.java b/rhgss/ejb2dep/ejb1/src/main/java/com/redhat/gss/example/ejb2dep/ejb1/EJB1Bean.java
new file mode 100644
index 0000000..7f900fc
--- /dev/null
+++ b/rhgss/ejb2dep/ejb1/src/main/java/com/redhat/gss/example/ejb2dep/ejb1/EJB1Bean.java
@@ -0,0 +1,40 @@
+package com.redhat.gss.example.ejb2dep.ejb1;
+
+import java.rmi.RemoteException;
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import com.redhat.gss.example.ejb2dep.ejb2.EJB2LocalHome;
+import com.redhat.gss.example.ejb2dep.ejb2.EJB2Local;
+
+/**
+ * @ejb.bean name="EJB1" type="Stateless"
+ * //@ejb.ejb-ref ejb-name="EJB2Local" view-type="local" ref-name="ejb/EJB2LocalHome"
+ */
+public class EJB1Bean implements SessionBean {
+
+ private SessionContext ctx;
+
+ /**
+ * @ejb.interface-method view-type="local"
+ */
+ public String echo(String name) {
+ try {
+ EJB2LocalHome ejb2home = InitialContext.doLookup("java:comp/env/ejb/EJB2LocalHome");
+ EJB2Local ejb2 = ejb2home.create();
+ return ejb2.echo(name);
+ } catch (Exception ex) {
+ throw new RuntimeException("EJB2 invoke error", ex);
+ }
+ }
+
+ public void ejbCreate() { }
+ public void ejbActivate() throws EJBException, RemoteException { }
+ public void ejbPassivate() throws EJBException, RemoteException { }
+ public void ejbRemove() throws EJBException, RemoteException { }
+ public void setSessionContext(SessionContext context)
+ throws EJBException, RemoteException {
+ this.ctx = context;
+ }
+}
diff --git a/rhgss/ejb2dep/ejb1/src/main/resources/META-INF/ejb-jar.xml b/rhgss/ejb2dep/ejb1/src/main/resources/META-INF/ejb-jar.xml
new file mode 100644
index 0000000..6341fc4
--- /dev/null
+++ b/rhgss/ejb2dep/ejb1/src/main/resources/META-INF/ejb-jar.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" version="2.1">
+
+ <description><![CDATA[No Description.]]></description>
+ <display-name>Generated by XDoclet</display-name>
+
+ <enterprise-beans>
+
+ <!-- Session Beans -->
+ <session >
+ <ejb-name>EJB1</ejb-name>
+
+ <home>com.redhat.gss.example.ejb2dep.ejb1.EJB1Home</home>
+ <remote>com.redhat.gss.example.ejb2dep.ejb1.EJB1</remote>
+ <local-home>com.redhat.gss.example.ejb2dep.ejb1.EJB1LocalHome</local-home>
+ <local>com.redhat.gss.example.ejb2dep.ejb1.EJB1Local</local>
+ <ejb-class>com.redhat.gss.example.ejb2dep.ejb1.EJB1Bean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/EJB2LocalHome</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <local-home>com.redhat.gss.example.ejb2dep.ejb2.EJB2LocalHome</local-home>
+ <local>com.redhat.gss.example.ejb2dep.ejb2.EJB2Local</local>
+ </ejb-local-ref>
+ </session>
+
+ </enterprise-beans>
+
+</ejb-jar>
diff --git a/rhgss/ejb2dep/ejb1/src/main/resources/META-INF/jboss-ejb3.xml b/rhgss/ejb2dep/ejb1/src/main/resources/META-INF/jboss-ejb3.xml
new file mode 100644
index 0000000..388ae51
--- /dev/null
+++ b/rhgss/ejb2dep/ejb1/src/main/resources/META-INF/jboss-ejb3.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<jboss:ejb-jar xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-2_0.xsd
+ http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1"
+ impl-version="2.0">
+
+ <enterprise-beans>
+
+ <session>
+ <ejb-name>EJB1</ejb-name>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/EJB2LocalHome</ejb-ref-name>
+ <jndi-name>java:app/ejb2dep-ejb2-1.0/EJB2!com.redhat.gss.example.ejb2dep.ejb2.EJB2LocalHome</jndi-name>
+ </ejb-local-ref>
+
+ </session>
+
+ </enterprise-beans>
+</jboss:ejb-jar>
diff --git a/rhgss/ejb2dep/ejb2/pom.xml b/rhgss/ejb2dep/ejb2/pom.xml
new file mode 100644
index 0000000..0739655
--- /dev/null
+++ b/rhgss/ejb2dep/ejb2/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep-ejb2</artifactId>
+ <name>ejb2dep-ejb2</name>
+ <packaging>ejb</packaging>
+ <version>1.0</version>
+
+ <parent>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xdoclet-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>xdoclet</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ejbdoclet destDir="${project.build.directory}/generated-sources/xdoclet"
+ ejbSpec="2.1">
+ <fileset dir="${project.build.sourceDirectory}">
+ <include name="**/*Bean.java" />
+ <include name="**/*MDB.java" />
+ </fileset>
+ <homeinterface />
+ <remoteinterface />
+ <localinterface />
+ <localhomeinterface />
+ <deploymentdescriptor destDir="${project.build.outputDirectory}/META-INF" />
+ </ejbdoclet>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/rhgss/ejb2dep/ejb2/src/main/java/com/redhat/gss/example/ejb2dep/ejb2/EJB2Bean.java b/rhgss/ejb2dep/ejb2/src/main/java/com/redhat/gss/example/ejb2dep/ejb2/EJB2Bean.java
new file mode 100644
index 0000000..a4a411a
--- /dev/null
+++ b/rhgss/ejb2dep/ejb2/src/main/java/com/redhat/gss/example/ejb2dep/ejb2/EJB2Bean.java
@@ -0,0 +1,30 @@
+package com.redhat.gss.example.ejb2dep.ejb2;
+
+import java.rmi.RemoteException;
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * @ejb.bean name="EJB2" type="Stateless"
+ */
+public class EJB2Bean implements SessionBean {
+
+ private SessionContext ctx;
+
+ /**
+ * @ejb.interface-method view-type="local"
+ */
+ public String echo(String name) {
+ return name;
+ }
+
+ public void ejbCreate() { }
+ public void ejbActivate() throws EJBException, RemoteException { }
+ public void ejbPassivate() throws EJBException, RemoteException { }
+ public void ejbRemove() throws EJBException, RemoteException { }
+ public void setSessionContext(SessionContext context)
+ throws EJBException, RemoteException {
+ this.ctx = context;
+ }
+}
diff --git a/rhgss/ejb2dep/pom.xml b/rhgss/ejb2dep/pom.xml
new file mode 100644
index 0000000..83e84f9
--- /dev/null
+++ b/rhgss/ejb2dep/pom.xml
@@ -0,0 +1,132 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep</artifactId>
+ <name>ejb2dep</name>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.jboss.spec.jboss-javaee-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-6.0>
+
+ <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
+ <version.maven-ear-plugin>2.9.1</version.maven-ear-plugin>
+ <version.maven-ejb-plugin>2.4</version.maven-ejb-plugin>
+ <version.maven-war-plugin>2.4</version.maven-war-plugin>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>${version.org.jboss.spec.jboss-javaee-6.0}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>${version.maven-ejb-plugin}</version>
+ <configuration>
+ <ejbVersion>3.1</ejbVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>${version.maven-ear-plugin}</version>
+ <configuration>
+ <finalName>ejb2dep</finalName>
+ <version>6</version>
+ <modules>
+ <ejbModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-ejb1</artifactId>
+ </ejbModule>
+ <ejbModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-ejb2</artifactId>
+ </ejbModule>
+ <webModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-web</artifactId>
+ </webModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>ejb2</module>
+ <module>ejb1</module>
+ <module>web</module>
+ <module>ear</module>
+ </modules>
+
+</project>
diff --git a/rhgss/ejb2dep/web/pom.xml b/rhgss/ejb2dep/web/pom.xml
new file mode 100644
index 0000000..80ff96b
--- /dev/null
+++ b/rhgss/ejb2dep/web/pom.xml
@@ -0,0 +1,45 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep-web</artifactId>
+ <name>ejb2dep-web</name>
+ <version>1.0</version>
+ <packaging>war</packaging>
+
+ <parent>
+ <groupId>com.redhat.gss.example.ejb2dep</groupId>
+ <artifactId>ejb2dep</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-ejb1</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ejb2dep-ejb2</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/rhgss/ejb2dep/web/src/main/java/com/redhat/gss/example/ejb2dep/web/TestServlet.java b/rhgss/ejb2dep/web/src/main/java/com/redhat/gss/example/ejb2dep/web/TestServlet.java
new file mode 100644
index 0000000..63e064b
--- /dev/null
+++ b/rhgss/ejb2dep/web/src/main/java/com/redhat/gss/example/ejb2dep/web/TestServlet.java
@@ -0,0 +1,27 @@
+package com.redhat.gss.example.ejb2dep.web;
+
+import java.io.IOException;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.redhat.gss.example.ejb2dep.ejb1.EJB1LocalHome;
+import com.redhat.gss.example.ejb2dep.ejb1.EJB1Local;
+
+@WebServlet(urlPatterns={"/test"})
+public class TestServlet extends HttpServlet {
+
+ public void doGet(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException, IOException {
+ try {
+ EJB1LocalHome ejb1home = InitialContext.doLookup("java:comp/env/ejb/EJB1LocalHome");
+ EJB1Local ejb1 = ejb1home.create();
+ String result = ejb1.echo("foo");
+ res.getWriter().println(result);
+ } catch (Exception ex) {
+ throw new RuntimeException("EJB1 invoke error", ex);
+ }
+ }
+}
diff --git a/rhgss/ejb2dep/web/src/main/webapp/WEB-INF/jboss-web.xml b/rhgss/ejb2dep/web/src/main/webapp/WEB-INF/jboss-web.xml
new file mode 100644
index 0000000..accf844
--- /dev/null
+++ b/rhgss/ejb2dep/web/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<jboss-web version="7.2"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.com/xml/ns/javaee/jboss-web_7_2.xsd">
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/EJB1LocalHome</ejb-ref-name>
+ <jndi-name>java:app/ejb2dep-ejb1-1.0/EJB1!com.redhat.gss.example.ejb2dep.ejb1.EJB1LocalHome</jndi-name>
+ </ejb-local-ref>
+
+</jboss-web>
+
diff --git a/rhgss/ejb2dep/web/src/main/webapp/WEB-INF/web.xml b/rhgss/ejb2dep/web/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..36c9821
--- /dev/null
+++ b/rhgss/ejb2dep/web/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/EJB1LocalHome</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <local-home>com.redhat.gss.example.ejb2dep.ejb1.EJB1LocalHome</local-home>
+ <local>com.redhat.gss.example.ejb2dep.ejb1.EJB1Local</local>
+ </ejb-local-ref>
+
+</web-app>
|
nekop/java-examples
|
48c192c41bae20ff7aa462ff1fc75469bb8e54c8
|
Fix inconsistent ejb and web modules order, always ejb first
|
diff --git a/maven/ee6full/pom.xml b/maven/ee6full/pom.xml
index 85b469c..809e2dd 100644
--- a/maven/ee6full/pom.xml
+++ b/maven/ee6full/pom.xml
@@ -1,127 +1,127 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee6full</artifactId>
<name>ee6full</name>
<version>1.0</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-6.0>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-ear-plugin>2.9.1</version.maven-ear-plugin>
<version.maven-ejb-plugin>2.4</version.maven-ejb-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-6.0}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>${version.maven-war-plugin}</version>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>${version.maven-ejb-plugin}</version>
<configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
+ <ejbVersion>3.1</ejbVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <version>${version.maven-ejb-plugin}</version>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
<configuration>
- <ejbVersion>3.1</ejbVersion>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>${version.maven-ear-plugin}</version>
<configuration>
<finalName>ee6full</finalName>
<version>6</version>
<modules>
- <webModule>
- <groupId>${project.groupId}</groupId>
- <artifactId>ee6full-web</artifactId>
- </webModule>
<ejbModule>
<groupId>${project.groupId}</groupId>
<artifactId>ee6full-ejb</artifactId>
</ejbModule>
+ <webModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ee6full-web</artifactId>
+ </webModule>
</modules>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
<modules>
<module>ejb</module>
<module>web</module>
<module>ear</module>
</modules>
</project>
|
nekop/java-examples
|
e5bd3127dab3d33f6e7aa49bfe81e3de40161a79
|
Add Java EE 6 Full EAR pom files
|
diff --git a/maven/ee6full/ear/pom.xml b/maven/ee6full/ear/pom.xml
new file mode 100644
index 0000000..f9df990
--- /dev/null
+++ b/maven/ee6full/ear/pom.xml
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6full-ear</artifactId>
+ <name>ee6full-ear</name>
+ <version>1.0</version>
+ <packaging>ear</packaging>
+
+ <parent>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6full</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ee6full-ejb</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ee6full-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/maven/ee6full/ejb/pom.xml b/maven/ee6full/ejb/pom.xml
new file mode 100644
index 0000000..a481ddc
--- /dev/null
+++ b/maven/ee6full/ejb/pom.xml
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6full-ejb</artifactId>
+ <name>ee6full-ejb</name>
+ <version>1.0</version>
+ <packaging>ejb</packaging>
+
+ <parent>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6full</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+</project>
diff --git a/maven/ee6full/pom.xml b/maven/ee6full/pom.xml
new file mode 100644
index 0000000..85b469c
--- /dev/null
+++ b/maven/ee6full/pom.xml
@@ -0,0 +1,127 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6full</artifactId>
+ <name>ee6full</name>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.jboss.spec.jboss-javaee-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-6.0>
+
+ <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
+ <version.maven-ear-plugin>2.9.1</version.maven-ear-plugin>
+ <version.maven-ejb-plugin>2.4</version.maven-ejb-plugin>
+ <version.maven-war-plugin>2.4</version.maven-war-plugin>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>${version.org.jboss.spec.jboss-javaee-6.0}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>${version.maven-ejb-plugin}</version>
+ <configuration>
+ <ejbVersion>3.1</ejbVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>${version.maven-ear-plugin}</version>
+ <configuration>
+ <finalName>ee6full</finalName>
+ <version>6</version>
+ <modules>
+ <webModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ee6full-web</artifactId>
+ </webModule>
+ <ejbModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ee6full-ejb</artifactId>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>ejb</module>
+ <module>web</module>
+ <module>ear</module>
+ </modules>
+
+</project>
diff --git a/maven/ee6full/web/pom.xml b/maven/ee6full/web/pom.xml
new file mode 100644
index 0000000..6ba978d
--- /dev/null
+++ b/maven/ee6full/web/pom.xml
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6full-web</artifactId>
+ <name>ee6full-web</name>
+ <version>1.0</version>
+ <packaging>war</packaging>
+
+ <parent>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6full</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ee6full-ejb</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
|
nekop/java-examples
|
8863dcfd367152fcabf2d2907d1d56fd3e3c3d95
|
Added URL
|
diff --git a/maven/pom-ee6web.xml b/maven/pom-ee6web.xml
index 2dbb607..225bb08 100644
--- a/maven/pom-ee6web.xml
+++ b/maven/pom-ee6web.xml
@@ -1,173 +1,175 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
Java EE 6 minimal pom.xml, works with JBoss EAP 6.
+ https://github.com/nekop/java-examples/blob/master/maven/
+
Put your source code, config files, boot the application server and run:
$ mvn clean install -Parq-remote
[Summary]
Additional Repository: JBoss Public
Compile Deps: Java EE 6 Web Profile
Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
Profiles: arq-managed, arq-remote
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee6web</artifactId>
<packaging>war</packaging>
<name>ee6web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.5.Final</version.org.jboss.arquillian.arquillian-bom>
<version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
<version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- This Java EE 6 API jar is crippled, do NOT use for real projects/testing.
Fixed in Java EE 7.
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
diff --git a/maven/pom-ee7web.xml b/maven/pom-ee7web.xml
index 0731d17..aaed80a 100644
--- a/maven/pom-ee7web.xml
+++ b/maven/pom-ee7web.xml
@@ -1,159 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
Java EE 7 minimal pom.xml, works with WildFly 8.1.
+ https://github.com/nekop/java-examples/blob/master/maven/
+
Put your source code, config files, boot the application server and run:
$ mvn clean install -Parq-remote
[Summary]
Additional Repository: JBoss Public
Compile Deps: Java EE 7 Web Profile
Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
Profiles: arq-managed, arq-remote
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee7web</artifactId>
<packaging>war</packaging>
<name>ee7web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.arquillian.arquillian-bom>1.1.5.Final</version.org.jboss.arquillian.arquillian-bom>
<version.wildfly>8.1.0.Final</version.wildfly>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
|
nekop/java-examples
|
142c6d5c11e8629d511e00c874d4711c191be904
|
Broken spec jar has been fixed in EE 7
|
diff --git a/maven/pom-ee6web.xml b/maven/pom-ee6web.xml
index f68ba27..083b0f1 100644
--- a/maven/pom-ee6web.xml
+++ b/maven/pom-ee6web.xml
@@ -1,172 +1,173 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
Java EE 6 minimal pom.xml, works with JBoss EAP 6.
Put your source code, config files, boot the application server and run:
$ mvn clean install -Parq-remote
[Summary]
Additional Repository: JBoss Public
Compile Deps: Java EE 6 Web Profile
Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
Profiles: arq-managed, arq-remote
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee6web</artifactId>
<packaging>war</packaging>
<name>ee6web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
<version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <!-- prune API jar, do NOT use for real projects/testing
+ <!-- This Java EE 6 API jar is crippled, do NOT use for real projects/testing.
+ Fixed in Java EE 7.
<dependency>
<groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <artifactId>javaee-web-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
diff --git a/maven/pom-ee7web.xml b/maven/pom-ee7web.xml
index 8c20102..23c642c 100644
--- a/maven/pom-ee7web.xml
+++ b/maven/pom-ee7web.xml
@@ -1,171 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
Java EE 7 minimal pom.xml, works with WildFly 8.1.
Put your source code, config files, boot the application server and run:
$ mvn clean install -Parq-remote
[Summary]
Additional Repository: JBoss Public
Compile Deps: Java EE 7 Web Profile
Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
Profiles: arq-managed, arq-remote
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee7web</artifactId>
<packaging>war</packaging>
<name>ee7web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <version.org.jboss.spec.jboss-javaee-web-7.0>1.0.0.Final</version.org.jboss.spec.jboss-javaee-web-7.0>
-
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.wildfly>8.1.0.Final</version.wildfly>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <!-- prune API jar, do NOT use for real projects/testing
<dependency>
<groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <artifactId>javaee-web-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
- -->
- <!-- Java EE 7 API jars. It's actually a bom, but we can use it as a depchain -->
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-7.0</artifactId>
- <version>${version.org.jboss.spec.jboss-javaee-web-7.0}</version>
- <scope>provided</scope>
- <type>pom</type>
- </dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
|
nekop/java-examples
|
3d4610285f2c5a6f0207aeed0f417fead29cb572
|
Add basic steps in the comment
|
diff --git a/maven/pom-ee6web.xml b/maven/pom-ee6web.xml
index 18a422c..f68ba27 100644
--- a/maven/pom-ee6web.xml
+++ b/maven/pom-ee6web.xml
@@ -1,169 +1,172 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
- Java EE 6 minimal pom.xml, works with JBoss EAP 6
+ Java EE 6 minimal pom.xml, works with JBoss EAP 6.
+
+ Put your source code, config files, boot the application server and run:
+ $ mvn clean install -Parq-remote
[Summary]
Additional Repository: JBoss Public
Compile Deps: Java EE 6 Web Profile
Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
Profiles: arq-managed, arq-remote
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee6web</artifactId>
<packaging>war</packaging>
<name>ee6web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
<version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- prune API jar, do NOT use for real projects/testing
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
diff --git a/maven/pom-ee7web.xml b/maven/pom-ee7web.xml
index 09f21c2..ede92ab 100644
--- a/maven/pom-ee7web.xml
+++ b/maven/pom-ee7web.xml
@@ -1,168 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
- Java EE 7 minimal pom.xml, works with WildFly 8.1
+ Java EE 7 minimal pom.xml, works with WildFly 8.1.
+
+ Put your source code, config files, boot the application server and run:
+ $ mvn clean install -Parq-remote
[Summary]
Additional Repository: JBoss Public
Compile Deps: Java EE 7 Web Profile
Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
Profiles: arq-managed, arq-remote
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee7web</artifactId>
<packaging>war</packaging>
<name>ee7web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-7.0>1.0.0.Final</version.org.jboss.spec.jboss-javaee-web-7.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.wildfly>8.1.0.CR2</version.wildfly>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- prune API jar, do NOT use for real projects/testing
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 7 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-7.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-7.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
|
nekop/java-examples
|
f610d819d1ad8a9ff2d6b4595c94c500ac1044a7
|
Add summary comment
|
diff --git a/maven/pom-ee6web.xml b/maven/pom-ee6web.xml
index b167a25..18a422c 100644
--- a/maven/pom-ee6web.xml
+++ b/maven/pom-ee6web.xml
@@ -1,159 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Java EE 6 minimal pom.xml, works with JBoss EAP 6
+
+ [Summary]
+ Additional Repository: JBoss Public
+ Compile Deps: Java EE 6 Web Profile
+ Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
+ Profiles: arq-managed, arq-remote
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee6web</artifactId>
<packaging>war</packaging>
<name>ee6web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
<version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- prune API jar, do NOT use for real projects/testing
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
diff --git a/maven/pom-ee7web.xml b/maven/pom-ee7web.xml
index 6f67cd4..09f21c2 100644
--- a/maven/pom-ee7web.xml
+++ b/maven/pom-ee7web.xml
@@ -1,158 +1,168 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Java EE 7 minimal pom.xml, works with WildFly 8.1
+
+ [Summary]
+ Additional Repository: JBoss Public
+ Compile Deps: Java EE 7 Web Profile
+ Test Deps: JUnit, Arquillian and ShrinkWrap Resolver
+ Profiles: arq-managed, arq-remote
+ -->
+
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee7web</artifactId>
<packaging>war</packaging>
<name>ee7web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-7.0>1.0.0.Final</version.org.jboss.spec.jboss-javaee-web-7.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.wildfly>8.1.0.CR2</version.wildfly>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
<repositories>
<repository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>jboss-public</id>
<name>JBoss Public Maven Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- prune API jar, do NOT use for real projects/testing
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 7 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-7.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-7.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
|
nekop/java-examples
|
e2dc902a66288b5a6e735ee99d94ac133a6398f8
|
Add jboss repo
|
diff --git a/maven/pom-ee6web.xml b/maven/pom-ee6web.xml
index 3bb7cee..b167a25 100644
--- a/maven/pom-ee6web.xml
+++ b/maven/pom-ee6web.xml
@@ -1,130 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee6web</artifactId>
<packaging>war</packaging>
<name>ee6web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
<version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- prune API jar, do NOT use for real projects/testing
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
diff --git a/maven/pom-ee7web.xml b/maven/pom-ee7web.xml
index b0c6e61..6f67cd4 100644
--- a/maven/pom-ee7web.xml
+++ b/maven/pom-ee7web.xml
@@ -1,129 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.nekop</groupId>
<artifactId>ee7web</artifactId>
<packaging>war</packaging>
<name>ee7web</name>
<version>1.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.org.jboss.spec.jboss-javaee-web-7.0>1.0.0.Final</version.org.jboss.spec.jboss-javaee-web-7.0>
<version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
<version.wildfly>8.1.0.CR2</version.wildfly>
<version.junit>4.11</version.junit>
<version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
<version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
<version.maven-war-plugin>2.4</version.maven-war-plugin>
</properties>
+ <repositories>
+ <repository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.org.jboss.arquillian.arquillian-bom}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- prune API jar, do NOT use for real projects/testing
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
-->
<!-- Java EE 7 API jars. It's actually a bom, but we can use it as a depchain -->
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-7.0</artifactId>
<version>${version.org.jboss.spec.jboss-javaee-web-7.0}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>arq-managed</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>arq-remote</id>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>${version.wildfly}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
|
nekop/java-examples
|
f0383dabd1988c9e6aa7c3de064c697570419840
|
Add ee6 and ee7 pom templates
|
diff --git a/maven/pom-ee6-web.xml b/maven/pom-ee6-web.xml
deleted file mode 100644
index 4b339a5..0000000
--- a/maven/pom-ee6-web.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.github.nekop</groupId>
- <artifactId>ee6-web</artifactId>
- <packaging>war</packaging>
- <name>ee6-web</name>
- <version>1.0</version>
-
- <properties>
- <version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
- <version.maven-war-plugin>2.4</version.maven-war-plugin>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
-
- <dependencies>
- <!-- prune API jar, do not use for real projects/testing
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
- -->
- <!-- It's actually a bom, but we can declare it directly for simple use cases -->
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
- <scope>provided</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>${version.maven-war-plugin}</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/maven/pom-ee6web.xml b/maven/pom-ee6web.xml
new file mode 100644
index 0000000..3bb7cee
--- /dev/null
+++ b/maven/pom-ee6web.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee6web</artifactId>
+ <packaging>war</packaging>
+ <name>ee6web</name>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.jboss.spec.jboss-javaee-web-6.0>3.0.2.Final</version.org.jboss.spec.jboss-javaee-web-6.0>
+
+ <version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
+ <version.org.jboss.as.jboss-as-arquillian-container-managed>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-managed>
+ <version.org.jboss.as.jboss-as-arquillian-container-remote>7.2.0.Final</version.org.jboss.as.jboss-as-arquillian-container-remote>
+ <version.junit>4.11</version.junit>
+ <version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
+ <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
+ <version.maven-war-plugin>2.4</version.maven-war-plugin>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.org.jboss.arquillian.arquillian-bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- prune API jar, do NOT use for real projects/testing
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+ <!-- Java EE 6 API jars. It's actually a bom, but we can use it as a depchain -->
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <version>${version.org.jboss.spec.jboss-javaee-web-6.0}</version>
+ <scope>provided</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.maven-surefire-plugin}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>arq-managed</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <version>${version.org.jboss.as.jboss-as-arquillian-container-managed}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>arq-remote</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-remote</artifactId>
+ <version>${version.org.jboss.as.jboss-as-arquillian-container-remote}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/maven/pom-ee7web.xml b/maven/pom-ee7web.xml
new file mode 100644
index 0000000..b0c6e61
--- /dev/null
+++ b/maven/pom-ee7web.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.nekop</groupId>
+ <artifactId>ee7web</artifactId>
+ <packaging>war</packaging>
+ <name>ee7web</name>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <version.org.jboss.spec.jboss-javaee-web-7.0>1.0.0.Final</version.org.jboss.spec.jboss-javaee-web-7.0>
+
+ <version.org.jboss.arquillian.arquillian-bom>1.1.4.Final</version.org.jboss.arquillian.arquillian-bom>
+ <version.wildfly>8.1.0.CR2</version.wildfly>
+ <version.junit>4.11</version.junit>
+ <version.maven-surefire-plugin>2.17</version.maven-surefire-plugin>
+ <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin>
+ <version.maven-war-plugin>2.4</version.maven-war-plugin>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.org.jboss.arquillian.arquillian-bom}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- prune API jar, do NOT use for real projects/testing
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+ <!-- Java EE 7 API jars. It's actually a bom, but we can use it as a depchain -->
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-7.0</artifactId>
+ <version>${version.org.jboss.spec.jboss-javaee-web-7.0}</version>
+ <scope>provided</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven-compiler-plugin}</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.maven-surefire-plugin}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${version.maven-war-plugin}</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>arq-managed</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-managed</artifactId>
+ <version>${version.wildfly}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>arq-remote</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-arquillian-container-remote</artifactId>
+ <version>${version.wildfly}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.