Permalink
Browse files

Remove duplicated file contents

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1884 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jamis committed Jul 22, 2005
1 parent 95cd46c commit 8b1b72bb0d3f70b2a840ce6863775ef91f63ae14
Showing with 0 additions and 78 deletions.
  1. +0 −29 actionmailer/lib/action_mailer/adv_attr_accessor.rb
  2. +0 −49 actionmailer/lib/action_mailer/quoting.rb
@@ -25,32 +25,3 @@ def adv_attr_accessor(*names)
end
end
end
-
-module ActionMailer
- module AdvAttrAccessor #:nodoc:
- def self.append_features(base)
- super
- base.extend(ClassMethods)
- end
-
- module ClassMethods #:nodoc:
- def adv_attr_accessor(*names)
- names.each do |name|
- define_method("#{name}=") do |value|
- instance_variable_set("@#{name}", value)
- end
-
- define_method(name) do |*parameters|
- raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1
- if parameters.empty?
- instance_variable_get("@#{name}")
- else
- instance_variable_set("@#{name}", parameters.first)
- end
- end
- end
- end
-
- end
- end
-end
@@ -1,52 +1,3 @@
-module ActionMailer
- module Quoting #:nodoc:
- # Convert the given text into quoted printable format, with an instruction
- # that the text be eventually interpreted in the given charset.
- def quoted_printable(text, charset)
- text = text.gsub( /[^a-z ]/i ) { "=%02x" % $&[0] }.gsub( / /, "_" )
- "=?#{charset}?Q?#{text}?="
- end
-
- # A quick-and-dirty regexp for determining whether a string contains any
- # characters that need escaping.
- CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
-
- # Quote the given text if it contains any "illegal" characters
- def quote_if_necessary(text, charset)
- (text =~ CHARS_NEEDING_QUOTING) ?
- quoted_printable(text, charset) :
- text
- end
-
- # Quote any of the given strings if they contain any "illegal" characters
- def quote_any_if_necessary(charset, *args)
- args.map { |v| quote_if_necessary(v, charset) }
- end
-
- # Quote the given address if it needs to be. The address may be a
- # regular email address, or it can be a phrase followed by an address in
- # brackets. The phrase is the only part that will be quoted, and only if
- # it needs to be. This allows extended characters to be used in the
- # "to", "from", "cc", and "bcc" headers.
- def quote_address_if_necessary(address, charset)
- if Array === address
- address.map { |a| quote_address_if_necessary(a, charset) }
- elsif address =~ /^(\S.*)\s+(<.*>)$/
- address = $2
- phrase = quote_if_necessary($1.gsub(/^['"](.*)['"]$/, '\1'), charset)
- "\"#{phrase}\" #{address}"
- else
- address
- end
- end
-
- # Quote any of the given addresses, if they need to be.
- def quote_any_address_if_necessary(charset, *args)
- args.map { |v| quote_address_if_necessary(v, charset) }
- end
- end
-end
-
module ActionMailer
module Quoting #:nodoc:
# Convert the given text into quoted printable format, with an instruction

0 comments on commit 8b1b72b

Please sign in to comment.