make sure filename is free of new lines

recognize HTC HERO200 as a smart phone
recognize HTC Eris as a smart phone

History.txt

@@ -1,3 +1,10 @@
+### 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

conf/mms2r_media.yml

@@ -45,3 +45,4 @@ device_types:
     :blackberry: !ruby/regexp /BlackBerry/i
     :dash: !ruby/regexp /T-Mobile Dash/i
     :droid: !ruby/regexp /Droid/i
+    :htc: !ruby/regexp /Eris|HERO200/i

lib/mms2r.rb

@@ -39,7 +39,7 @@ class MMS2R::Media
     ##
     # MMS2R library version
 
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
 
   end
 

lib/mms2r/media.rb

@@ -517,7 +517,7 @@ def filename?(part)
         end
       end
       # XXX fwiw, janky look for dot extension 1 to 4 chars long
-      name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}")
+      name = (name =~ /\..{1,4}$/ ? name : "#{name}.#{self.default_ext(part.part_type?)}").strip
 
       # handle excessively large filenames
       if name.size > 255

mms2r.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mms2r}
-  s.version = "2.4.0"
+  s.version = "2.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon"]
@@ -40,17 +40,17 @@ parts the mail is comprised of.}
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<tmail>, [">= 0"])
       s.add_runtime_dependency(%q<uuidtools>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.4.0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.4.1"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<tmail>, [">= 0"])
       s.add_dependency(%q<uuidtools>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 2.4.0"])
+      s.add_dependency(%q<hoe>, [">= 2.4.1"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<tmail>, [">= 0"])
     s.add_dependency(%q<uuidtools>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 2.4.0"])
+    s.add_dependency(%q<hoe>, [">= 2.4.1"])
   end
 end

test/test_mms2r_media.rb

@@ -802,6 +802,20 @@ def test_droid_device_type_by_exif
     assert_equal true, mms.is_mobile?
   end
 
+  def test_htc_eris_device_type_by_exif
+    mail = smart_phone_mock('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('HERO200')
+    mms = MMS2R::Media.new(mail)
+    assert_equal :htc, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
   def test_blackberry_device_type
     berries = ['att-blackberry.mail',
                'suncom-blackberry.mail',