Permalink
Browse files

Merge branch 'master' of github.com:lifo/docrails

  • Loading branch information...
2 parents 48b2451 + 7d7e062 commit 00884a59013a658082dab41da5ff41add31b8c43 @pixeltrix pixeltrix committed Apr 4, 2010
Showing with 1,525 additions and 1,364 deletions.
  1. +2 −2 Gemfile
  2. +1 −1 RAILS_VERSION
  3. +9 −1 actionmailer/CHANGELOG
  4. +1 −1 actionmailer/lib/action_mailer/version.rb
  5. +291 −260 actionpack/CHANGELOG
  6. +2 −2 actionpack/lib/action_dispatch/http/mime_negotiation.rb
  7. +1 −0 actionpack/lib/action_dispatch/railtie.rb
  8. +28 −25 actionpack/lib/action_dispatch/routing/mapper.rb
  9. +1 −3 actionpack/lib/action_dispatch/testing/integration.rb
  10. +1 −1 actionpack/lib/action_pack/version.rb
  11. +6 −1 actionpack/lib/action_view/base.rb
  12. +3 −6 actionpack/lib/action_view/helpers.rb
  13. +14 −13 actionpack/lib/action_view/helpers/form_helper.rb
  14. +4 −0 actionpack/lib/action_view/helpers/form_tag_helper.rb
  15. +6 −2 actionpack/lib/action_view/helpers/number_helper.rb
  16. +37 −15 actionpack/lib/action_view/helpers/url_helper.rb
  17. +2 −2 actionpack/lib/action_view/render/partials.rb
  18. +9 −0 actionpack/lib/action_view/template.rb
  19. +6 −1 actionpack/lib/action_view/test_case.rb
  20. +20 −0 actionpack/test/abstract_unit.rb
  21. +43 −8 actionpack/test/dispatch/routing_test.rb
  22. +4 −5 actionpack/test/template/active_model_helper_test.rb
  23. +11 −15 actionpack/test/template/asset_tag_helper_test.rb
  24. +2 −9 actionpack/test/template/erb/helper.rb
  25. +9 −9 actionpack/test/template/form_helper_test.rb
  26. +15 −5 actionpack/test/template/form_tag_helper_test.rb
  27. +9 −0 actionpack/test/template/number_helper_test.rb
  28. +12 −13 actionpack/test/template/prototype_helper_test.rb
  29. +8 −0 actionpack/test/template/render_test.rb
  30. +14 −19 actionpack/test/template/scriptaculous_helper_test.rb
  31. +204 −215 actionpack/test/template/url_helper_test.rb
  32. +16 −1 activemodel/CHANGELOG
  33. +13 −12 activemodel/activemodel.gemspec
  34. +12 −12 activemodel/lib/active_model/dirty.rb
  35. +2 −0 activemodel/lib/active_model/errors.rb
  36. +1 −1 activemodel/lib/active_model/version.rb
  37. +0 −1 activemodel/test/cases/dirty_test.rb
  38. +10 −0 activemodel/test/cases/validations/i18n_validation_test.rb
  39. +10 −0 activerecord/CHANGELOG
  40. +1 −0 activerecord/activerecord.gemspec
  41. +22 −51 activerecord/lib/active_record/associations.rb
  42. +1 −1 activerecord/lib/active_record/associations/through_association_scope.rb
  43. +2 −1 activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
  44. +6 −0 activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
  45. +25 −108 activerecord/lib/active_record/named_scope.rb
  46. +1 −1 activerecord/lib/active_record/railties/databases.rake
  47. +11 −0 activerecord/lib/active_record/reflection.rb
  48. +20 −1 activerecord/lib/active_record/relation.rb
  49. +18 −2 activerecord/lib/active_record/relation/finder_methods.rb
  50. +4 −2 activerecord/lib/active_record/relation/predicate_builder.rb
  51. +21 −4 activerecord/lib/active_record/relation/query_methods.rb
  52. +9 −6 activerecord/lib/active_record/relation/spawn_methods.rb
  53. +1 −1 activerecord/lib/active_record/version.rb
  54. +17 −0 activerecord/test/cases/column_definition_test.rb
  55. +16 −0 activerecord/test/cases/relations_test.rb
  56. +6 −0 activerecord/test/models/post.rb
  57. +1 −1 activeresource/CHANGELOG
  58. +1 −0 activeresource/activeresource.gemspec
  59. +1 −1 activeresource/lib/active_resource/version.rb
  60. +7 −2 activesupport/CHANGELOG
  61. +1 −0 activesupport/activesupport.gemspec
  62. +1 −1 activesupport/lib/active_support/core_ext/class/attribute.rb
  63. +27 −63 activesupport/lib/active_support/values/time_zone.rb
  64. +1 −1 activesupport/lib/active_support/version.rb
  65. +6 −0 activesupport/test/core_ext/class/attribute_test.rb
  66. +8 −0 activesupport/test/time_zone_test.rb
  67. +9 −8 rails.gemspec
  68. +0 −27 rails3b.gemspec
  69. +15 −1 railties/CHANGELOG
  70. BIN railties/guides/{ → assets}/images/belongs_to.png
  71. BIN railties/guides/{ → assets}/images/book_icon.gif
  72. BIN railties/guides/{ → assets}/images/bullet.gif
  73. BIN railties/guides/{ → assets}/images/challenge.png
  74. BIN railties/guides/{ → assets}/images/chapters_icon.gif
  75. BIN railties/guides/{ → assets}/images/check_bullet.gif
  76. BIN railties/guides/{ → assets}/images/credits_pic_blank.gif
  77. BIN railties/guides/{ → assets}/images/csrf.png
  78. BIN railties/guides/{ → assets}/images/customized_error_messages.png
  79. BIN railties/guides/{ → assets}/images/edge_badge.png
  80. BIN railties/guides/{ → assets}/images/error_messages.png
  81. BIN railties/guides/{ → assets}/images/feature_tile.gif
  82. BIN railties/guides/{ → assets}/images/footer_tile.gif
  83. BIN railties/guides/{ → assets}/images/fxn.png
  84. BIN railties/guides/{ → assets}/images/grey_bullet.gif
  85. BIN railties/guides/{ → assets}/images/habtm.png
  86. BIN railties/guides/{ → assets}/images/has_many.png
  87. BIN railties/guides/{ → assets}/images/has_many_through.png
  88. BIN railties/guides/{ → assets}/images/has_one.png
  89. BIN railties/guides/{ → assets}/images/has_one_through.png
  90. BIN railties/guides/{ → assets}/images/header_backdrop.png
  91. BIN railties/guides/{ → assets}/images/header_tile.gif
  92. BIN railties/guides/{ → assets}/images/i18n/demo_localized_pirate.png
  93. BIN railties/guides/{ → assets}/images/i18n/demo_translated_en.png
  94. BIN railties/guides/{ → assets}/images/i18n/demo_translated_pirate.png
  95. BIN railties/guides/{ → assets}/images/i18n/demo_translation_missing.png
  96. BIN railties/guides/{ → assets}/images/i18n/demo_untranslated.png
  97. 0 railties/guides/{ → assets}/images/icons/README
  98. BIN railties/guides/{ → assets}/images/icons/callouts/1.png
  99. BIN railties/guides/{ → assets}/images/icons/callouts/10.png
  100. BIN railties/guides/{ → assets}/images/icons/callouts/11.png
  101. BIN railties/guides/{ → assets}/images/icons/callouts/12.png
  102. BIN railties/guides/{ → assets}/images/icons/callouts/13.png
  103. BIN railties/guides/{ → assets}/images/icons/callouts/14.png
  104. BIN railties/guides/{ → assets}/images/icons/callouts/15.png
  105. BIN railties/guides/{ → assets}/images/icons/callouts/2.png
  106. BIN railties/guides/{ → assets}/images/icons/callouts/3.png
  107. BIN railties/guides/{ → assets}/images/icons/callouts/4.png
  108. BIN railties/guides/{ → assets}/images/icons/callouts/5.png
  109. BIN railties/guides/{ → assets}/images/icons/callouts/6.png
  110. BIN railties/guides/{ → assets}/images/icons/callouts/7.png
  111. BIN railties/guides/{ → assets}/images/icons/callouts/8.png
  112. BIN railties/guides/{ → assets}/images/icons/callouts/9.png
  113. BIN railties/guides/{ → assets}/images/icons/caution.png
  114. BIN railties/guides/{ → assets}/images/icons/example.png
  115. BIN railties/guides/{ → assets}/images/icons/home.png
  116. BIN railties/guides/{ → assets}/images/icons/important.png
  117. BIN railties/guides/{ → assets}/images/icons/next.png
  118. BIN railties/guides/{ → assets}/images/icons/note.png
  119. BIN railties/guides/{ → assets}/images/icons/prev.png
  120. BIN railties/guides/{ → assets}/images/icons/tip.png
  121. BIN railties/guides/{ → assets}/images/icons/up.png
  122. BIN railties/guides/{ → assets}/images/icons/warning.png
  123. BIN railties/guides/assets/images/jaimeiniesta.jpg
  124. BIN railties/guides/{ → assets}/images/nav_arrow.gif
  125. BIN railties/guides/{ → assets}/images/polymorphic.png
  126. BIN railties/guides/{ → assets}/images/posts_index.png
  127. BIN railties/guides/{ → assets}/images/rails_guides_logo.gif
  128. BIN railties/guides/{ → assets}/images/rails_logo_remix.gif
  129. BIN railties/guides/{ → assets}/images/rails_welcome.png
  130. BIN railties/guides/{ → assets}/images/session_fixation.png
  131. BIN railties/guides/{ → assets}/images/tab_grey.gif
  132. BIN railties/guides/{ → assets}/images/tab_info.gif
  133. BIN railties/guides/{ → assets}/images/tab_note.gif
  134. BIN railties/guides/{ → assets}/images/tab_red.gif
  135. BIN railties/guides/{ → assets}/images/tab_yellow.gif
  136. BIN railties/guides/{ → assets}/images/tab_yellow.png
  137. BIN railties/guides/{ → assets}/images/validation_error_messages.png
  138. 0 railties/guides/{files → assets}/javascripts/code_highlighter.js
  139. 0 railties/guides/{files → assets}/javascripts/guides.js
  140. 0 railties/guides/{files → assets}/javascripts/highlighters.js
  141. +25 −14 railties/guides/{files → assets}/stylesheets/main.css
  142. 0 railties/guides/{files → assets}/stylesheets/print.css
  143. 0 railties/guides/{files → assets}/stylesheets/reset.css
  144. 0 railties/guides/{files → assets}/stylesheets/style.css
  145. 0 railties/guides/{files → assets}/stylesheets/syntax.css
  146. +68 −33 railties/guides/rails_guides/generator.rb
  147. +2 −2 railties/guides/source/action_view_overview.textile
  148. +3 −3 railties/guides/source/active_support_core_extensions.textile
  149. +1 −1 railties/guides/source/association_basics.textile
  150. +1 −1 railties/guides/source/contribute.textile
  151. +66 −0 railties/guides/source/credits.html.erb
  152. +0 −60 railties/guides/source/credits.textile.erb
  153. +2 −1 railties/guides/source/debugging_rails_applications.textile
  154. +1 −1 railties/guides/source/form_helpers.textile
  155. +3 −2 railties/guides/source/getting_started.textile
  156. +150 −0 railties/guides/source/index.html.erb
  157. +0 −139 railties/guides/source/index.textile.erb
  158. +15 −7 railties/guides/source/layout.html.erb
  159. +3 −2 railties/guides/source/layouts_and_rendering.textile
  160. +4 −4 railties/guides/source/performance_testing.textile
  161. +15 −14 railties/guides/source/plugins.textile
  162. +31 −120 railties/guides/source/routing.textile
  163. +5 −5 railties/guides/source/security.textile
  164. +2 −1 railties/guides/source/testing.textile
  165. +1 −1 railties/lib/rails/application/configuration.rb
  166. +4 −1 railties/lib/rails/generators/rails/app/app_generator.rb
  167. +3 −2 railties/lib/rails/generators/rails/app/templates/config/application.rb
  168. +9 −3 railties/lib/rails/generators/rails/app/templates/config/boot.rb
  169. +3 −0 railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
  170. +2 −1 railties/lib/rails/generators/rails/app/templates/public/index.html
  171. +1 −1 railties/lib/rails/version.rb
  172. +6 −0 railties/test/application/middleware_test.rb
  173. +1 −1 version.rb
