radiantcms-couchrest_model 0.1.4 → 0.1.5

data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.7 → tmail-1.2.3}/tmail/quoting.rb

@@ -10,7 +10,7 @@ module TMail
     end
 
     def unquoted_body(to_charset = 'utf-8')
-      from_charset = charset
+      from_charset = sub_header("content-type", "charset")
       case (content_transfer_encoding || "7bit").downcase
         when "quoted-printable"
           # the default charset is set to iso-8859-1 instead of 'us-ascii'.
@@ -56,29 +56,10 @@ module TMail
     end
   end
 
-  class Attachment
-    
-    include TextUtils
-    
-    def quoted?(string)
-      !!((string =~ /.+'\w\w'.+/) || (string =~ /=\?.+\?.\?.+\?=/))
-    end
-    
-    # Only unquote if quoted
-    def original_filename(to_charset = 'utf-8')
-      if quoted?(quoted_filename)
-        Unquoter.unquote_and_convert_to(quoted_filename, to_charset).chomp
-      else
-        quoted_filename
-      end
-    end
-  end
-
   class Unquoter
     class << self
       def unquote_and_convert_to(text, to_charset, from_charset = "iso-8859-1", preserve_underscores=false)
         return "" if text.nil?
-        text.gsub!(/\?=(\s*)=\?/, '?==?') # Remove whitespaces between 'encoded-word's
         text.gsub(/(.*?)(?:(?:=\?(.*?)\?(.)\?(.*?)\?=)|$)/) do
           before = $1
           from_charset = $2
@@ -101,29 +82,6 @@ module TMail
         end
       end
 
-      def convert_to_with_fallback_on_iso_8859_1(text, to, from)
-        return text if to == 'utf-8' and text.isutf8
-
-        if from.blank? and !text.is_binary_data?
-          from = CharDet.detect(text)['encoding']
-
-          # Chardet ususally detects iso-8859-2 (aka windows-1250), but the text is
-          # iso-8859-1 (aka windows-1252 and Latin1). http://en.wikipedia.org/wiki/ISO/IEC_8859-2
-          # This can cause unwanted characters, like ŕ instead of à.
-          # (I know, could be a very bad decision...)
-          from = 'iso-8859-1' if from =~ /iso-8859-2/i
-        end
-
-        begin
-          convert_to_without_fallback_on_iso_8859_1(text, to, from)
-        rescue Iconv::InvalidCharacter
-          unless from == 'iso-8859-1'
-            from = 'iso-8859-1'
-            retry
-          end
-        end
-      end
-
       def unquote_quoted_printable_and_convert_to(text, to, from, preserve_underscores=false)
         text = text.gsub(/_/, " ") unless preserve_underscores
         text = text.gsub(/\r\n|\r/, "\n") # normalize newlines
@@ -155,10 +113,6 @@ module TMail
           text
         end
       end
-      
-      alias_method :convert_to_without_fallback_on_iso_8859_1, :convert_to
-      alias_method :convert_to, :convert_to_with_fallback_on_iso_8859_1
-      
     end
   end
 end

data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.7 → tmail-1.2.3}/tmail/scanner_r.rb

@@ -1,4 +1,3 @@
-# encoding: us-ascii
 # scanner_r.rb
 #
 #--
@@ -259,4 +258,4 @@ module TMail
   end
 
 end   # module TMail
-#:startdoc:
+#:startdoc:

data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.7 → tmail-1.2.3}/tmail/utils.rb

@@ -1,4 +1,3 @@
-# encoding: us-ascii
 #--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
@@ -26,29 +25,29 @@
 #++
 
 # = TMail - The EMail Swiss Army Knife for Ruby
-#
+# 
 # The TMail library provides you with a very complete way to handle and manipulate EMails
 # from within your Ruby programs.
