actionmailer 3.0.4 → 3.0.5.rc1

data/lib/action_mailer/mail_helper.rb

@@ -3,17 +3,8 @@ module ActionMailer
     # Uses Text::Format to take the text and format it, indented two spaces for
     # each line, and wrapped at 72 columns.
     def block_format(text)
-      begin
-        require 'text/format'
-      rescue LoadError => e
-        $stderr.puts "You don't have text-format installed in your application. Please add it to your Gemfile and run bundle install"
-        raise e
-      end unless defined?(Text::Format)
-
       formatted = text.split(/\n\r\n/).collect { |paragraph|
-        Text::Format.new(
-          :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
-        ).format
+        simple_format(paragraph)
       }.join("\n")
 
       # Make list points stand on their own line
@@ -37,5 +28,22 @@ module ActionMailer
     def attachments
       @_message.attachments
     end
+
+    private
+    def simple_format(text, len = 72, indent = 2)
+      sentences = [[]]
+
+      text.split.each do |word|
+        if (sentences.last + [word]).join(' ').length > len
+          sentences << [word]
+        else
+          sentences.last << word
+        end
+      end
+
+      sentences.map { |sentence|
+        "#{" " * indent}#{sentence.join(' ')}"
+      }.join "\n"
+    end
   end
 end

data/lib/action_mailer/version.rb

@@ -2,8 +2,8 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 4
-    PRE   = nil
+    TINY  = 5
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 15424095
+  prerelease: 6
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  - rc
+  - 1
+  version: 3.0.5.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +13:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +28,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 15424095
         segments: 
         - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 5
+        - rc
+        - 1
+        version: 3.0.5.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -102,16 +106,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: actionmailer
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Email composition, delivery, and receiving framework (part of Rails).