Browse files

Merge branch 'master' of git://github.com/rails/rails

  • Loading branch information...
2 parents 84eece0 + ed17983 commit 04bc40ff501b1bf81bec7ce3937cb06c896ffc69 @dmitry dmitry committed Dec 31, 2011
Showing with 18,824 additions and 17,374 deletions.
  1. +23 −24 .gitignore
  2. +10 −3 .travis.yml
  3. +40 −47 Gemfile
  4. +1 −1 RAILS_VERSION
  5. +6 −2 README.rdoc
  6. +52 −0 RELEASING_RAILS.rdoc
  7. +12 −11 Rakefile
  8. +0 −449 actionmailer/CHANGELOG
  9. +449 −0 actionmailer/CHANGELOG.md
  10. +6 −4 actionmailer/README.rdoc
  11. +2 −2 actionmailer/actionmailer.gemspec
  12. +0 −1 actionmailer/lib/action_mailer.rb
  13. +3 −3 actionmailer/lib/action_mailer/base.rb
  14. +3 −2 actionmailer/lib/action_mailer/railtie.rb
  15. +14 −11 actionmailer/lib/action_mailer/test_case.rb
  16. +2 −2 actionmailer/lib/action_mailer/version.rb
  17. +1 −1 actionmailer/lib/rails/generators/mailer/USAGE
  18. +5 −8 actionmailer/test/abstract_unit.rb
  19. +2 −2 actionmailer/test/base_test.rb
  20. +28 −0 actionmailer/test/test_test.rb
  21. +0 −5,679 actionpack/CHANGELOG
  22. +5,801 −0 actionpack/CHANGELOG.md
  23. +3 −1 actionpack/README.rdoc
  24. +1 −1 actionpack/RUNNING_UNIT_TESTS
  25. +5 −6 actionpack/actionpack.gemspec
  26. +185 −0 actionpack/examples/performance.rb
  27. +3 −0 actionpack/examples/views/_collection.erb
  28. +1 −0 actionpack/examples/views/_hello.erb
  29. +3 −0 actionpack/examples/views/_hundred_partials.erb
  30. +10 −0 actionpack/examples/views/_partial.erb
  31. +10 −0 actionpack/examples/views/_ten_partials.erb
  32. +3 −0 actionpack/examples/views/hashes/_hash.erb
  33. +3 −0 actionpack/examples/views/my_hashes/_my_hash.erb
  34. +1 −0 actionpack/examples/views/template.html.erb
  35. +1 −1 actionpack/lib/abstract_controller/asset_paths.rb
  36. +2 −2 actionpack/lib/abstract_controller/callbacks.rb
  37. +101 −66 actionpack/lib/abstract_controller/layouts.rb
  38. +1 −2 actionpack/lib/abstract_controller/logger.rb
  39. +2 −2 actionpack/lib/abstract_controller/railties/routes_helpers.rb
  40. +2 −13 actionpack/lib/abstract_controller/rendering.rb
  41. +1 −1 actionpack/lib/abstract_controller/view_paths.rb
  42. +1 −1 actionpack/lib/action_controller/base.rb
  43. +0 −1 actionpack/lib/action_controller/caching.rb
  44. +3 −4 actionpack/lib/action_controller/caching/actions.rb
  45. +40 −13 actionpack/lib/action_controller/caching/pages.rb
  46. +5 −2 actionpack/lib/action_controller/log_subscriber.rb
  47. +7 −1 actionpack/lib/action_controller/metal.rb
  48. +49 −4 actionpack/lib/action_controller/metal/conditional_get.rb
  49. +3 −4 actionpack/lib/action_controller/metal/data_streaming.rb
  50. +5 −2 actionpack/lib/action_controller/metal/force_ssl.rb
  51. +2 −0 actionpack/lib/action_controller/metal/head.rb
  52. +1 −1 actionpack/lib/action_controller/metal/helpers.rb
  53. +10 −7 actionpack/lib/action_controller/metal/http_authentication.rb
  54. +6 −1 actionpack/lib/action_controller/metal/instrumentation.rb
  55. +4 −4 actionpack/lib/action_controller/metal/mime_responds.rb
  56. +9 −2 actionpack/lib/action_controller/metal/params_wrapper.rb
  57. +5 −4 actionpack/lib/action_controller/metal/redirecting.rb
  58. +9 −11 actionpack/lib/action_controller/metal/renderers.rb
  59. +13 −0 actionpack/lib/action_controller/metal/rescue.rb
  60. +10 −22 actionpack/lib/action_controller/metal/responder.rb
  61. +1 −2 actionpack/lib/action_controller/metal/streaming.rb
  62. +1 −0 actionpack/lib/action_controller/railtie.rb
  63. +4 −3 actionpack/lib/action_controller/railties/paths.rb
  64. +2 −2 actionpack/lib/action_controller/record_identifier.rb
  65. +18 −16 actionpack/lib/action_controller/test_case.rb
  66. +1 −1 actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
  67. +1 −1 actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
  68. +8 −2 actionpack/lib/action_dispatch.rb
  69. +27 −15 actionpack/lib/action_dispatch/http/cache.rb
  70. +0 −2 actionpack/lib/action_dispatch/http/headers.rb
  71. +1 −1 actionpack/lib/action_dispatch/http/mime_type.rb
  72. +3 −1 actionpack/lib/action_dispatch/http/parameter_filter.rb
  73. +0 −2 actionpack/lib/action_dispatch/http/parameters.rb
  74. +25 −32 actionpack/lib/action_dispatch/http/request.rb
  75. +15 −20 actionpack/lib/action_dispatch/http/response.rb
  76. +2 −2 actionpack/lib/action_dispatch/http/upload.rb
  77. +3 −3 actionpack/lib/action_dispatch/http/url.rb
  78. +0 −7 actionpack/lib/action_dispatch/middleware/closed_error.rb
  79. +5 −12 actionpack/lib/action_dispatch/middleware/cookies.rb
  80. +82 −0 actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
  81. +78 −0 actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
  82. +19 −39 actionpack/lib/action_dispatch/middleware/flash.rb
  83. +4 −9 actionpack/lib/action_dispatch/middleware/params_parser.rb
  84. +30 −0 actionpack/lib/action_dispatch/middleware/public_exceptions.rb
  85. +38 −14 actionpack/lib/action_dispatch/middleware/reloader.rb
  86. +66 −36 actionpack/lib/action_dispatch/middleware/remote_ip.rb
  87. +39 −0 actionpack/lib/action_dispatch/middleware/request_id.rb
  88. +0 −26 actionpack/lib/action_dispatch/middleware/rescue.rb
  89. +1 −5 actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
  90. +50 −0 actionpack/lib/action_dispatch/middleware/session/cache_store.rb
  91. +34 −143 actionpack/lib/action_dispatch/middleware/show_exceptions.rb
  92. +1 −0 actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
  93. +13 −8 actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
  94. +17 −1 actionpack/lib/action_dispatch/railtie.rb
  95. +0 −1 actionpack/lib/action_dispatch/routing.rb
  96. +83 −70 actionpack/lib/action_dispatch/routing/mapper.rb
  97. +6 −4 actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
  98. +58 −63 actionpack/lib/action_dispatch/routing/redirection.rb
  99. +48 −63 actionpack/lib/action_dispatch/routing/route_set.rb
  100. +4 −5 actionpack/lib/action_dispatch/routing/url_for.rb
  101. +6 −3 actionpack/lib/action_dispatch/testing/integration.rb
  102. +2 −2 actionpack/lib/action_pack/version.rb
  103. +1 −0 actionpack/lib/action_view.rb
  104. +2 −2 actionpack/lib/action_view/asset_paths.rb
  105. +4 −4 actionpack/lib/action_view/base.rb
  106. +1 −1 actionpack/lib/action_view/buffers.rb
  107. +0 −5 actionpack/lib/action_view/helpers/active_model_helper.rb
  108. +0 −7 actionpack/lib/action_view/helpers/asset_paths.rb
  109. +3 −7 actionpack/lib/action_view/helpers/asset_tag_helper.rb
  110. +2 −2 actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
  111. +3 −0 actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
  112. +1 −1 actionpack/lib/action_view/helpers/atom_feed_helper.rb
  113. +1 −1 actionpack/lib/action_view/helpers/cache_helper.rb
  114. +30 −9 actionpack/lib/action_view/helpers/capture_helper.rb
  115. +26 −13 actionpack/lib/action_view/helpers/date_helper.rb
  116. +60 −10 actionpack/lib/action_view/helpers/form_helper.rb
  117. +6 −1 actionpack/lib/action_view/helpers/form_options_helper.rb
  118. +7 −12 actionpack/lib/action_view/helpers/form_tag_helper.rb
  119. +2 −6 actionpack/lib/action_view/helpers/javascript_helper.rb
  120. +5 −5 actionpack/lib/action_view/helpers/number_helper.rb
  121. +2 −2 actionpack/lib/action_view/helpers/rendering_helper.rb
  122. +0 −1 actionpack/lib/action_view/helpers/sanitize_helper.rb
  123. +2 −2 actionpack/lib/action_view/helpers/text_helper.rb
  124. +11 −4 actionpack/lib/action_view/helpers/translation_helper.rb
  125. +6 −0 actionpack/lib/action_view/locale/en.yml
  126. +16 −23 actionpack/lib/action_view/lookup_context.rb
  127. +0 −12 actionpack/lib/action_view/renderer/abstract_renderer.rb
  128. +23 −22 actionpack/lib/action_view/renderer/partial_renderer.rb
  129. +1 −1 actionpack/lib/action_view/renderer/streaming_template_renderer.rb
  130. +23 −8 actionpack/lib/action_view/renderer/template_renderer.rb
  131. +61 −55 actionpack/lib/action_view/template.rb
  132. +10 −1 actionpack/lib/action_view/template/handlers/builder.rb
  133. +11 −15 actionpack/lib/action_view/template/handlers/erb.rb
  134. +0 −1 actionpack/lib/action_view/template/resolver.rb
  135. +6 −1 actionpack/lib/action_view/test_case.rb
  136. +1 −1 actionpack/lib/sprockets/assets.rake
  137. +11 −13 actionpack/lib/sprockets/helpers/rails_helper.rb
  138. +0 −2 actionpack/lib/sprockets/railtie.rb
  139. +50 −11 actionpack/test/abstract/layouts_test.rb
  140. +28 −20 actionpack/test/abstract_unit.rb
  141. +10 −12 actionpack/test/activerecord/polymorphic_routes_test.rb
  142. +18 −1 actionpack/test/controller/action_pack_assertions_test.rb
  143. +2 −2 actionpack/test/controller/addresses_render_test.rb
  144. +2 −2 actionpack/test/controller/base_test.rb
  145. +123 −1 actionpack/test/controller/caching_test.rb
  146. +2 −2 actionpack/test/controller/capture_test.rb
  147. +1 −1 actionpack/test/controller/default_url_options_with_filter_test.rb
  148. +81 −0 actionpack/test/controller/flash_hash_test.rb
  149. +0 −40 actionpack/test/controller/flash_test.rb
  150. +21 −1 actionpack/test/controller/force_ssl_test.rb
  151. +43 −2 actionpack/test/controller/http_digest_authentication_test.rb
  152. +1 −1 actionpack/test/controller/layout_test.rb
  153. +12 −1 actionpack/test/controller/log_subscriber_test.rb
  154. +40 −12 actionpack/test/controller/mime_responds_test.rb
  155. +6 −0 actionpack/test/controller/new_base/bare_metal_test.rb
  156. +30 −6 actionpack/test/controller/new_base/render_layout_test.rb
  157. +6 −0 actionpack/test/controller/new_base/render_template_test.rb
  158. +62 −0 actionpack/test/controller/params_wrapper_test.rb
  159. +10 −0 actionpack/test/controller/redirect_test.rb
  160. +2 −1 actionpack/test/controller/render_json_test.rb
  161. +54 −9 actionpack/test/controller/render_test.rb
  162. +1 −16 actionpack/test/controller/rescue_test.rb
  163. +82 −12 actionpack/test/controller/routing_test.rb
  164. +1 −1 actionpack/test/controller/send_file_test.rb
  165. +71 −0 actionpack/test/controller/show_exceptions_test.rb
  166. +3 −8 actionpack/test/controller/test_test.rb
  167. +0 −6 actionpack/test/controller/url_for_integration_test.rb
  168. +19 −0 actionpack/test/controller/url_for_test.rb
  169. +2 −2 actionpack/test/controller/url_rewriter_test.rb
  170. +3 −99 actionpack/test/dispatch/cookies_test.rb
  171. +157 −0 actionpack/test/dispatch/debug_exceptions_test.rb
  172. +31 −0 actionpack/test/dispatch/mime_type_test.rb
  173. +1 −1 actionpack/test/dispatch/mount_test.rb
  174. +22 −0 actionpack/test/dispatch/reloader_test.rb
  175. +13 −5 actionpack/test/dispatch/request/json_params_parsing_test.rb
  176. +1 −1 actionpack/test/dispatch/request/multipart_params_parsing_test.rb
  177. +0 −2 actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
  178. +14 −6 actionpack/test/dispatch/request/xml_params_parsing_test.rb
  179. +65 −0 actionpack/test/dispatch/request_id_test.rb
  180. +31 −2 actionpack/test/dispatch/request_test.rb
  181. +17 −0 actionpack/test/dispatch/response_test.rb
  182. +58 −36 actionpack/test/dispatch/routing_test.rb
  183. +181 −0 actionpack/test/dispatch/session/cache_store_test.rb
  184. +43 −88 actionpack/test/dispatch/show_exceptions_test.rb
  185. +3 −5 actionpack/test/dispatch/uploaded_file_test.rb
  186. +2 −2 actionpack/test/fixtures/company.rb
  187. +1 −1 actionpack/test/fixtures/developer.rb
  188. +1 −0 actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
  189. +3 −0 actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
  190. +4 −0 actionpack/test/fixtures/test/_label_with_block.erb
  191. +2 −2 actionpack/test/lib/controller/fake_models.rb
  192. +0 −15 actionpack/test/lib/testing_sandbox.rb
  193. +24 −1 actionpack/test/template/active_model_helper_test.rb
  194. +68 −17 actionpack/test/template/capture_helper_test.rb
  195. +4 −0 actionpack/test/template/compiled_templates_test.rb
  196. +46 −1 actionpack/test/template/date_helper_test.rb
  197. +149 −15 actionpack/test/template/form_helper_test.rb
  198. +36 −0 actionpack/test/template/form_options_helper_test.rb
  199. +9 −7 actionpack/test/template/form_tag_helper_test.rb
  200. +6 −1 actionpack/test/template/html-scanner/tag_node_test.rb
  201. +1 −5 actionpack/test/template/javascript_helper_test.rb
  202. +1 −7 actionpack/test/template/lookup_context_test.rb
  203. +1 −0 actionpack/test/template/number_helper_test.rb
  204. +7 −9 actionpack/test/template/output_buffer_test.rb
  205. +0 −2 actionpack/test/template/output_safety_helper_test.rb
  206. +4 −2 actionpack/test/template/record_tag_helper_test.rb
  207. +52 −70 actionpack/test/template/render_test.rb
  208. +0 −2 actionpack/test/template/sanitize_helper_test.rb
  209. +16 −0 actionpack/test/template/sprockets_helper_test.rb
  210. +57 −0 actionpack/test/template/sprockets_helper_with_routes_test.rb
  211. +5 −5 actionpack/test/template/tag_helper_test.rb
  212. +51 −49 actionpack/test/template/template_test.rb
  213. +16 −0 actionpack/test/template/test_test.rb
  214. +14 −35 actionpack/test/template/text_helper_test.rb
  215. +17 −1 actionpack/test/template/translation_helper_test.rb
  216. +0 −107 activemodel/CHANGELOG
  217. +116 −0 activemodel/CHANGELOG.md
  218. +3 −1 activemodel/README.rdoc
  219. +2 −3 activemodel/activemodel.gemspec
  220. +1 −0 activemodel/lib/active_model.rb
  221. +33 −85 activemodel/lib/active_model/attribute_methods.rb
  222. +2 −2 activemodel/lib/active_model/callbacks.rb
  223. +134 −0 activemodel/lib/active_model/configuration.rb
  224. +1 −1 activemodel/lib/active_model/dirty.rb
  225. +35 −15 activemodel/lib/active_model/errors.rb
  226. +1 −0 activemodel/lib/active_model/locale/en.yml
  227. +20 −17 activemodel/lib/active_model/mass_assignment_security.rb
  228. +40 −14 activemodel/lib/active_model/naming.rb
  229. +1 −2 activemodel/lib/active_model/observing.rb
  230. +2 −2 activemodel/lib/active_model/secure_password.rb
  231. +1 −1 activemodel/lib/active_model/serialization.rb
  232. +2 −1 activemodel/lib/active_model/serializers/json.rb
  233. +0 −12 activemodel/lib/active_model/test_case.rb
  234. +15 −3 activemodel/lib/active_model/translation.rb
  235. +3 −2 activemodel/lib/active_model/validations.rb
  236. +15 −10 activemodel/lib/active_model/validations/length.rb
  237. +3 −2 activemodel/lib/active_model/validations/numericality.rb
  238. +3 −3 activemodel/lib/active_model/validations/presence.rb
  239. +3 −3 activemodel/lib/active_model/validations/validates.rb
  240. +2 −2 activemodel/lib/active_model/validations/with.rb
  241. +4 −4 activemodel/lib/active_model/validator.rb
  242. +2 −2 activemodel/lib/active_model/version.rb
  243. +0 −18 activemodel/test/cases/attribute_methods_test.rb
  244. +154 −0 activemodel/test/cases/configuration_test.rb
  245. +64 −0 activemodel/test/cases/errors_test.rb
  246. +2 −2 activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
  247. +74 −3 activemodel/test/cases/naming_test.rb
  248. +4 −6 activemodel/test/cases/secure_password_test.rb
  249. +8 −0 activemodel/test/cases/serialization_test.rb
  250. +3 −1 activemodel/test/cases/serializers/json_serialization_test.rb
  251. +2 −0 activemodel/test/cases/serializers/xml_serialization_test.rb
  252. +10 −0 activemodel/test/cases/translation_test.rb
  253. +6 −6 activemodel/test/cases/validations/exclusion_validation_test.rb
  254. +12 −12 activemodel/test/cases/validations/format_validation_test.rb
  255. +6 −6 activemodel/test/cases/validations/inclusion_validation_test.rb
  256. +37 −47 activemodel/test/cases/validations/length_validation_test.rb
  257. +7 −0 activemodel/test/cases/validations/numericality_validation_test.rb
  258. +6 −0 activemodel/test/cases/validations/validates_test.rb
  259. +2 −6 activemodel/test/models/blog_post.rb
  260. +0 −6,538 activerecord/CHANGELOG
  261. +6,741 −0 activerecord/CHANGELOG.md
  262. +5 −3 activerecord/README.rdoc
  263. +3 −3 activerecord/activerecord.gemspec
  264. +21 −2 activerecord/examples/performance.rb
  265. +28 −2 activerecord/lib/active_record.rb
  266. +4 −3 activerecord/lib/active_record/aggregations.rb
  267. +27 −7 activerecord/lib/active_record/associations.rb
  268. +1 −4 activerecord/lib/active_record/associations/association.rb
  269. +2 −14 activerecord/lib/active_record/associations/association_scope.rb
  270. +7 −5 activerecord/lib/active_record/associations/builder/association.rb
  271. +3 −3 activerecord/lib/active_record/associations/builder/belongs_to.rb
  272. +2 −2 activerecord/lib/active_record/associations/builder/collection_association.rb
  273. +1 −1 activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
  274. +10 −4 activerecord/lib/active_record/associations/builder/has_many.rb
  275. +5 −6 activerecord/lib/active_record/associations/builder/has_one.rb
  276. +3 −3 activerecord/lib/active_record/associations/builder/singular_association.rb
  277. +24 −5 activerecord/lib/active_record/associations/collection_association.rb
  278. +9 −3 activerecord/lib/active_record/associations/collection_proxy.rb
  279. +4 −0 activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
  280. +4 −0 activerecord/lib/active_record/associations/has_many_association.rb
  281. +53 −24 activerecord/lib/active_record/associations/has_many_through_association.rb
  282. +1 −1 activerecord/lib/active_record/associations/join_dependency.rb
  283. +1 −0 activerecord/lib/active_record/associations/preloader/association.rb
  284. +1 −0 activerecord/lib/active_record/associations/preloader/through_association.rb
  285. +1 −1 activerecord/lib/active_record/associations/through_association.rb
  286. +221 −0 activerecord/lib/active_record/attribute_assignment.rb
  287. +171 −30 activerecord/lib/active_record/attribute_methods.rb
  288. +4 −4 activerecord/lib/active_record/attribute_methods/dirty.rb
  289. +57 −33 activerecord/lib/active_record/attribute_methods/primary_key.rb
  290. +73 −82 activerecord/lib/active_record/attribute_methods/read.rb
  291. +93 −0 activerecord/lib/active_record/attribute_methods/serialization.rb
  292. +11 −16 activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
  293. +23 −9 activerecord/lib/active_record/attribute_methods/write.rb
  294. +18 −6 activerecord/lib/active_record/autosave_association.rb
  295. +6 −1,839 activerecord/lib/active_record/base.rb
  296. +39 −12 activerecord/lib/active_record/callbacks.rb
  297. +131 −163 activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
  298. +0 −153 activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
  299. +3 −3 activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
  300. +38 −28 activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