-#
+# 
 # Used as the backbone for email handling by the Ruby on Rails and Nitro web frameworks as
 # well as a bunch of other Ruby apps including the Ruby-Talk mailing list to newsgroup email
 # gateway, it is a proven and reliable email handler that won't let you down.
-#
+# 
 # Originally created by Minero Aoki, TMail has been recently picked up by Mikel Lindsaar and
 # is being actively maintained.  Numerous backlogged bug fixes have been applied as well as
 # Ruby 1.9 compatibility and a swath of documentation to boot.
-#
+# 
 # TMail allows you to treat an email totally as an object and allow you to get on with your
 # own programming without having to worry about crafting the perfect email address validation
 # parser, or assembling an email from all it's component parts.
-#
+# 
 # TMail handles the most complex part of the email - the header.  It generates and parses
 # headers and provides you with instant access to their innards through simple and logically
 # named accessor and setter methods.
-#
+# 
 # TMail also provides a wrapper to Net/SMTP as well as Unix Mailbox handling methods to
 # directly read emails from your unix mailbox, parse them and use them.
-#
+# 
 # Following is the comprehensive list of methods to access TMail::Mail objects.  You can also
 # check out TMail::Mail, TMail::Address and TMail::Headers for other lists.
 module TMail
@@ -58,9 +57,9 @@ module TMail
 
   # Provides a new email boundary to separate parts of the email.  This is a random
   # string based off the current time, so should be fairly unique.
-  #
+  # 
   # For Example:
-  #
+  # 
   #  TMail.new_boundary
   #  #=> "mimepart_47bf656968207_25a8fbb80114"
   #  TMail.new_boundary
@@ -71,12 +70,12 @@ module TMail
 
   # Provides a new email message ID.  You can use this to generate unique email message
   # id's for your email so you can track them.
-  #
-  # Optionally takes a fully qualified domain name (default to the current hostname
+  # 
+  # Optionally takes a fully qualified domain name (default to the current hostname 
   # returned by Socket.gethostname) that will be appended to the message ID.
-  #
+  # 
   # For Example:
-  #
+  # 
   #  email.message_id = TMail.new_message_id
   #  #=> "<47bf66845380e_25a8fbb80332@baci.local.tmail>"
   #  email.to_s
@@ -103,10 +102,10 @@ module TMail
   @uniq = 0
 
   #:startdoc:
-
+  
   # Text Utils provides a namespace to define TOKENs, ATOMs, PHRASEs and CONTROL characters that
   # are OK per RFC 2822.
-  #
+  # 
   # It also provides methods you can call to determine if a string is safe
   module TextUtils
 
@@ -119,19 +118,19 @@ module TMail
     ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{lwsp}]/n
     PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n
     TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{lwsp}]/n
-
+    
     # Returns true if the string supplied is free from characters not allowed as an ATOM
     def atom_safe?( str )
       not ATOM_UNSAFE === str
     end
 
-    # If the string supplied has ATOM unsafe characters in it, will return the string quoted
+    # If the string supplied has ATOM unsafe characters in it, will return the string quoted 
     # in double quotes, otherwise returns the string unmodified
     def quote_atom( str )
       (ATOM_UNSAFE === str) ? dquote(str) : str
     end
 
-    # If the string supplied has PHRASE unsafe characters in it, will return the string quoted
+    # If the string supplied has PHRASE unsafe characters in it, will return the string quoted 
     # in double quotes, otherwise returns the string unmodified
     def quote_phrase( str )
       (PHRASE_UNSAFE === str) ? dquote(str) : str
@@ -142,7 +141,7 @@ module TMail
       not TOKEN_UNSAFE === str
     end
 
-    # If the string supplied has TOKEN unsafe characters in it, will return the string quoted
+    # If the string supplied has TOKEN unsafe characters in it, will return the string quoted 
     # in double quotes, otherwise returns the string unmodified
     def quote_token( str )
       (TOKEN_UNSAFE === str) ? dquote(str) : str
