actionmailer 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,3 +1,14 @@
+*0.8.1* (27th March, 2005)
+
+* Fixed that if charset was found that the end of a mime part declaration TMail would throw an error #919 [lon@speedymac.com]
+
+* Fixed that TMail::Unquoter would fail to recognize quoting method if it was in lowercase #919 [lon@speedymac.com]
+
+* Fixed that TMail::Encoder would fail when it attempts to parse e-mail addresses which are encoded using something other than the messages encoding method #919 [lon@speedymac.com]
+
+* Added rescue for missing iconv library and throws warnings if subject/body is called on a TMail object without it instead
+
+
 *0.8.0* (22th March, 2005)
 
 * Added framework support for processing incoming emails with an Action Mailer class. See example in README.

data/lib/action_mailer/vendor/tmail/encode.rb

@@ -295,7 +295,7 @@ module TMail
         else
           raise 'TMail FATAL: encoder scan fail'
         end
-        str = m.post_match
+        (str = m.post_match) unless m.nil?
       end
 
       do_encode types, strs

data/lib/action_mailer/vendor/tmail/mail.rb

@@ -281,6 +281,8 @@ module TMail
         when /\AFrom (\S+)/
           unixfrom = $1
 
+  		  when /^charset=.*/
+				
         else
           raise SyntaxError, "wrong mail header: '#{line.inspect}'"
         end

data/lib/action_mailer/vendor/tmail/quoting.rb

@@ -1,83 +1,100 @@
-require 'iconv'
-require 'base64'
+begin
+  require 'iconv'
+  require 'base64'
 
-module TMail
-  class Mail
-    def subject(to_charset = 'utf-8')
-      Unquoter.unquote_and_convert_to(quoted_subject, to_charset)
-    end
+  module TMail
+    class Mail
+      def subject(to_charset = 'utf-8')
+        Unquoter.unquote_and_convert_to(quoted_subject, to_charset)
+      end
 
-    def unquoted_body(to_charset = 'utf-8')
-      Unquoter.unquote_and_convert_to(quoted_body, to_charset, header["content-type"]["charset"])
-    end
+      def unquoted_body(to_charset = 'utf-8')
+        Unquoter.unquote_and_convert_to(quoted_body, to_charset, header["content-type"]["charset"])
+      end
 
-    def body(to_charset = 'utf-8', &block)
-      attachment_presenter = block || Proc.new { |file_name| "Attachment: #{file_name}\n" }
+      def body(to_charset = 'utf-8', &block)
+        attachment_presenter = block || Proc.new { |file_name| "Attachment: #{file_name}\n" }
       
-      if multipart?
-        parts.collect { |part| 
-          part.header["content-type"].main_type == "text" ? 
-            part.unquoted_body(to_charset) :
-            attachment_presenter.call(part.header["content-type"].params["name"])
-        }.join
-      else
-        unquoted_body(to_charset)
+        if multipart?
+          parts.collect { |part| 
+            part.header["content-type"].main_type == "text" ? 
+              part.unquoted_body(to_charset) :
+              attachment_presenter.call(part.header["content-type"].params["name"])
+          }.join
+        else
+          unquoted_body(to_charset)
+        end
       end
     end
-  end
 
-  class Unquoter
-    class << self
-      def unquote_and_convert_to(text, to_charset, from_charset = "iso-8859-1")
-        return "" if text.nil?
-        if text =~ /^=\?(.*?)\?(.)\?(.*)\?=$/
-          from_charset = $1
-          quoting_method = $2
-          text = $3
-          case quoting_method
-            when "Q" then
-              unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
-            when "B" then
-              unquote_base64_and_convert_to(text, from_charset, to_charset)
-            else
-              raise "unknown quoting method #{quoting_method.inspect}"
+    class Unquoter
+      class << self
+        def unquote_and_convert_to(text, to_charset, from_charset = "iso-8859-1")
+          return "" if text.nil?
+          if text =~ /^=\?(.*?)\?(.)\?(.*)\?=$/
+            from_charset = $1
+            quoting_method = $2
+            text = $3
+            case quoting_method.upcase
+              when "Q" then
+                unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
+              when "B" then
+                unquote_base64_and_convert_to(text, from_charset, to_charset)
+              else
+                raise "unknown quoting method #{quoting_method.inspect}"
+            end
+          else
+            unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
           end
