@@ -233,11 +233,6 @@ def self.default_charset; @@default_charset; end
233
233
def self . default_charset = ( charset ) ; @@default_charset = charset ; end
234
234
self . default_charset = 'UTF-8'
235
235
236
- def register_for_delivery_notification ( observer )
237
- warn ( "Message#register_for_delivery_notification is deprecated, please call Mail.register_observer instead" )
238
- Mail . register_observer ( observer )
239
- end
240
-
241
236
def inform_observers
242
237
Mail . inform_observers ( self )
243
238
end
@@ -1434,11 +1429,6 @@ def has_content_transfer_encoding?
1434
1429
header [ :content_transfer_encoding ] && Utilities . blank? ( header [ :content_transfer_encoding ] . errors )
1435
1430
end
1436
1431
1437
- def has_transfer_encoding? # :nodoc:
1438
- warn ( ":has_transfer_encoding? is deprecated in Mail 1.4.3. Please use has_content_transfer_encoding?\n #{ caller } " )
1439
- has_content_transfer_encoding?
1440
- end
1441
-
1442
1432
# Creates a new empty Message-ID field and inserts it in the correct order
1443
1433
# into the Header. The MessageIdField object will automatically generate
1444
1434
# a unique message ID if you try and encode it or output it to_s without
@@ -1496,26 +1486,11 @@ def add_content_transfer_encoding
1496
1486
header [ :content_transfer_encoding ] ||= body . default_encoding
1497
1487
end
1498
1488
1499
- def add_transfer_encoding # :nodoc:
1500
- warn ( ":add_transfer_encoding is deprecated in Mail 1.4.3. Please use add_content_transfer_encoding\n #{ caller } " )
1501
- add_content_transfer_encoding
1502
- end
1503
-
1504
- def transfer_encoding # :nodoc:
1505
- warn ( ":transfer_encoding is deprecated in Mail 1.4.3. Please use content_transfer_encoding\n #{ caller } " )
1506
- content_transfer_encoding
1507
- end
1508
-
1509
1489
# Returns the MIME media type of part we are on, this is taken from the content-type header
1510
1490
def mime_type
1511
1491
has_content_type? ? header [ :content_type ] . string : nil rescue nil
1512
1492
end
1513
1493
1514
- def message_content_type
1515
- warn ( ":message_content_type is deprecated in Mail 1.4.3. Please use mime_type\n #{ caller } " )
1516
- mime_type
1517
- end
1518
-
1519
1494
# Returns the character set defined in the content type field
1520
1495
def charset
1521
1496
if @header
@@ -1542,12 +1517,6 @@ def sub_type
1542
1517
has_content_type? ? header [ :content_type ] . sub_type : nil rescue nil
1543
1518
end
1544
1519
1545
- # Returns the content type parameters
1546
- def mime_parameters
1547
- warn ( ':mime_parameters is deprecated in Mail 1.4.3, please use :content_type_parameters instead' )
1548
- content_type_parameters
1549
- end
1550
-
1551
1520
# Returns the content type parameters
1552
1521
def content_type_parameters
1553
1522
has_content_type? ? header [ :content_type ] . parameters : nil rescue nil
@@ -1816,11 +1785,6 @@ def ready_to_send!
1816
1785
add_required_fields
1817
1786
end
1818
1787
1819
- def encode!
1820
- warn ( "Deprecated in 1.1.0 in favour of :ready_to_send! as it is less confusing with encoding and decoding." )
1821
- ready_to_send!
1822
- end
1823
-
1824
1788
# Outputs an encoded string representation of the mail message including
1825
1789
# all headers, attachments, etc. This is an encoded email in US-ASCII,
1826
1790
# so it is able to be directly sent to an email server.
0 commit comments