@@ -162,9 +161,9 @@ module TMail
     # Unwraps supplied string from inside double quotes
     # Returns unquoted string
     def unquote( str )
-      str =~ /^"(.*?)"$/m ? $1 : str
+      str =~ /^"(.*?)"$/ ? $1 : str
     end
-
+    
     # Provides a method to join a domain name by it's parts and also makes it
     # ATOM safe by quoting it as needed
     def join_domain( arr )
@@ -256,8 +255,8 @@ module TMail
     end
 
 
-    MESSAGE_ID = /<[^\@>]+\@[^>]+>/
-
+    MESSAGE_ID = /<[^\@>]+\@[^>\@]+>/
+    
     def message_id?( str )
       MESSAGE_ID === str
     end
@@ -268,7 +267,7 @@ module TMail
     def mime_encoded?( str )
       MIME_ENCODED === str
     end
-
+  
 
     def decode_params( hash )
       new = Hash.new
@@ -330,33 +329,9 @@ module TMail
         end
       end
     end
-
-    # AppleMail generates illegal character contained Content-Type parameter like:
-    #   name==?ISO-2022-JP?B?...=?=
-    # so quote. (This case is only value fits in one line.)
-    def quote_unquoted_bencode
-      @body = @body.gsub(%r"(;\s+[-a-z]+=)(=\?.+?)([;\r\n ]|\z)"m) {
-        head, should_quoted, tail = $~.captures
-        # head: "; name="
-        # should_quoted: "=?ISO-2022-JP?B?...=?="
-
-        head << quote_token(should_quoted) << tail
-      }
-    end
-
-    # AppleMail generates name=filename attributes in the content type that
-    # contain spaces.  Need to handle this so the TMail Parser can.
-    def quote_unquoted_name
-      @body = @body.gsub(%r|(name=)([\w\s.]+)(.*)|m) {
-        head, should_quoted, tail = $~.captures
-        # head: "; name="
-        # should_quoted: "=?ISO-2022-JP?B?...=?="
-        head  << quote_token(should_quoted) << tail
-      }
-    end
-
     #:startdoc:
 
+
   end
 
 end

data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.7 → tmail-1.2.3}/tmail/version.rb

@@ -32,7 +32,7 @@ module TMail
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 6
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail.rb

@@ -2,9 +2,9 @@
 require 'rubygems'
 
 begin
-  gem 'tmail', '~> 1.2.7'
+  gem 'tmail', '~> 1.2.3'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.7"
+  $:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.3"
 end
 
 module TMail

data/vendor/rails/actionmailer/lib/action_mailer/version.rb

@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 8
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/vendor/rails/actionmailer/lib/actionmailer.rb

@@ -1,2 +1 @@
 require 'action_mailer'
-ActiveSupport::Deprecation.warn 'require "actionmailer" is deprecated and will be removed in Rails 3. Use require "action_mailer" instead.'

data/vendor/rails/actionmailer/test/abstract_unit.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'test/unit'
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-$:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift File.expand_path('../../../actionpack/lib', __FILE__)
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+$:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
+$:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
 require 'action_mailer'
 require 'action_mailer/test_case'
 