-        else
-          unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
         end
-      end
    
-      def unquote_quoted_printable_and_convert_to(text, from, to)
-        text ? Iconv.iconv(to, from || "ISO-8859-1", text.gsub(/_/," ").unpack("M*").first).first : ""
-      end
+        def unquote_quoted_printable_and_convert_to(text, from, to)
+          text ? Iconv.iconv(to, from || "ISO-8859-1", text.gsub(/_/," ").unpack("M*").first).first : ""
+        end
    
-      def unquote_base64_and_convert_to(text, from, to)
-        text ? Iconv.iconv(to, from || "ISO-8859-1", Base64.decode64(text)).first : ""
+        def unquote_base64_and_convert_to(text, from, to)
+          text ? Iconv.iconv(to, from || "ISO-8859-1", Base64.decode64(text)).first : ""
+        end
       end
     end
   end
-end
 
-if __FILE__ == $0
-  require 'test/unit'
+  if __FILE__ == $0
+    require 'test/unit'
  
-  class TC_Unquoter < Test::Unit::TestCase
-    def test_unquote_quoted_printable
-      a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?=" 
-      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
-      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
-    end
+    class TC_Unquoter < Test::Unit::TestCase
+      def test_unquote_quoted_printable
+        a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?=" 
+        b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+        assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+      end
  
-    def test_unquote_base64
-      a ="=?ISO-8859-1?B?WzE2NjQxN10gQmVrcuZmdGVsc2UgZnJhIFJlanNlZmViZXI=?="
-      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
-      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
-    end
+      def test_unquote_base64
+        a ="=?ISO-8859-1?B?WzE2NjQxN10gQmVrcuZmdGVsc2UgZnJhIFJlanNlZmViZXI=?="
+        b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+        assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+      end
  
-    def test_unquote_without_charset
-      a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber" 
-      b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
-      assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+      def test_unquote_without_charset
+        a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber" 
+        b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+        assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
+      end
+    end
+  end
+rescue LoadError => e
+  # Not providing quoting support
+  module TMail
+    class Mail
+      def subject
+        warn "Action Mailer: iconv couldn't be required, so the charset conversion is skipped"
+        quoted_subject
+      end
+      
+      def body
+        warn "Action Mailer: iconv couldn't be required, so the charset conversion is skipped"
+        quoted_body
+      end
     end
   end
-end
+end

data/rakefile

@@ -8,14 +8,18 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionmailer'
-PKG_VERSION   = '0.8.0' + PKG_BUILD
+PKG_VERSION   = '0.8.1' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
+RELEASE_NAME  = "REL #{PKG_VERSION}"
+
+RUBY_FORGE_PROJECT = "actionmailer"
+RUBY_FORGE_USER    = "webster132"
+
 desc "Default Task"
 task :default => [ :test ]
 
 # Run the unit tests