View
@@ -2,7 +2,7 @@ path File.dirname(__FILE__)
source 'http://rubygems.org'
gem "arel", :git => "git://github.com/rails/arel.git"
-gem "rails", "3.0.0.beta1"
+gem "rails", "3.0.0.beta2"
gem "rake", ">= 0.8.7"
gem "mocha", ">= 0.9.8"
@@ -11,7 +11,7 @@ group :mri do
if RUBY_VERSION < '1.9'
gem "system_timer"
gem "ruby-debug", ">= 0.10.3"
- elsif RUBY_VERSION < '1.9.2'
+ elsif RUBY_VERSION < '1.9.2' && !ENV['CI']
gem "ruby-debug19"
end
end
View
@@ -1 +1 @@
-3.0.0.beta1
+3.0.0.beta2
View
@@ -1,7 +1,15 @@
-*Rails 3.0 (pending)*
+*Rails 3.0.0 [beta 2] (April 1st, 2010)*
+
+* Added interceptors and observers from Mail [ML]
+
+ ActionMailer::Base.register_interceptor calls Mail.register_interceptor
+ ActionMailer::Base.register_observer calls Mail.register_observer
* Whole new API added with tests. See base.rb for full details. Old API is deprecated.
+
+*Rails 3.0.0 [beta 1] (February 4, 2010)*
+
* 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'}
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 0
- BUILD = "beta1"
+ BUILD = "beta2"
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
end
Oops, something went wrong.

0 comments on commit 00884a5

Please sign in to comment.