@@ -17,7 +17,7 @@ ActionView::Template.register_template_handler :bak, lambda { |template| "Lame b
 $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers"
 
 ActionView::Base.cache_template_loading = true
-FIXTURE_LOAD_PATH = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 ActionMailer::Base.template_root = FIXTURE_LOAD_PATH
 
 class MockSMTP

data/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb

@@ -1,5 +1,5 @@
 module ExampleHelper
   def example_format(text)
-    "<em><strong><small>#{h(text)}</small></strong></em>".html_safe
+    "<em><strong><small>#{text}</small></strong></em>"
   end
 end

data/vendor/rails/actionmailer/test/mail_service_test.rb

@@ -29,18 +29,6 @@ class TestMailer < ActionMailer::Base
     self.body       = "Goodbye, Mr. #{recipient}"
   end
 
-  def from_with_name
-    from       "System <system@loudthinking.com>"
-    recipients "root@loudthinking.com"
-    body       "Nothing to see here."
-  end
-
-  def from_without_name
-    from       "system@loudthinking.com"
-    recipients "root@loudthinking.com"
-    body       "Nothing to see here."
-  end
-
   def cc_bcc(recipient)
     recipients recipient
     subject    "testing bcc/cc"
@@ -466,28 +454,6 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
   end
 
-  def test_from_without_name_for_smtp
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_from_without_name
-
-    mail = MockSMTP.deliveries.first
-    assert_not_nil mail
-    mail, from, to = mail
-
-    assert_equal 'system@loudthinking.com', from.to_s
-  end
-
-  def test_from_with_name_for_smtp
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_from_with_name
-
-    mail = MockSMTP.deliveries.first
-    assert_not_nil mail
-    mail, from, to = mail
-
-    assert_equal 'system@loudthinking.com', from.to_s
-  end
-
   def test_reply_to
     expected = new_mail
 
@@ -604,9 +570,7 @@ class ActionMailerTest < Test::Unit::TestCase
     mail = TestMailer.create_signed_up(@recipient)
     logger = mock()
     logger.expects(:info).with("Sent mail to #{@recipient}")
-    logger.expects(:debug).with() do |logged_text|
-      logged_text =~ /\[Signed up\] Welcome/
-    end
+    logger.expects(:debug).with("\n#{mail.encoded}")
     TestMailer.logger = logger
     TestMailer.deliver_signed_up(@recipient)
   end
@@ -734,8 +698,8 @@ EOF
     expected.date    = Time.local 2004, 12, 12
 
     created = TestMailer.create_utf8_body @recipient
-    assert_match(/From:\ =\?utf\-8\?Q\?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC\?=\ <extended@example\.net>/, created.encoded)
-    assert_match(/To:\ =\?utf\-8\?Q\?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC\?=\ <extended@example\.net>/, created.encoded)
+    assert_match(/\nFrom: =\?utf-8\?Q\?Foo_.*?\?= <extended@example.net>\r/, created.encoded)
+    assert_match(/\nTo: =\?utf-8\?Q\?Foo_.*?\?= <extended@example.net>, Example Recipient <me/, created.encoded)
   end
 
   def test_receive_decodes_base64_encoded_mail
@@ -861,26 +825,6 @@ EOF
     assert_equal "text/yaml", mail.parts[2].content_type
   end
 
-  def test_implicitly_path_when_running_from_none_rails_root
-    exected_path = File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "test_mailer"))
-    with_a_rails_root do
-      Dir.chdir "/" do
-        template_path = TestMailer.allocate.send(:template_path)
-        assert_equal exected_path, File.expand_path(template_path)
-      end
-    end
-  end
-
-
-  def test_implicitly_multipart_messages_run_from_another_location_with_a_rails_root
-    with_a_rails_root do
-      Dir.chdir "/" do
-        mail = TestMailer.create_implicitly_multipart_example(@recipient)
-        assert_equal 3, mail.parts.length
-      end
-    end
-  end
-
   def test_implicitly_multipart_messages_with_charset
     mail = TestMailer.create_implicitly_multipart_example(@recipient, 'iso-8859-1')
 
@@ -1029,16 +973,6 @@ EOF
   ensure
     ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
   end
-
-private
-  def with_a_rails_root
-    old_root = ::RAILS_ROOT if defined? ::RAILS_ROOT
-    Object.const_set(:RAILS_ROOT, File.join(File.dirname(__FILE__)))
-    yield
-  ensure
-    Object.send(:remove_const, :RAILS_ROOT) if defined? ::RAILS_ROOT
-    Object.const_set(:RAILS_ROOT, old_root) if old_root
-  end
 end
 
 class InheritableTemplateRootTest < Test::Unit::TestCase