-
 Rake::TestTask.new { |t|
   t.libs << "test"
   t.pattern = 'test/*_test.rb'
@@ -24,11 +28,11 @@ Rake::TestTask.new { |t|
 
 
 # Genereate the RDoc documentation
-
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
   rdoc.options << '--line-numbers --inline-source --main README'
+  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/action_mailer.rb')
   rdoc.rdoc_files.include('lib/action_mailer/*.rb')
@@ -36,8 +40,6 @@ Rake::RDocTask.new { |rdoc|
 
 
 # Create compressed packages
-
-
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name = PKG_NAME
@@ -50,7 +52,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.6.0' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.7.0' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -69,39 +71,127 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 
-# Publish beta gem
 desc "Publish the API documentation"
 task :pgem => [:package] do 
   Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
 end
 
-# Publish documentation
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
   Rake::SshDirPublisher.new("davidhh@comox.textdrive.com", "public_html/am", "doc").upload
 end
 
-desc "Publish to RubyForge"
-task :rubyforge do
-    Rake::RubyForgePublisher.new('actionmailer', 'webster132').upload
-end
+desc "Publish the release files to RubyForge."
+task :release => [:package] do
+  files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+  if RUBY_FORGE_PROJECT then
+    require 'net/http'
+    require 'open-uri'
+
+    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
+    project_data = open(project_uri) { |data| data.read }
+    group_id = project_data[/[?&]group_id=(\d+)/, 1]
+    raise "Couldn't get group id" unless group_id
+
+    # This echos password to shell which is a bit sucky
+    if ENV["RUBY_FORGE_PASSWORD"]
+      password = ENV["RUBY_FORGE_PASSWORD"]
+    else
+      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
+      password = STDIN.gets.chomp
+    end
 
+    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+      data = [
+        "login=1",
+        "form_loginname=#{RUBY_FORGE_USER}",
+        "form_pw=#{password}"
+      ].join("&")
+      http.post("/account/login.php", data)
+    end
 
-desc "Count lines in the main rake file"
-task :lines do
-  lines = 0
-  codelines = 0
-  Dir.foreach("lib/action_mailer") { |file_name| 
-    next unless file_name =~ /.*rb/
-    
-    f = File.open("lib/action_mailer/" + file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
+    cookie = login_response["set-cookie"]
+    raise "Login failed" unless cookie
+    headers = { "Cookie" => cookie }
+
+    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+    release_data = open(release_uri, headers) { |data| data.read }
+    package_id = release_data[/[?&]package_id=(\d+)/, 1]
+    raise "Couldn't get package id" unless package_id
+
+    first_file = true
+    release_id = ""
+
+    files.each do |filename|
+      basename  = File.basename(filename)
+      file_ext  = File.extname(filename)
+      file_data = File.open(filename, "rb") { |file| file.read }
+
+      puts "Releasing #{basename}..."
+
+      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+        type_map = {
+          ".zip"    => "3000",
+          ".tgz"    => "3110",
+          ".gz"     => "3110",
+          ".gem"    => "1400"
+        }; type_map.default = "9999"
+        type = type_map[file_ext]
+        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+        query_hash = if first_file then
+          {
+            "group_id" => group_id,
+            "package_id" => package_id,
+            "release_name" => RELEASE_NAME,
+            "release_date" => release_date,
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "release_notes" => "",
+            "release_changes" => "",
+            "preformatted" => "1",
+            "submit" => "1"
+          }
+        else
+          {
+            "group_id" => group_id,
+            "release_id" => release_id,
+            "package_id" => package_id,
+            "step2" => "1",
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "submit" => "Add This File"
+          }
+        end
+
+        query = "?" + query_hash.map do |(name, value)|
+          [name, URI.encode(value)].join("=")
+        end.join("&")
+
+        data = [
+          "--" + boundary,
+          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+          "Content-Type: application/octet-stream",
+          "Content-Transfer-Encoding: binary",
+          "", file_data, ""
+          ].join("\x0D\x0A")
+
+        release_headers = headers.merge(
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
+        )
+
+        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+        http.post(target + query, data, release_headers)
+      end
+
+      if first_file then
+        release_id = release_response.body[/release_id=(\d+)/, 1]
+        raise("Couldn't get release id") unless release_id
+      end
+
+      first_file = false
     end
-  }
-  puts "Lines #{lines}, LOC #{codelines}"
-end
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2005-03-22
+  version: 0.8.1
+date: 2005-03-27
 summary: Service layer for easy email delivery and testing.
 require_paths: 
   - lib
@@ -85,5 +85,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.6.0
+            version: 1.7.0
       version: