RubyGems - mms2r - Versions diffs - 3.3.0 → 3.3.1 - Mend

mms2r 3.3.0 → 3.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

data/History.txt CHANGED

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

data/lib/mms2r.rb CHANGED

@@ -10,9 +10,9 @@ 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
+  # 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)
@@ -39,7 +39,7 @@ module MMS2R
     ##
     # MMS2R library version
-    VERSION = '3.3.0'
+    VERSION = '3.3.1'
   end
@@ -48,11 +48,24 @@ module MMS2R
   # 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
+    MMS2R::Media.new(mail) end
 end
+unless Object.respond_to?(:blank?)
+  class Object
+    def blank?
+      if respond_to?(:empty?) && respond_to?(:strip)
+        empty? or strip.empty?
+      elsif respond_to?(:empty?)
+        empty?
+      else
+        !self
+      end
+    end
+  end
+end
 %W{ mail fileutils pathname tmpdir yaml uuidtools iconv exifr }.each do |g|
   begin
     gem 'mail', '= 2.2.13' if g == 'mail'

data/lib/mms2r/media.rb CHANGED

@@ -201,6 +201,7 @@ module MMS2R
       @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) rescue {}
@@ -257,12 +258,17 @@ module MMS2R
     end
     # Convenience method that returns a string including all the text of the
-    # first text/plain file found.  Returns empty string if no body text
-    # is found.
+    # 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
@@ -291,6 +297,18 @@ module MMS2R
       @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

data/test/test_mms2r_media.rb CHANGED

@@ -321,6 +321,13 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_equal "hello world", mms.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")
@@ -334,6 +341,19 @@ class TestMms2rMedia < Test::Unit::TestCase
     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

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mms2r
 version: !ruby/object:Gem::Version
-  hash: 11
+  hash: 9
   prerelease: false
   segments:
   - 3
   - 3
-  - 0
-  version: 3.3.0
+  - 1
+  version: 3.3.1
 platform: ruby
 authors:
 - Mike Mondragon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-12-31 00:00:00 -08:00
+date: 2011-01-01 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency