Commit Graph

454 Commits

Author SHA1 Message Date
Mikel Lindsaar
ceaa100e59 Adding ability for the procs to be called within the instance, allows you to pass results from instance methods to the mail header
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-02 11:56:08 +02:00
Mikel Lindsaar
08b07b60b6 Adding ability to pass proc's to the ActionMailer class default method
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-02 11:56:08 +02:00
Nathan Weizenbaum
ef5dadaf93 Only run load hooks once a file has been fully loaded.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-04-27 21:37:40 -07:00
Santiago Pastorino
66b55dbfea Add missing require 2010-04-16 18:44:54 -03:00
José Valim
b4fd5e6f1a template_name and template_path should not be added to mail headers. 2010-04-13 23:04:22 +02:00
José Valim
3fc609ee41 Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2 2010-04-12 10:50:27 +02:00
José Valim
b5f9a9fce3 Move set_fields! to the old API module. 2010-04-12 10:25:02 +02:00
Mikel Lindsaar
e157a3d222 Added explict setting of charset in set_fields! method to make sure Mail has the user defined default 2010-04-11 18:04:55 +10:00
Mikel Lindsaar
dbcf01e631 Removing quoting.rb, upgrade to 2.1.3.6, changing all utf-8 references to UTF-8, updating tests where incorrect encoding 2010-04-11 18:04:55 +10:00
Mikel Lindsaar
8f22be04dc Removing quoting and adding Mail 2.3.5 2010-04-11 18:04:54 +10:00
José Valim
ee309d506c Update versions (otherwise you install a gem from source as beta3 but internally it's beta2) and update CHANGELOG. 2010-04-10 12:17:34 +02:00
David Heinemeier Hansson
d868cb4f8a Prep for beta2, depend on latest Bundler 2010-04-01 13:36:45 -07:00
wycats
4aded43b73 Replace the placeholder base_hook API with on_load. To specify some code that
should run during framework load do:

ActiveSupport.on_load(:action_controller) do
  # Code run in the context of AC::Base
end
2010-03-29 17:08:50 -07:00
Xavier Noria
76f024ac8d adds missing requires for Object#blank? and Object#present? 2010-03-28 14:15:02 +02:00
José Valim
a09e99259c Ensure details are frozen after @details_keys lookup. The implementation waits to freeze until the last required moment, to avoid duping hashes. 2010-03-27 20:52:11 +01:00
José Valim
395d6648ce Move application configuration to the application configuration object, remove railtie_name and engine_name and allow to set the configuration object. 2010-03-26 18:47:55 +01:00
José Valim
f28d856cec Improve performance of the rendering stack by freezing formats as a sign that they shouldn't be further modified. 2010-03-19 17:20:20 +01:00
Jeremy Kemper
41af6d9a78 Use Array.wrap not Array() 2010-03-17 22:27:48 -07:00
wycats
cd9ffd11e1 Eliminate warnings for AM on 1.8 2010-03-16 23:24:00 -07:00
José Valim
2a12686832 Allow anything that responds to render to be given as :template and use find_template instead of find in views. 2010-03-12 14:25:10 +01:00
José Valim
00d6271d2b Clean up the API required from ActionView::Template. 2010-03-09 13:12:11 +01:00
José Valim
7942e90960 Merge master. 2010-03-08 21:06:26 +01:00
José Valim
36eb1a686c Bring AM up to date with new rendering stack. 2010-03-08 20:57:33 +01:00
José Valim
ffd8d753f1 Move layout lookup to views. 2010-03-08 02:04:18 +01:00
José Valim
c7564d74e8 Added template lookup responsible to hold all information used in template lookup. 2010-03-07 19:41:58 +01:00
wycats
39d6f9e112 Make many parts of Rails lazy. In order to facilitate this,
add lazy_load_hooks.rb, which allows us to declare code that
should be run at some later time. For instance, this allows
us to defer requiring ActiveRecord::Base at boot time purely
to apply configuration. Instead, we register a hook that should
apply configuration once ActiveRecord::Base is loaded.

With these changes, brings down total boot time of a
new app to 300ms in production and 400ms in dev.

TODO: rename base_hook
2010-03-07 06:24:30 -08:00
Pavel Golubeff
cd5ec4744d Fix quoting regexp encoding in ActionMailer
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-03-03 10:12:42 +01:00
Carlhuda
aa749a74f6 Get the railties tests to pass again. 2010-03-02 14:00:25 -08:00
Carlhuda
b01db07a9f Moved initializers for ActionMailer and ActionController into their own railties 2010-03-02 12:32:31 -08:00
Bryan Helmkamp
a4111bbca0 Update versions of all components to normalize them to new format 2010-03-02 00:32:48 -05:00
Carlhuda
98f77e0827 Rename named_url_helpers to url_helpers and url_helpers to url_for 2010-02-26 15:04:50 -08:00
Carlhuda
9a5be2e5a8 Get Railties tests passing 2010-02-25 17:53:01 -08:00
José Valim
df85ab41c1 Renamed LocalizedCache to DetailsCache. 2010-02-24 22:17:26 +01:00
José Valim
9d7d6cd7ba Use render instead render_to_body. 2010-02-24 22:17:25 +01:00
Mikel Lindsaar
cefc136ec3 Adding options to register observers and interceptors through ActionMailer::Base.register_observer and ActionMailer::Base.register_interceptor. These hook into Mail.register_interceptor and Mail.register_observer. Also bumped Mail requirement to 2.1.3
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-22 09:15:48 +01:00
José Valim
be35a1510d Allow to choose the template path and template name used in implicit rendering with ActionMailer. 2010-02-19 10:51:17 +01:00
Prem Sichanugrist
f0523f72b4 Rename Rails::Subscriber to Rails::LogSubscriber 2010-02-16 22:36:15 +01:00
RomD
f44a0b1d52 fix usage examples and more to use new invocations
Signed-off-by: Carl Lerche <carllerche@mac.com>
2010-02-06 09:51:53 -08:00
Prem Sichanugrist
1d9d9d2d89 Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [#3879 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-06 15:51:44 +01:00
Paul Rosania
363a752c36 install ActionController::UrlFor before environment is parsed, to provide ActionMailer#default_url_options=
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-05 00:08:56 -08:00
Jeremy Kemper
23ad1eff0d Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always uses AS. 2010-02-04 10:08:06 -08:00
David Heinemeier Hansson
79817aa9e7 Move to 3.0.0.beta 2010-02-03 17:29:51 -08:00
Jeremy Kemper
e5ab4b0d07 Convert to class_attribute 2010-02-01 02:02:42 -08:00
Mikel Lindsaar
bb2c7b432c Updating Action Mailer documentation 2010-01-31 09:46:51 -08:00
José Valim
2d567e470a Add transfer_encoding= setter deprecation. 2010-01-30 16:39:27 +01:00
José Valim
0e063f435c Fix some backward incompatible behavior on AM. 2010-01-30 16:35:22 +01:00
José Valim
3f84091937 ActionMailer should depend just on AbstractController. 2010-01-29 17:51:05 +01:00
Jeremy Kemper
452bb1e48d Rename 'defaults' class method to 'default' to reflect that it's a declaration 2010-01-27 19:38:17 -08:00
Mikel Lindsaar
a06a5a64ba Unvendor'd text-format, now requires text-format gem 2010-01-28 12:08:14 +11:00
Mikel Lindsaar
b6b3db6734 Fixed bug on HTML only emails getting set to text/plain 2010-01-28 00:24:30 +11:00
José Valim
af43674c1c Fix failing tests on AM about render(:body => Hash). 2010-01-26 19:15:32 +01:00
José Valim
48a3985dd7 Also include translation in ActionMailer. 2010-01-26 16:18:29 +01:00
José Valim and Mikel Lindsaar
05c4ad9d3f Tidy up tests and docs. 2010-01-26 16:00:24 +01:00
Mikel Lindsaar
ccea6ab07d Fixing up tests and docs to use defaults :from => 'name' instead of defaults({:from => 'name'}) 2010-01-27 00:38:12 +11:00
Mikel Lindsaar
1133757a95 Merge branch 'master' of github.com:mikel/rails
Conflicts:
	actionmailer/lib/action_mailer/base.rb
2010-01-27 00:21:22 +11:00
Mikel Lindsaar
21dcc20ed2 Fixed up documentation to reflect code change and cleaned up tests of spurious #deliver calls 2010-01-27 00:18:40 +11:00
Mikel Lindsaar
9520166f70 Fixed up being able to pass random headers in with headers, or mail. Also, undeprecated headers(hash) as this works now too 2010-01-27 00:06:19 +11:00
José Valim and Mikel Lindsaar
39a1b06f13 Deprecate old defaults API. 2010-01-26 11:46:42 +01:00
José Valim and Mikel Lindsaar
9dd65c368b Make defaults accept a hash. 2010-01-26 11:21:20 +01:00
Mikel Lindsaar
0b05acd424 Implementing class level :defaults hash, instead of delivers_from et al 2010-01-26 17:08:55 +11:00
José Valim
abad097016 Merge remote branch 'mikel/master' 2010-01-26 01:56:52 +01:00
José Valim and Mikel Lindsaar
4af2bbc6b4 Merge branch 'master' of github.com:mikel/rails 2010-01-26 01:51:23 +01:00
José Valim and Mikel Lindsaar
74a5889abe Refactor content type setting, added tests to ensure boundary exists on multipart and fixed typo 2010-01-26 11:49:59 +11:00
José Valim and Mikel Lindsaar
6589976533 Remove old files, add some information to docs and improve test suite. 2010-01-26 01:43:41 +01:00
José Valim and Mikel Lindsaar
f14390091c We don't support enriched yet 2010-01-26 00:09:18 +11:00
José Valim and Mikel Lindsaar
4a6eba3232 Added initial documentation for the new API 2010-01-25 23:46:23 +11:00
José Valim and Mikel Lindsaar
ace74974cf Got AM working with Mail yield on delivery_handler and updated tests 2010-01-25 21:47:03 +11:00
José Valim and Mikel Lindsaar
e4a989e9d9 Added delivery_handler method to mail and implemented in ActionMailer to deliver inside of instrumentation 2010-01-25 13:39:48 +11:00
José Valim
3b6f659fb6 Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config. 2010-01-25 01:12:22 +01:00
José Valim and Mikel Lindsaar
e1c1318638 Added delivers_from. 2010-01-25 00:37:12 +01:00
José Valim and Mikel Lindsaar
90e9e46576 Merge branch 'master' of github.com:mikel/rails 2010-01-24 23:59:29 +01:00
José Valim and Mikel Lindsaar
0ece244fee Ensure implicit multipart templates with locale works as expected. 2010-01-24 23:59:12 +01:00
José Valim and Mikel Lindsaar
4e96442c4e Merge branch 'master' of git://github.com/rails/rails
Conflicts:
	actionmailer/lib/action_mailer/mail_helper.rb
	railties/lib/rails/configuration.rb
2010-01-25 09:50:01 +11:00
José Valim and Mikel Lindsaar
a74a655648 Add tests to mail helper. 2010-01-24 19:52:50 +01:00
José Valim and Mikel Lindsaar
bd96614101 Move old tests to a specific folder and add some delivery method tests. 2010-01-24 19:36:42 +01:00
José Valim and Mikel Lindsaar
99f960a3d7 Handle some TODOs and deprecations. 2010-01-24 18:40:04 +01:00
José Valim and Mikel Lindsaar
0d931fecbb Finish cleaning up delivery methods implementation. 2010-01-24 18:11:57 +01:00
José Valim and Mikel Lindsaar
5dead5bb88 Maintain old_api and deprecated_api in different files. 2010-01-24 17:49:48 +01:00
José Valim and Mikel Lindsaar
f30d73bab4 Add new class delivery method API. 2010-01-24 17:31:18 +01:00
José Valim and Mikel Lindsaar
7409b73484 Some refactoring. 2010-01-24 16:37:28 +01:00
José Valim
6545a68264 Fix failing tests after merge. 2010-01-24 15:08:06 +01:00
José Valim
e548f96b1d Rename plugin_name to railtie_name and engine_name. 2010-01-24 12:23:21 +01:00
José Valim and Mikel Lindsaar
73a9000402 Adding failing tests for calling just the action, instead of :create_action_name and :deliver_action_name 2010-01-24 20:38:53 +11:00
José Valim and Mikel Lindsaar
afc758297c Moving AS::Notifications call to one location in base 2010-01-24 12:30:13 +11:00
José Valim and Mikel Lindsaar
258ca14800 Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback support in Mail to call ActionMailer on delivery, moved deliver to deprecated API in preparation for new API 2010-01-24 11:15:42 +11:00
José Valim and Mikel Lindsaar
e7e4ed48df Set sort order for explicit parts from the collector's template sequence 2010-01-24 09:34:50 +11:00
José Valim and Mikel Lindsaar
c985a0ee3d Add some tests to collector with templates and any. 2010-01-23 12:46:40 +01:00
José Valim and Mikel Lindsaar
6ba944608e Make implicit and explicit templates pass through the same part creation process. 2010-01-23 12:20:20 +01:00
José Valim and Mikel Lindsaar
5a19d24892 Adding collector to ActionMailer 2010-01-23 21:50:36 +11:00
José Valim and Mikel Lindsaar
c6b16260fe Added basic explicit multipart rendering and tests 2010-01-23 21:37:34 +11:00
José Valim and Mikel Lindsaar
5c3ef8c17d Refactor subject with i18n. 2010-01-23 10:24:19 +01:00
José Valim
c8cc8a9872 Moved more configuration away from bootstrap. 2010-01-22 20:44:38 +01:00
José Valim and Mikel Lindsaar
951397b4a2 Get implicit multipart and attachments working together. 2010-01-22 14:38:41 +01:00
José Valim and Mikel Lindsaar
1cd55928c6 First work on implicit multipart. 2010-01-22 13:56:06 +01:00
José Valim and Mikel Lindsaar
dcb9253693 Add basic template rendering to new DSL. 2010-01-22 13:27:26 +01:00
José Valim and Mikel Lindsaar
b30eb39ff0 Add more tests to new API. 2010-01-22 11:57:54 +01:00
José Valim and Mikel Lindsaar
bb9d71ff9e Move class methods to deprecated stuff. 2010-01-22 11:10:37 +01:00
José Valim and Mikel Lindsaar
343ac48f45 Moved deprecated_body.rb to deprecatead_api.rb 2010-01-22 11:01:21 +01:00
José Valim and Mikel Lindsaar
90bbed233e Updating deprecated_body.rb to use :content instead of :data or :body in the params hash 2010-01-22 12:51:07 +11:00
José Valim and Mikel Lindsaar
77986f6bdb Added use of AS::Notifications for tmail_compat.rb 2010-01-22 12:49:13 +11:00