Sorry, we could not display the entire diff because too many files (796) changed.
View
47 .gitignore
@@ -1,25 +1,24 @@
-pkg
-.bundle
-Gemfile.lock
+# Don't put *.swp, *.bak, etc here; those belong in a global ~/.gitignore.
+# Check out http://help.github.com/ignore-files/ for how to set that up.
+
debug.log
-doc/rdoc
-activemodel/doc
-activeresource/doc
-activerecord/doc
-actionpack/doc
-actionmailer/doc
-activesupport/doc
-activesupport/test/tmp
-activemodel/test/fixtures/fixture_database.sqlite3
-actionpack/test/tmp
-activesupport/test/fixtures/isolation_test
-dist
-railties/test/500.html
-railties/test/fixtures/tmp
-railties/test/initializer/root/log
-railties/doc
-railties/guides/output
-railties/tmp
-.rvmrc
-.rbenv-version
-RDOC_MAIN.rdoc
+.Gemfile
+/.bundle
+/.rbenv-version
+/.rvmrc
+/Gemfile.lock
+/pkg
+/dist
+/doc/rdoc
+/*/doc
+/*/test/tmp
+/activerecord/sqlnet.log
+/activemodel/test/fixtures/fixture_database.sqlite3
+/activesupport/test/fixtures/isolation_test
+/railties/test/500.html
+/railties/test/fixtures/tmp
+/railties/test/initializer/root/log
+/railties/doc
+/railties/guides/output
+/railties/tmp
+/RDOC_MAIN.rdoc
View
13 .travis.yml
@@ -1,16 +1,23 @@
script: 'ci/travis.rb'
rvm:
- - 1.8.7
- - 1.9.2
- 1.9.3
env:
- "GEM=railties"
- "GEM=ap,am,amo,ares,as"
- "GEM=ar:mysql"
- "GEM=ar:mysql2"
- "GEM=ar:sqlite3"
+ - "GEM=ar:postgresql"
notifications:
email: false
irc:
- - "irc.freenode.org#rails-contrib"
+ on_success: change
+ on_failure: always
+ channels:
+ - "irc.freenode.org#rails-contrib"
+ campfire:
+ on_success: change
+ on_failure: always
+ rooms:
+ - secure: "CGWvthGkBKNnTnk9YSmf9AXKoiRI33fCl5D3jU4nx3cOPu6kv2R9nMjt9EAo\nOuS4Q85qNSf4VNQ2cUPNiNYSWQ+XiTfivKvDUw/QW9r1FejYyeWarMsSBWA+\n0fADjF1M2dkDIVLgYPfwoXEv7l+j654F1KLKB69F0F/netwP9CQ="
bundler_args: --path vendor/bundle
View
87 Gemfile
@@ -1,104 +1,97 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
gemspec
if ENV['AREL']
- gem "arel", :path => ENV['AREL']
+ gem 'arel', :path => ENV['AREL']
+else
+ gem 'arel'
end
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "jquery-rails"
+gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'jquery-rails'
if ENV['JOURNEY']
- gem "journey", :path => ENV['JOURNEY']
+ gem 'journey', :path => ENV['JOURNEY']
else
- gem "journey", :git => "git://github.com/rails/journey"
+ gem 'journey', :git => "git://github.com/rails/journey"
end
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
-gem "uglifier", ">= 1.0.3", :require => false
+gem 'uglifier', '>= 1.0.3', :require => false
-# Temp fix until rake 0.9.3 is out
-if RUBY_VERSION >= "1.9.3"
- gem "rake", "0.9.3.beta.1"
-else
- gem "rake", ">= 0.8.7"
-end
-gem "mocha", ">= 0.9.8"
+gem 'rake', '>= 0.8.7'
+gem 'mocha', '>= 0.9.8'
group :doc do
- gem "rdoc", "~> 3.4"
- gem "sdoc", "~> 0.3"
- gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
- gem "w3c_validators"
+ # The current sdoc cannot generate GitHub links due
+ # to a bug, but the PR that fixes it has been there
+ # for some weeks unapplied. As a temporary solution
+ # this is our own fork with the fix.
+ gem 'sdoc', :git => 'git://github.com/fxn/sdoc.git'
+ gem 'RedCloth', '~> 4.2'
+ gem 'w3c_validators'
end
# AS
-gem "memcache-client", ">= 1.8.5"
+gem 'memcache-client', '>= 1.8.5'
platforms :mri_18 do
- gem "system_timer"
- gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS']
- gem "json"
+ gem 'system_timer'
+ gem 'json'
end
-platforms :mri_19 do
- # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
- gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS']
-end
+# Add your own local bundler stuff
+instance_eval File.read '.Gemfile' if File.exists? '.Gemfile'
platforms :mri do
group :test do
- gem "ruby-prof" if RUBY_VERSION < "1.9.3"
+ gem 'ruby-prof'
end
end
platforms :ruby do
- if ENV["RB_FSEVENT"]
- gem "rb-fsevent"
- end
- gem "json"
- gem "yajl-ruby"
- gem "nokogiri", ">= 1.4.5"
+ gem 'json'
+ gem 'yajl-ruby'
+ gem 'nokogiri', '>= 1.4.5'
# AR
- gem "sqlite3", "~> 1.3.4"
+ gem 'sqlite3', '~> 1.3.5'
group :db do
- gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed
- gem "mysql", ">= 2.8.1"
- gem "mysql2", ">= 0.3.6"
+ gem 'pg', '>= 0.11.0'
+ gem 'mysql', '>= 2.8.1'
+ gem 'mysql2', '>= 0.3.10'
end
end
platforms :jruby do
- gem "ruby-debug", ">= 0.10.3"
- gem "json"
- gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0"
+ gem 'json'
+ gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.0'
# This is needed by now to let tests work on JRuby
# TODO: When the JRuby guys merge jruby-openssl in
# jruby this will be removed
- gem "jruby-openssl"
+ gem 'jruby-openssl'
group :db do
- gem "activerecord-jdbcmysql-adapter", ">= 1.2.0"
- gem "activerecord-jdbcpostgresql-adapter", ">= 1.2.0"
+ gem 'activerecord-jdbcmysql-adapter', '>= 1.2.0'
+ gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.0'
end
end
# gems that are necessary for ActiveRecord tests with Oracle database
if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
platforms :ruby do
- gem "ruby-oci8", ">= 2.0.4"
+ gem 'ruby-oci8', '>= 2.0.4'
end
if ENV['ORACLE_ENHANCED_PATH']
- gem "activerecord-oracle_enhanced-adapter", :path => ENV['ORACLE_ENHANCED_PATH']
+ gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH']
else
- gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
+ gem 'activerecord-oracle_enhanced-adapter', :git => 'git://github.com/rsim/oracle-enhanced.git'
end
end
# A gem necessary for ActiveRecord tests with IBM DB
-gem "ibm_db" if ENV['IBM_DB']
+gem 'ibm_db' if ENV['IBM_DB']
View
2 RAILS_VERSION
@@ -1 +1 @@
-3.2.0.beta
+4.0.0.beta
View
8 README.rdoc
@@ -67,9 +67,13 @@ We encourage you to contribute to Ruby on Rails! Please check out the {Contribut
guide}[http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how
to proceed. {Join us}[http://contributors.rubyonrails.org]!
-== Travis Build Status {<img src="https://secure.travis-ci.org/rails/rails.png"/>}[http://travis-ci.org/rails/rails]
+== Build Status {<img src="https://secure.travis-ci.org/rails/rails.png"/>}[http://travis-ci.org/rails/rails]
+
+== Dependency Status {<img src="https://gemnasium.com/rails/rails.png?travis"/>}[https://gemnasium.com/rails/rails]
== License
-Ruby on Rails is released under the MIT license.
+Ruby on Rails is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
View
52 RELEASING_RAILS.rdoc
@@ -25,6 +25,12 @@ for Rails. You can check the status of his tests here:
Do not release with Red AWDwR tests.
+=== Are the postgres tests green? If not, make them green
+
+Currently Travis CI doesn't run the Active Record postgres tests. They are
+working to resolve this, but in the mean time, it is crucial to ensure that
+the tests are still green before release.
+
=== Do we have any git dependencies? If so, contact those authors.
Having git dependencies indicates that we depend on unreleased code.
@@ -60,6 +66,8 @@ for today:
=== Is Sam Ruby happy? If not, make him happy.
+=== Are the postgres tests green? If not, make them green
+
=== Contact the security team. CVE emails must be sent on this day.
=== Create a release branch.
@@ -81,8 +89,20 @@ You can review the commits for the 3.0.10 release like this:
[aaron@higgins rails (3-0-10)]$ git log v3.0.9..
+If you're doing a stable branch release, you should also ensure that all of
+the CHANGELOG entries in the stable branch are also synced to the master
+branch.
+
=== Update the RAILS_VERSION file to include the RC.
+=== Build and test the gem.
+
+Run `rake install` to generate the gems and install them locally. Then try
+generating a new app and ensure that nothing explodes.
+
+This will stop you from looking silly when you push an RC to rubygems.org and
+then realise it is broken.
+
=== Release the gem.
IMPORTANT: Due to YAML parse problems on the rubygems.org server, it is safest
@@ -150,6 +170,7 @@ Today, do this stuff in this order:
* Apply security patches to the release branch
* Update CHANGELOG with security fixes.
* Update RAILS_VERSION to remove the rc
+* Build and test the gem
* Release the gems
* Email security lists
* Email general announcement lists
@@ -184,3 +205,34 @@ There are two simple steps for fixing the CI:
2. Fix it
Repeat these steps until the CI is green.
+
+=== Manually trigger docs generation
+
+We have a post-receive hook in GitHub that calls the docs server on pushes.
+It triggers generation and publication of edge docs, updates the contrib app,
+and generates and publishes stable docs if a new stable tag is detected.
+
+The hook unfortunately is not invoked by tag pushing, so once the new stable
+tag has been pushed to origin, please run
+
+ rake publish_docs
+
+You should see something like this:
+
+ Rails master hook tasks scheduled:
+
+ * updates the local checkout
+ * updates Rails Contributors
+ * generates and publishes edge docs
+
+ If a new stable tag is detected it also
+
+ * generates and publishes stable docs
+
+ This needs typically a few minutes.
+
+Note you do not need to specify the tag, the docs server figures it out.
+
+Also, don't worry if you call that multiple times or the hook is triggered
+again by some immediate regular push, if the scripts are running new calls
+are just queued (in a queue of size 1).
View
23 Rakefile
@@ -77,9 +77,10 @@ RDoc::Task.new do |rdoc|
rdoc_main.gsub!(/^(?=\S).*?\b(?=Rails)\b/) { "#$&\\" }
rdoc_main.gsub!(%r{link:/rails/rails/blob/master/(\w+)/README\.rdoc}, "link:files/\\1/README_rdoc.html")
- # Remove Travis build status image from API pages. Only GitHub README page gets this image
- # https build image is used to avoid GitHub caching: http://about.travis-ci.org/docs/user/status-images
- rdoc_main.gsub!(%r{^== Travis.*}, '')
+ # Remove Travis and Gemnasium status images from API pages. Only GitHub
+ # README page gets these images. Travis' https build image is used to avoid
+ # GitHub caching: http://about.travis-ci.org/docs/user/status-images
+ rdoc_main.gsub!(%r{^== (Build|Dependency) Status.*}, '')
File.open(RDOC_MAIN, 'w') do |f|
f.write(rdoc_main)
@@ -97,43 +98,43 @@ RDoc::Task.new do |rdoc|
rdoc.options << '-g' # SDoc flag, link methods to GitHub
rdoc.options << '-m' << RDOC_MAIN
- rdoc.rdoc_files.include('railties/CHANGELOG')
+ rdoc.rdoc_files.include('railties/CHANGELOG.md')
rdoc.rdoc_files.include('railties/MIT-LICENSE')
rdoc.rdoc_files.include('railties/README.rdoc')
rdoc.rdoc_files.include('railties/lib/**/*.rb')
rdoc.rdoc_files.exclude('railties/lib/rails/generators/**/templates/**/*.rb')
rdoc.rdoc_files.include('activerecord/README.rdoc')
- rdoc.rdoc_files.include('activerecord/CHANGELOG')
+ rdoc.rdoc_files.include('activerecord/CHANGELOG.md')
rdoc.rdoc_files.include('activerecord/lib/active_record/**/*.rb')
rdoc.rdoc_files.exclude('activerecord/lib/active_record/vendor/*')
rdoc.rdoc_files.include('activeresource/README.rdoc')
- rdoc.rdoc_files.include('activeresource/CHANGELOG')
+ rdoc.rdoc_files.include('activeresource/CHANGELOG.md')
rdoc.rdoc_files.include('activeresource/lib/active_resource.rb')
rdoc.rdoc_files.include('activeresource/lib/active_resource/*')
rdoc.rdoc_files.include('actionpack/README.rdoc')
- rdoc.rdoc_files.include('actionpack/CHANGELOG')
+ rdoc.rdoc_files.include('actionpack/CHANGELOG.md')
rdoc.rdoc_files.include('actionpack/lib/abstract_controller/**/*.rb')
rdoc.rdoc_files.include('actionpack/lib/action_controller/**/*.rb')
rdoc.rdoc_files.include('actionpack/lib/action_dispatch/**/*.rb')
rdoc.rdoc_files.include('actionpack/lib/action_view/**/*.rb')
rdoc.rdoc_files.exclude('actionpack/lib/action_controller/vendor/*')
rdoc.rdoc_files.include('actionmailer/README.rdoc')
- rdoc.rdoc_files.include('actionmailer/CHANGELOG')
+ rdoc.rdoc_files.include('actionmailer/CHANGELOG.md')
rdoc.rdoc_files.include('actionmailer/lib/action_mailer/base.rb')
rdoc.rdoc_files.include('actionmailer/lib/action_mailer/mail_helper.rb')
rdoc.rdoc_files.exclude('actionmailer/lib/action_mailer/vendor/*')
rdoc.rdoc_files.include('activesupport/README.rdoc')
- rdoc.rdoc_files.include('activesupport/CHANGELOG')
+ rdoc.rdoc_files.include('activesupport/CHANGELOG.md')
rdoc.rdoc_files.include('activesupport/lib/active_support/**/*.rb')
rdoc.rdoc_files.exclude('activesupport/lib/active_support/vendor/*')
rdoc.rdoc_files.include('activemodel/README.rdoc')
- rdoc.rdoc_files.include('activemodel/CHANGELOG')
+ rdoc.rdoc_files.include('activemodel/CHANGELOG.md')
rdoc.rdoc_files.include('activemodel/lib/active_model/**/*.rb')
end
@@ -189,7 +190,7 @@ end
#
desc 'Publishes docs, run this AFTER a new stable tag has been pushed'
task :publish_docs do
- Net::HTTP.new('rails-hooks.hashref.com').start do |http|
+ Net::HTTP.new('api.rubyonrails.org', 8080).start do |http|
request = Net::HTTP::Post.new('/rails-master-hook')
response = http.request(request)
puts response.body
View
449 actionmailer/CHANGELOG
@@ -1,449 +0,0 @@
-*Rails 3.1.0 (August 30, 2011)*
-
-* No changes
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-* remove AM delegating register_observer and register_interceptor to Mail [Josh Kalderimis]
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* Don't allow i18n to change the minor version, version now set to ~> 0.5.0 [Santiago Pastorino]
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* No changes
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* No Changes, just a version bump.
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* subject is automatically looked up on I18n using mailer_name and action_name as scope as in t(".subject") [JK]
-
-* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML]
-
-* Added ability to pass Proc objects to the defaults hash [ML]
-
-* Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]
-
-* Lot of updates to various test cases that now work better with the new Mail and so have different expectations
-
-* Added interceptors and observers from Mail [ML]
-
- ActionMailer::Base.register_interceptor calls Mail.register_interceptor
- ActionMailer::Base.register_observer calls Mail.register_observer
-
-* Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8
-
-* Added explict setting of charset in set_fields! method to make sure Mail has the user defined default
-
-* Removed quoting.rb and refactored for Mail to take responsibility of all quoting and auto encoding requirements for the header.
-
-* Fixed several tests which had incorrect encoding.
-
-* Changed all utf-8 to UTF-8 for consistency
-
-* Whole new API added with tests. See base.rb for full details. Old API is deprecated.
-
-* The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc. If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted
-
-* Mail#content_type now returns the content_type field as a string. If you want the mime type of a mail, then you call Mail#mime_type (eg, text/plain), if you want the parameters of the content type field, you call Mail#content_type_parameters which gives you a hash, eg {'format' => 'flowed', 'charset' => 'utf-8'}
-
-* ActionMailer::Base :default_implicit_parts_order now is in the sequence of the order you want, no reversing of ordering takes place. The default order now is text/plain, then text/enriched, then text/html and then any other part that is not one of these three.
-
-* Mail does not have "quoted_body", "quoted_subject" etc. All of these are accessed via body.encoded, subject.encoded etc
-
-* Every object in a Mail object returns an object, never a string. So Mail.body returns a Mail::Body class object, need to call #encoded or #decoded to get the string you want.
-* Mail::Message#set_content_type does not exist, it is simply Mail::Message#content_type
-
-* Every mail message gets a unique message_id unless you specify one, had to change all the tests that check for equality with expected.encoded == actual.encoded to first replace their message_ids with control values
-
-* Mail now has a proper concept of parts, remove the ActionMailer::Part and ActionMailer::PartContainer classes
-
-* Calling #encoded on any object returns it as a string ready to go into the output stream of an email, this means it includes the \r\n at the end of the lines and the object is pre-wrapped with \r\n\t if it is a header field. Also, the "encoded" value includes the field name if it is a header field.
-
-* Attachments are only the actual attachment, with filename etc. A part contains an attachment. The part has the content_type etc. So attachments.last.content_type is invalid. But parts.last.content_type
-
-* There is no idea of a "sub_head" in Mail. A part is just a Message with some extra functionality, so it just has a "header" like a normal mail message
-
-
-*2.3.2 [Final] (March 15, 2009)*
-
-* Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]
-
-* Fixed RFC-2045 quoted-printable bug #1421 [squadette]
-
-* Fixed that no body charset would be set when there are attachments present #740 [Paweł Kondzior]
-
-
-*2.2.1 [RC2] (November 14th, 2008)*
-
-* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 [Grant Hollingworth]
-
-
-*2.2.0 [RC1] (October 24th, 2008)*
-
-* Add layout functionality to mailers [Pratik Naik]
-
- Mailer layouts behaves just like controller layouts, except layout names need to
- have '_mailer' postfix for them to be automatically picked up.
-
-
-*2.1.0 (May 31st, 2008)*
-
-* Fixed that a return-path header would be ignored #7572 [joost]
-
-* Less verbose mail logging: just recipients for :info log level; the whole email for :debug only. #8000 [iaddict, Tarmo Tänav]
-
-* Updated TMail to version 1.2.1 [Mikel Lindsaar]
-
-* Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 [jamesgolick]
-
-
-*2.0.2* (December 16th, 2007)
-
-* Included in Rails 2.0.2
-
-
-*2.0.1* (December 7th, 2007)
-
-* Update ActionMailer so it treats ActionView the same way that ActionController does. Closes #10244 [Rick Olson]
-
- * Pass the template_root as an array as ActionView's view_path
- * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}"
-
-* Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java]
-
-* Update README to use new smtp settings configuration API. Closes #10060 [psq]
-
-* Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [Zach Dennis]
-
-* Update TMail to v1.1.0. Use an updated version of TMail if available. [Mikel Lindsaar]
-
-* Introduce a new base test class for testing Mailers. ActionMailer::TestCase [Michael Koziarski]
-
-* Fix silent failure of rxml templates. #9879 [jstewart]
-
-* Fix attachment decoding when using the TMail C extension. #7861 [orangechicken]
-
-* Increase mail delivery test coverage. #8692 [Kamal Fariz Mahyuddin]
-
-* Register alternative template engines using ActionMailer::Base.register_template_extension('haml'). #7534 [cwd, Josh Peek]
-
-* Only load ActionController::UrlWriter if ActionController is present [Rick Olson]
-
-* Make sure parsed emails recognized attachments nested inside multipart parts. #6714 [Jamis Buck]
-
-* Allow mailer actions named send by using __send__ internally. #6467 [iGEL]
-
-* Add assert_emails and assert_no_emails to test the number of emails delivered. #6479 [Jonathan Viney]
- # Assert total number of emails delivered:
- assert_emails 0
- ContactMailer.deliver_contact
- assert_emails 1
-
- # Assert number of emails delivered within a block:
- assert_emails 1 do
- post :signup, :name => 'Jonathan'
- end
-
-
-*1.3.3* (March 12th, 2007)
-
-* Depend on Action Pack 1.13.3
-
-
-*1.3.2* (February 5th, 2007)
-
-* Deprecate server_settings renaming it to smtp_settings, add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Michael Koziarski]
-
-
-*1.3.1* (January 16th, 2007)
-
-* Depend on Action Pack 1.13.1
-
-
-*1.3.0* (January 16th, 2007)
-
-* Make mime version default to 1.0. closes #2323 [ror@andreas-s.net]
-
-* Make sure quoted-printable text is decoded correctly when only portions of the text are encoded. closes #3154. [jon@siliconcircus.com]
-
-* Make sure DOS newlines in quoted-printable text are normalized to unix newlines before unquoting. closes #4166 and #4452. [Jamis Buck]
-
-* Fixed that iconv decoding should catch InvalidEncoding #3153 [jon@siliconcircus.com]
-
-* Tighten rescue clauses. #5985 [james@grayproductions.net]
-
-* Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. [David Heinemeier Hansson]
-
-* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com]
-
-* Resolve action naming collision. #5520 [ssinghi@kreeti.com]
-
-* ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.]
-
-* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
-
-* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
-
-* Correct spurious documentation example code which results in a SyntaxError. [Marcel Molina Jr.]
-
-
-*1.2.1* (April 6th, 2006)
-
-* Be part of Rails 1.1.1
-
-
-*1.2.0* (March 27th, 2006)
-
-* Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 [ehalvorsen+rails@runbox.com]
-
-* Parse content-type apart before using it so that sub-parts of the header can be set correctly #2918 [Jamis Buck]
-
-* Make custom headers work in subparts #4034 [elan@bluemandrill.com]
-
-* Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 [Chad Fowler]
-
-* Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body [Jamis Buck]
-
-* Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type [Jamis Buck]
-
-
-*1.1.5* (December 13th, 2005)
-
-* Become part of Rails 1.0
-
-
-*1.1.4* (December 7th, 2005)
-
-* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
-
-* Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml). #2398 [Dave Burt <dave@burt.id.au>, Jeremy Kemper]
-
-
-*1.1.3* (November 7th, 2005)
-
-* Allow Mailers to have custom initialize methods that set default instance variables for all mail actions #2563 [mrj@bigpond.net.au]
-
-
-*1.1.2* (October 26th, 2005)
-
-* Upgraded to Action Pack 1.10.2
-
-
-*1.1.1* (October 19th, 2005)
-
-* Upgraded to Action Pack 1.10.1
-
-
-*1.1.0* (October 16th, 2005)
-
-* Update and extend documentation (rdoc)
-
-* Minero Aoki made TMail available to Rails/ActionMailer under the MIT license (instead of LGPL) [RubyConf '05]
-
-* Austin Ziegler made Text::Simple available to Rails/ActionMailer under a MIT-like licens [See rails ML, subject "Text::Format Licence Exception" on Oct 15, 2005]
-
-* Fix vendor require paths to prevent files being required twice
-
-* Don't add charset to content-type header for a part that contains subparts (for AOL compatibility) #2013 [John Long]
-
-* Preserve underscores when unquoting message bodies #1930
-
-* Encode multibyte characters correctly #1894
-
-* Multipart messages specify a MIME-Version header automatically #2003 [John Long]
-
-* Add a unified render method to ActionMailer (delegates to ActionView::Base#render)
-
-* Move mailer initialization to a separate (overridable) method, so that subclasses may alter the various defaults #1727
-
-* Look at content-location header (if available) to determine filename of attachments #1670
-
-* ActionMailer::Base.deliver(email) had been accidentally removed, but was documented in the Rails book #1849
-
-* Fix problem with sendmail delivery where headers should be delimited by \n characters instead of \r\n, which confuses some mail readers #1742 [Kent Sibilev]
-
-
-*1.0.1* (11 July, 2005)
-
-* Bind to Action Pack 1.9.1
-
-
-*1.0.0* (6 July, 2005)
-
-* Avoid adding nil header values #1392
-
-* Better multipart support with implicit multipart/alternative and sorting of subparts [John Long]
-
-* Allow for nested parts in multipart mails #1570 [Flurin Egger]
-
-* Normalize line endings in outgoing mail bodies to "\n" #1536 [John Long]
-
-* Allow template to be explicitly specified #1448 [tuxie@dekadance.se]
-
-* Allow specific "multipart/xxx" content-type to be set on multipart messages #1412 [Flurin Egger]
-
-* Unquoted @ characters in headers are now accepted in spite of RFC 822 #1206
-
-* Helper support (borrowed from ActionPack)
-
-* Silently ignore Errno::EINVAL errors when converting text.
-
-* Don't cause an error when parsing an encoded attachment name #1340 [lon@speedymac.com]
-
-* Nested multipart message parts are correctly processed in TMail::Mail#body
-
-* BCC headers are removed when sending via SMTP #1402
-
-* Added 'content_type' accessor, to allow content type to be set on a per-message basis. content_type defaults to "text/plain".
-
-* Silently ignore Iconv::IllegalSequence errors when converting text #1341 [lon@speedymac.com]
-
-* Support attachments and multipart messages.
-
-* Added new accessors for the various mail properties.
-
-* Fix to only perform the charset conversion if a 'from' and a 'to' charset are given (make no assumptions about what the charset was) #1276 [Jamis Buck]
-
-* Fix attachments and content-type problems #1276 [Jamis Buck]
-
-* Fixed the TMail#body method to look at the content-transfer-encoding header and unquote the body according to the rules it specifies #1265 [Jamis Buck]
-
-* Added unquoting even if the iconv lib can't be loaded--in that case, only the charset conversion is skipped #1265 [Jamis Buck]
-
-* Added automatic decoding of base64 bodies #1214 [Jamis Buck]
-
-* Added that delivery errors are caught in a way so the mail is still returned whether the delivery was successful or not
-
-* Fixed that email address like "Jamis Buck, M.D." <wild.medicine@example.net> would cause the quoter to generate emails resulting in "bad address" errors from the mail server #1220 [Jamis Buck]
-
-
-*0.9.1* (20th April, 2005)
-
-* Depend on Action Pack 1.8.1
-
-
-*0.9.0* (19th April, 2005)
-
-* Added that deliver_* will now return the email that was sent
-
-* Added that quoting to UTF-8 only happens if the characters used are in that range #955 [Jamis Buck]
-
-* Fixed quoting for all address headers, not just to #955 [Jamis Buck]
-
-* Fixed unquoting of emails that doesn't have an explicit charset #1036 [wolfgang@stufenlos.net]
-
-
-*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.
-
-
-*0.7.1* (7th March, 2005)
-
-* Bind to newest Action Pack (1.5.1)
-
-
-*0.7.0* (24th February, 2005)
-
-* Added support for charsets for both subject and body. The default charset is now UTF-8 #673 [Jamis Buck]. Examples:
-
- def iso_charset(recipient)
- @recipients = recipient
- @subject = "testing iso charsets"
- @from = "system@loudthinking.com"
- @body = "Nothing to see here."
- @charset = "iso-8859-1"
- end
-
- def unencoded_subject(recipient)
- @recipients = recipient
- @subject = "testing unencoded subject"
- @from = "system@loudthinking.com"
- @body = "Nothing to see here."
- @encode_subject = false
- @charset = "iso-8859-1"
- end
-
-
-*0.6.1* (January 18th, 2005)
-
-* Fixed sending of emails to use Tmail#from not the deprecated Tmail#from_address
-
-
-*0.6* (January 17th, 2005)
-
-* Fixed that bcc and cc should be settable through @bcc and @cc -- not just @headers["Bcc"] and @headers["Cc"] #453 [Eric Hodel]
-
-* Fixed Action Mailer to be "warnings safe" so you can run with ruby -w and not get framework warnings #453 [Eric Hodel]
-
-
-*0.5*
-
-* Added access to custom headers, like cc, bcc, and reply-to #268 [Andreas Schwarz]. Example:
-
- def post_notification(recipients, post)
- @recipients = recipients
- @from = post.author.email_address_with_name
- @headers["bcc"] = SYSTEM_ADMINISTRATOR_EMAIL
- @headers["reply-to"] = "notifications@example.com"
- @subject = "[#{post.account.name} #{post.title}]"
- @body["post"] = post
- end
-
-*0.4* (5)
-
-* Consolidated the server configuration options into Base#server_settings= and expanded that with controls for authentication and more [Marten]
- NOTE: This is an API change that could potentially break your application if you used the old application form. Please do change!
-
-* Added Base#deliveries as an accessor for an array of emails sent out through that ActionMailer class when using the :test delivery option. [Jeremy Kemper]
-
-* Added Base#perform_deliveries= which can be set to false to turn off the actual delivery of the email through smtp or sendmail.
- This is especially useful for functional testing that shouldn't send off real emails, but still trigger delivery_* methods.
-
-* Added option to specify delivery method with Base#delivery_method=. Default is :smtp and :sendmail is currently the only other option.
- Sendmail is assumed to be present at "/usr/sbin/sendmail" if that option is used. [Kent Sibilev]
-
-* Dropped "include TMail" as it added to much baggage into the default namespace (like Version) [Chad Fowler]
-
-
-*0.3*
-
-* First release
View
449 actionmailer/CHANGELOG.md
@@ -0,0 +1,449 @@
+## Rails 3.1.0 (August 30, 2011) ##
+
+* No changes
+
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+* remove AM delegating register_observer and register_interceptor to Mail *Josh Kalderimis*
+
+
+* Rails 3.0.6 (April 5, 2011)
+
+* Don't allow i18n to change the minor version, version now set to ~> 0.5.0 *Santiago Pastorino*
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+* No changes.
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+* No changes.
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+* No changes.
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+* No changes
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+* No Changes, just a version bump.
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+* subject is automatically looked up on I18n using mailer_name and action_name as scope as in t(".subject") *JK*
+
+* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 *ML*
+
+* Added ability to pass Proc objects to the defaults hash *ML*
+
+* Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead *ML*
+
+* Lot of updates to various test cases that now work better with the new Mail and so have different expectations
+
+* Added interceptors and observers from Mail *ML*
+
+ ActionMailer::Base.register_interceptor calls Mail.register_interceptor
+ ActionMailer::Base.register_observer calls Mail.register_observer
+
+* Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8
+
+* Added explict setting of charset in set_fields! method to make sure Mail has the user defined default
+
+* Removed quoting.rb and refactored for Mail to take responsibility of all quoting and auto encoding requirements for the header.
+
+* Fixed several tests which had incorrect encoding.
+
+* Changed all utf-8 to UTF-8 for consistency
+
+* Whole new API added with tests. See base.rb for full details. Old API is deprecated.
+
+* The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc. If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted
+
+* Mail#content_type now returns the content_type field as a string. If you want the mime type of a mail, then you call Mail#mime_type (eg, text/plain), if you want the parameters of the content type field, you call Mail#content_type_parameters which gives you a hash, eg {'format' => 'flowed', 'charset' => 'utf-8'}
+
+* ActionMailer::Base :default_implicit_parts_order now is in the sequence of the order you want, no reversing of ordering takes place. The default order now is text/plain, then text/enriched, then text/html and then any other part that is not one of these three.
+
+* Mail does not have "quoted_body", "quoted_subject" etc. All of these are accessed via body.encoded, subject.encoded etc
+
+* Every object in a Mail object returns an object, never a string. So Mail.body returns a Mail::Body class object, need to call #encoded or #decoded to get the string you want.
+* Mail::Message#set_content_type does not exist, it is simply Mail::Message#content_type
+
+* Every mail message gets a unique message_id unless you specify one, had to change all the tests that check for equality with expected.encoded == actual.encoded to first replace their message_ids with control values
+
+* Mail now has a proper concept of parts, remove the ActionMailer::Part and ActionMailer::PartContainer classes
+
+* Calling #encoded on any object returns it as a string ready to go into the output stream of an email, this means it includes the \r\n at the end of the lines and the object is pre-wrapped with \r\n\t if it is a header field. Also, the "encoded" value includes the field name if it is a header field.
+
+* Attachments are only the actual attachment, with filename etc. A part contains an attachment. The part has the content_type etc. So attachments.last.content_type is invalid. But parts.last.content_type
+
+* There is no idea of a "sub_head" in Mail. A part is just a Message with some extra functionality, so it just has a "header" like a normal mail message
+
+
+## 2.3.2 Final (March 15, 2009) ##
+
+* Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 *Matt Jones*
+
+* Fixed RFC-2045 quoted-printable bug #1421 *squadette*
+
+* Fixed that no body charset would be set when there are attachments present #740 *Paweł Kondzior*
+
+
+## 2.2.1 RC2 (November 14th, 2008) ##
+
+* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 *Grant Hollingworth*
+
+
+## 2.2.0 RC1 (October 24th, 2008) ##
+
+* Add layout functionality to mailers *Pratik Naik*
+
+ Mailer layouts behaves just like controller layouts, except layout names need to
+ have '_mailer' postfix for them to be automatically picked up.
+
+
+## 2.1.0 (May 31st, 2008) ##
+
+* Fixed that a return-path header would be ignored #7572 *joost*
+
+* Less verbose mail logging: just recipients for :info log level; the whole email for :debug only. #8000 *iaddict, Tarmo Tänav*
+
+* Updated TMail to version 1.2.1 *Mikel Lindsaar*
+
+* Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 *jamesgolick*
+
+
+## 2.0.2 (December 16th, 2007) ##
+
+* Included in Rails 2.0.2
+
+
+## 2.0.1 (December 7th, 2007) ##
+
+* Update ActionMailer so it treats ActionView the same way that ActionController does. Closes #10244 *Rick Olson*
+
+ * Pass the template_root as an array as ActionView's view_path
+ * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}"
+
+* Fixed that partials would be broken when using text.plain.erb as the extension #10130 *java*
+
+* Update README to use new smtp settings configuration API. Closes #10060 *psq*
+
+* Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 *Zach Dennis*
+
+* Update TMail to v1.1.0. Use an updated version of TMail if available. *Mikel Lindsaar*
+
+* Introduce a new base test class for testing Mailers. ActionMailer::TestCase *Michael Koziarski*
+
+* Fix silent failure of rxml templates. #9879 *jstewart*
+
+* Fix attachment decoding when using the TMail C extension. #7861 *orangechicken*
+
+* Increase mail delivery test coverage. #8692 *Kamal Fariz Mahyuddin*
+
+* Register alternative template engines using ActionMailer::Base.register_template_extension('haml'). #7534 *cwd, Josh Peek*
+
+* Only load ActionController::UrlWriter if ActionController is present *Rick Olson*
+
+* Make sure parsed emails recognized attachments nested inside multipart parts. #6714 *Jamis Buck*
+
+* Allow mailer actions named send by using __send__ internally. #6467 *iGEL*
+
+* Add assert_emails and assert_no_emails to test the number of emails delivered. #6479 *Jonathan Viney*
+ # Assert total number of emails delivered:
+ assert_emails 0
+ ContactMailer.deliver_contact
+ assert_emails 1
+
+ # Assert number of emails delivered within a block:
+ assert_emails 1 do
+ post :signup, :name => 'Jonathan'
+ end
+
+
+## 1.3.3 (March 12th, 2007) ##
+
+* Depend on Action Pack 1.13.3
+
+
+## 1.3.2 (February 5th, 2007) ##
+
+* Deprecate server_settings renaming it to smtp_settings, add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. *Michael Koziarski*
+
+
+## 1.3.1 (January 16th, 2007) ##
+
+* Depend on Action Pack 1.13.1
+
+
+## 1.3.0 (January 16th, 2007) ##
+
+* Make mime version default to 1.0. closes #2323 *ror@andreas-s.net*
+
+* Make sure quoted-printable text is decoded correctly when only portions of the text are encoded. closes #3154. *jon@siliconcircus.com*
+
+* Make sure DOS newlines in quoted-printable text are normalized to unix newlines before unquoting. closes #4166 and #4452. *Jamis Buck*
+
+* Fixed that iconv decoding should catch InvalidEncoding #3153 *jon@siliconcircus.com*
+
+* Tighten rescue clauses. #5985 *james@grayproductions.net*
+
+* Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. *David Heinemeier Hansson*
+
+* Replace Reloadable with Reloadable::Deprecated. *Nicholas Seckar*
+
+* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 *somekool@gmail.com*
+
+* Resolve action naming collision. #5520 *ssinghi@kreeti.com*
+
+* ActionMailer::Base documentation rewrite. Closes #4991 *Kevin Clark, Marcel Molina Jr.*
+
+* Replace alias method chaining with Module#alias_method_chain. *Marcel Molina Jr.*
+
+* Replace Ruby's deprecated append_features in favor of included. *Marcel Molina Jr.*
+
+* Correct spurious documentation example code which results in a SyntaxError. *Marcel Molina Jr.*
+
+
+## 1.2.1 (April 6th, 2006) ##
+
+* Be part of Rails 1.1.1
+
+
+## 1.2.0 (March 27th, 2006) ##
+
+* Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 *ehalvorsen+rails@runbox.com*
+
+* Parse content-type apart before using it so that sub-parts of the header can be set correctly #2918 *Jamis Buck*
+
+* Make custom headers work in subparts #4034 *elan@bluemandrill.com*
+
+* Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 *Chad Fowler*
+
+* Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body *Jamis Buck*
+
+* Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type *Jamis Buck*
+
+
+## 1.1.5 (December 13th, 2005) ##
+
+* Become part of Rails 1.0
+
+
+## 1.1.4 (December 7th, 2005) ##
+
+* Rename Version constant to VERSION. #2802 *Marcel Molina Jr.*
+
+* Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml). #2398 *Dave Burt <dave@burt.id.au>, Jeremy Kemper*
+
+
+## 1.1.3 (November 7th, 2005) ##
+
+* Allow Mailers to have custom initialize methods that set default instance variables for all mail actions #2563 *mrj@bigpond.net.au*
+
+
+## 1.1.2 (October 26th, 2005) ##
+
+* Upgraded to Action Pack 1.10.2
+
+
+## 1.1.1 (October 19th, 2005) ##
+
+* Upgraded to Action Pack 1.10.1
+
+
+## 1.1.0 (October 16th, 2005) ##
+
+* Update and extend documentation (rdoc)
+
+* Minero Aoki made TMail available to Rails/ActionMailer under the MIT license (instead of LGPL) *RubyConf '05*
+
+* Austin Ziegler made Text::Simple available to Rails/ActionMailer under a MIT-like licens *See rails ML, subject "Text::Format Licence Exception" on Oct 15, 2005*
+
+* Fix vendor require paths to prevent files being required twice
+
+* Don't add charset to content-type header for a part that contains subparts (for AOL compatibility) #2013 *John Long*
+
+* Preserve underscores when unquoting message bodies #1930
+
+* Encode multibyte characters correctly #1894
+
+* Multipart messages specify a MIME-Version header automatically #2003 *John Long*
+
+* Add a unified render method to ActionMailer (delegates to ActionView::Base#render)
+
+* Move mailer initialization to a separate (overridable) method, so that subclasses may alter the various defaults #1727
+
+* Look at content-location header (if available) to determine filename of attachments #1670
+
+* ActionMailer::Base.deliver(email) had been accidentally removed, but was documented in the Rails book #1849
+
+* Fix problem with sendmail delivery where headers should be delimited by \n characters instead of \r\n, which confuses some mail readers #1742 *Kent Sibilev*
+
+
+## 1.0.1 (11 July, 2005) ##
+
+* Bind to Action Pack 1.9.1
+
+
+## 1.0.0 (6 July, 2005) ##
+
+* Avoid adding nil header values #1392
+
+* Better multipart support with implicit multipart/alternative and sorting of subparts *John Long*
+
+* Allow for nested parts in multipart mails #1570 *Flurin Egger*
+
+* Normalize line endings in outgoing mail bodies to "\n" #1536 *John Long*
+
+* Allow template to be explicitly specified #1448 *tuxie@dekadance.se*
+
+* Allow specific "multipart/xxx" content-type to be set on multipart messages #1412 *Flurin Egger*
+
+* Unquoted @ characters in headers are now accepted in spite of RFC 822 #1206
+
+* Helper support (borrowed from ActionPack)
+
+* Silently ignore Errno::EINVAL errors when converting text.
+
+* Don't cause an error when parsing an encoded attachment name #1340 *lon@speedymac.com*
+
+* Nested multipart message parts are correctly processed in TMail::Mail#body
+
+* BCC headers are removed when sending via SMTP #1402
+
+* Added 'content_type' accessor, to allow content type to be set on a per-message basis. content_type defaults to "text/plain".
+
+* Silently ignore Iconv::IllegalSequence errors when converting text #1341 *lon@speedymac.com*
+
+* Support attachments and multipart messages.
+
+* Added new accessors for the various mail properties.
+
+* Fix to only perform the charset conversion if a 'from' and a 'to' charset are given (make no assumptions about what the charset was) #1276 *Jamis Buck*
+
+* Fix attachments and content-type problems #1276 *Jamis Buck*
+
+* Fixed the TMail#body method to look at the content-transfer-encoding header and unquote the body according to the rules it specifies #1265 *Jamis Buck*
+
+* Added unquoting even if the iconv lib can't be loaded--in that case, only the charset conversion is skipped #1265 *Jamis Buck*
+
+* Added automatic decoding of base64 bodies #1214 *Jamis Buck*
+
+* Added that delivery errors are caught in a way so the mail is still returned whether the delivery was successful or not
+
+* Fixed that email address like "Jamis Buck, M.D." <wild.medicine@example.net> would cause the quoter to generate emails resulting in "bad address" errors from the mail server #1220 *Jamis Buck*
+
+
+## 0.9.1 (20th April, 2005) ##
+
+* Depend on Action Pack 1.8.1
+
+
+## 0.9.0 (19th April, 2005) ##
+
+* Added that deliver_* will now return the email that was sent
+
+* Added that quoting to UTF-8 only happens if the characters used are in that range #955 *Jamis Buck*
+
+* Fixed quoting for all address headers, not just to #955 *Jamis Buck*
+
+* Fixed unquoting of emails that doesn't have an explicit charset #1036 *wolfgang@stufenlos.net*
+
+
+## 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.
+
+
+## 0.7.1 (7th March, 2005) ##
+
+* Bind to newest Action Pack (1.5.1)
+
+
+## 0.7.0 (24th February, 2005) ##
+
+* Added support for charsets for both subject and body. The default charset is now UTF-8 #673 [Jamis Buck]. Examples:
+
+ def iso_charset(recipient)
+ @recipients = recipient
+ @subject = "testing iso charsets"
+ @from = "system@loudthinking.com"
+ @body = "Nothing to see here."
+ @charset = "iso-8859-1"
+ end
+
+ def unencoded_subject(recipient)
+ @recipients = recipient
+ @subject = "testing unencoded subject"
+ @from = "system@loudthinking.com"
+ @body = "Nothing to see here."
+ @encode_subject = false
+ @charset = "iso-8859-1"
+ end
+
+
+## 0.6.1 (January 18th, 2005) ##
+
+* Fixed sending of emails to use Tmail#from not the deprecated Tmail#from_address
+
+
+## 0.6 (January 17th, 2005) ##
+
+* Fixed that bcc and cc should be settable through @bcc and @cc -- not just @headers["Bcc"] and @headers["Cc"] #453 *Eric Hodel*
+
+* Fixed Action Mailer to be "warnings safe" so you can run with ruby -w and not get framework warnings #453 *Eric Hodel*
+
+
+## 0.5 ##
+
+* Added access to custom headers, like cc, bcc, and reply-to #268 [Andreas Schwarz]. Example:
+
+ def post_notification(recipients, post)
+ @recipients = recipients
+ @from = post.author.email_address_with_name
+ @headers["bcc"] = SYSTEM_ADMINISTRATOR_EMAIL
+ @headers["reply-to"] = "notifications@example.com"
+ @subject = "[#{post.account.name} #{post.title}]"
+ @body["post"] = post
+ end
+
+## 0.4 (5) ##
+
+* Consolidated the server configuration options into Base#server_settings= and expanded that with controls for authentication and more *Marten*
+ NOTE: This is an API change that could potentially break your application if you used the old application form. Please do change!
+
+* Added Base#deliveries as an accessor for an array of emails sent out through that ActionMailer class when using the :test delivery option. *Jeremy Kemper*
+
+* Added Base#perform_deliveries= which can be set to false to turn off the actual delivery of the email through smtp or sendmail.
+ This is especially useful for functional testing that shouldn't send off real emails, but still trigger delivery_* methods.
+
+* Added option to specify delivery method with Base#delivery_method=. Default is :smtp and :sendmail is currently the only other option.
+ Sendmail is assumed to be present at "/usr/sbin/sendmail" if that option is used. *Kent Sibilev*
+
+* Dropped "include TMail" as it added to much baggage into the default namespace (like Version) *Chad Fowler*
+
+
+## 0.3 ##
+
+* First release
View
10 actionmailer/README.rdoc
@@ -42,7 +42,7 @@ So the corresponding body template for the method above could look like this:
Thank you for signing up!
-And if the recipient was given as "david@loudthinking.com", the email
+If the recipient was given as "david@loudthinking.com", the email
generated would look like this:
Date: Mon, 25 Jan 2010 22:48:09 +1100
@@ -62,7 +62,7 @@ generated would look like this:
Thank you for signing up!
In previous version of Rails you would call <tt>create_method_name</tt> and
-<tt>deliver_method_name</tt>. Rails 3.0 has a much simpler interface, you
+<tt>deliver_method_name</tt>. Rails 3.0 has a much simpler interface - you
simply call the method and optionally call +deliver+ on the return value.
Calling the method returns a Mail Message object:
@@ -76,7 +76,7 @@ Or you can just chain the methods together like:
== Setting defaults
-It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from ActionMailer::Base. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally it is also possible to pass in a Proc that will get evaluated when it is needed.
+It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from ActionMailer::Base. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally, it is also possible to pass in a Proc that will get evaluated when it is needed.
Note that every value you set with this method will get over written if you use the same key in your mailer method.
@@ -148,7 +148,9 @@ Source code can be downloaded as part of the Rails project on GitHub
== License
-Action Mailer is released under the MIT license.
+Action Mailer is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
== Support
View
4 actionmailer/actionmailer.gemspec
@@ -6,13 +6,13 @@ Gem::Specification.new do |s|
s.version = version
s.summary = 'Email composition, delivery, and receiving framework (part of Rails).'
s.description = 'Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'
- s.required_ruby_version = '>= 1.8.7'
+ s.required_ruby_version = '>= 1.9.3'
s.author = 'David Heinemeier Hansson'
s.email = 'david@loudthinking.com'
s.homepage = 'http://www.rubyonrails.org'
- s.files = Dir['CHANGELOG', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*']
+ s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*']
s.require_path = 'lib'
s.requirements << 'none'
View
1 actionmailer/lib/action_mailer.rb
@@ -31,7 +31,6 @@
# Common Active Support usage in Action Mailer
require 'active_support/core_ext/class'
require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/array/uniq_by'
require 'active_support/core_ext/module/attr_internal'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/string/inflections'
View
6 actionmailer/lib/action_mailer/base.rb
@@ -524,7 +524,7 @@ def attachments
#
# * <tt>:subject</tt> - The subject of the message, if this is omitted, Action Mailer will
# ask the Rails I18n class for a translated <tt>:subject</tt> in the scope of
- # <tt>[:actionmailer, mailer_scope, action_name]</tt> or if this is missing, will translate the
+ # <tt>[mailer_scope, action_name]</tt> or if this is missing, will translate the
# humanized version of the <tt>action_name</tt>
# * <tt>:to</tt> - Who the message is destined for, can be a string of addresses, or an array
# of addresses.
@@ -668,7 +668,7 @@ def set_content_type(m, user_content_type, class_default)
end
end
- # Translates the +subject+ using Rails I18n class under <tt>[:actionmailer, mailer_scope, action_name]</tt> scope.
+ # Translates the +subject+ using Rails I18n class under <tt>[mailer_scope, action_name]</tt> scope.
# If it does not find a translation for the +subject+ under the specified scope it will default to a
# humanized version of the <tt>action_name</tt>.
def default_i18n_subject #:nodoc:
@@ -708,7 +708,7 @@ def collect_responses_and_parts_order(headers) #:nodoc:
def each_template(paths, name, &block) #:nodoc:
templates = lookup_context.find_all(name, Array.wrap(paths))
- templates.uniq_by { |t| t.formats }.each(&block)
+ templates.uniq { |t| t.formats }.each(&block)
end
def create_parts_from_responses(m, responses) #:nodoc:
View
5 actionmailer/lib/action_mailer/railtie.rb
@@ -19,8 +19,9 @@ class Railtie < Rails::Railtie
options.stylesheets_dir ||= paths["public/stylesheets"].first
# make sure readers methods get compiled
- options.asset_path ||= app.config.asset_path
- options.asset_host ||= app.config.asset_host
+ options.asset_path ||= app.config.asset_path
+ options.asset_host ||= app.config.asset_host
+ options.relative_url_root ||= app.config.relative_url_root
ActiveSupport.on_load(:action_mailer) do
include AbstractController::UrlFor
View
25 actionmailer/lib/action_mailer/test_case.rb
@@ -15,9 +15,22 @@ module Behavior
include TestHelper
+ included do
+ class_attribute :_mailer_class
+ setup :initialize_test_deliveries
+ setup :set_expected_mail
+ end
+
module ClassMethods
def tests(mailer)
- self._mailer_class = mailer
+ case mailer
+ when String, Symbol
+ self._mailer_class = mailer.to_s.camelize.constantize
+ when Module
+ self._mailer_class = mailer
+ else
+ raise NonInferrableMailerError.new(mailer)
+ end
end
def mailer_class
@@ -35,8 +48,6 @@ def determine_default_mailer(name)
end
end
- module InstanceMethods
-
protected
def initialize_test_deliveries
@@ -64,16 +75,8 @@ def encode(subject)
def read_fixture(action)
IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
end
- end
-
- included do
- class_attribute :_mailer_class
- setup :initialize_test_deliveries
- setup :set_expected_mail
- end
end
include Behavior
-
end
end
View
4 actionmailer/lib/action_mailer/version.rb
@@ -1,7 +1,7 @@
module ActionMailer
module VERSION #:nodoc:
- MAJOR = 3
- MINOR = 2
+ MAJOR = 4
+ MINOR = 0
TINY = 0
PRE = "beta"
View
2 actionmailer/lib/rails/generators/mailer/USAGE
@@ -1,6 +1,6 @@
Description:
============
- Stubs out a new mailer and its views. Pass the mailer name, either
+ Stubs out a new mailer and its views. Passes the mailer name, either
CamelCased or under_scored, and an optional list of emails as arguments.
This generates a mailer class in app/mailers and invokes your template
View
13 actionmailer/test/abstract_unit.rb
@@ -13,14 +13,11 @@
require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/string/encoding'
-if "ruby".encoding_aware?
- # These are the normal settings that will be set up by Railties
- # TODO: Have these tests support other combinations of these values
- silence_warnings do
- Encoding.default_internal = "UTF-8"
- Encoding.default_external = "UTF-8"
- end
+# These are the normal settings that will be set up by Railties
+# TODO: Have these tests support other combinations of these values
+silence_warnings do
+ Encoding.default_internal = "UTF-8"
+ Encoding.default_external = "UTF-8"
end
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
View
4 actionmailer/test/base_test.rb
@@ -107,7 +107,7 @@ def teardown
assert_equal(1, email.attachments.length)
assert_equal('invoice.jpg', email.attachments[0].filename)
expected = "\312\213\254\232)b"
- expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+ expected.force_encoding(Encoding::BINARY)
assert_equal expected, email.attachments['invoice.jpg'].decoded
end
@@ -116,7 +116,7 @@ def teardown
assert_equal(1, email.attachments.length)
assert_equal('invoice.jpg', email.attachments[0].filename)
expected = "\312\213\254\232)b"
- expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+ expected.force_encoding(Encoding::BINARY)
assert_equal expected, email.attachments['invoice.jpg'].decoded
end
View
28 actionmailer/test/test_test.rb
@@ -0,0 +1,28 @@
+require 'abstract_unit'
+
+class TestTestMailer < ActionMailer::Base
+end
+
+class CrazyNameMailerTest < ActionMailer::TestCase
+ tests TestTestMailer
+
+ def test_set_mailer_class_manual
+ assert_equal TestTestMailer, self.class.mailer_class
+ end
+end
+
+class CrazySymbolNameMailerTest < ActionMailer::TestCase
+ tests :test_test_mailer
+
+ def test_set_mailer_class_manual_using_symbol
+ assert_equal TestTestMailer, self.class.mailer_class
+ end
+end
+
+class CrazyStringNameMailerTest < ActionMailer::TestCase
+ tests 'test_test_mailer'
+
+ def test_set_mailer_class_manual_using_string
+ assert_equal TestTestMailer, self.class.mailer_class
+ end
+end
View
5,679 actionpack/CHANGELOG
0 additions, 5,679 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
5,801 actionpack/CHANGELOG.md
5,801 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
4 actionpack/README.rdoc
@@ -327,7 +327,9 @@ Source code can be downloaded as part of the Rails project on GitHub
== License
-Action Pack is released under the MIT license.
+Action Pack is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
== Support
View
2 actionpack/RUNNING_UNIT_TESTS
@@ -18,7 +18,7 @@ which can be further narrowed down to one test:
== Dependency on Active Record and database setup
-Test cases in the test/controller/active_record/ directory depend on having
+Test cases in the test/active_record/ directory depend on having
activerecord and sqlite installed. If Active Record is not in
actionpack/../activerecord directory, or the sqlite rubygem is not installed,
these tests are skipped.
View
11 actionpack/actionpack.gemspec
@@ -6,25 +6,24 @@ Gem::Specification.new do |s|
s.version = version
s.summary = 'Web-flow and rendering framework putting the VC in MVC (part of Rails).'
s.description = 'Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'
- s.required_ruby_version = '>= 1.8.7'
+ s.required_ruby_version = '>= 1.9.3'
s.author = 'David Heinemeier Hansson'
s.email = 'david@loudthinking.com'
s.homepage = 'http://www.rubyonrails.org'
- s.files = Dir['CHANGELOG', 'README.rdoc', <