Skip to content
Browse files

Merge branch 'master' into feature/public-fragment_name_with_digest

  • Loading branch information...
2 parents 3fdb712 + df08271 commit 4cb50a3f571234b1202f9a0dffe39b445ecf807d @rgarver rgarver committed Oct 2, 2012
Showing with 1,086 additions and 650 deletions.
  1. +1 −0 Gemfile
  2. +5 −0 actionmailer/CHANGELOG.md
  3. +3 −0 actionmailer/lib/action_mailer/base.rb
  4. +4 −2 actionmailer/lib/action_mailer/log_subscriber.rb
  5. +7 −0 actionmailer/test/base_test.rb
  6. +53 −3 actionpack/CHANGELOG.md
  7. +0 −1 actionpack/actionpack.gemspec
  8. +5 −5 actionpack/lib/action_controller/caching.rb
  9. +13 −13 actionpack/lib/action_controller/caching/actions.rb
  10. +18 −18 actionpack/lib/action_controller/caching/fragments.rb
  11. +52 −39 actionpack/lib/action_controller/caching/pages.rb
  12. +15 −12 actionpack/lib/action_controller/caching/sweeping.rb
  13. +11 −6 actionpack/lib/action_controller/log_subscriber.rb
  14. +31 −27 actionpack/lib/action_controller/metal/conditional_get.rb
  15. +10 −10 actionpack/lib/action_controller/metal/strong_parameters.rb
  16. +31 −24 actionpack/lib/action_controller/test_case.rb
  17. +3 −3 actionpack/lib/action_dispatch/middleware/show_exceptions.rb
  18. +2 −2 actionpack/lib/action_dispatch/routing/mapper.rb
  19. +2 −2 actionpack/lib/action_view/helpers/asset_tag_helper.rb
  20. +5 −2 actionpack/lib/action_view/log_subscriber.rb
  21. +4 −3 actionpack/lib/action_view/test_case.rb
  22. +22 −0 actionpack/test/controller/action_pack_assertions_test.rb
  23. +42 −5 actionpack/test/controller/caching_test.rb
  24. +16 −0 actionpack/test/controller/show_exceptions_test.rb
  25. +1 −1 actionpack/test/controller/spec_type_test.rb
  26. +20 −0 actionpack/test/dispatch/routing_test.rb
  27. +1 −0 actionpack/test/dispatch/session/cache_store_test.rb
  28. +1 −0 actionpack/test/fixtures/test/hello/hello.erb
  29. +0 −32 actionpack/test/metal/caching_test.rb
  30. +1 −1 actionpack/test/template/spec_type_test.rb
  31. +38 −0 activerecord/CHANGELOG.md
  32. +2 −2 activerecord/Rakefile
  33. +8 −24 activerecord/lib/active_record/associations/collection_proxy.rb
  34. +5 −5 activerecord/lib/active_record/attribute_methods.rb
  35. +21 −7 activerecord/lib/active_record/attribute_methods/dirty.rb
  36. +15 −11 activerecord/lib/active_record/attribute_methods/primary_key.rb
  37. +7 −5 activerecord/lib/active_record/attribute_methods/read.rb
  38. +11 −18 activerecord/lib/active_record/attribute_methods/serialization.rb
  39. +0 −15 activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
  40. +3 −2 activerecord/lib/active_record/attribute_methods/write.rb
  41. +2 −4 activerecord/lib/active_record/coders/yaml_column.rb
  42. +1 −1 activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
  43. +8 −0 activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
  44. +4 −0 activerecord/lib/active_record/connection_adapters/column.rb
  45. +0 −4 activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
  46. +7 −2 activerecord/lib/active_record/counter_cache.rb
  47. +1 −1 activerecord/lib/active_record/fixtures/file.rb
  48. +6 −4 activerecord/lib/active_record/log_subscriber.rb
  49. +2 −5 activerecord/lib/active_record/model.rb
  50. +2 −2 activerecord/lib/active_record/persistence.rb
  51. +2 −2 activerecord/lib/active_record/railtie.rb
  52. +2 −2 activerecord/lib/active_record/railties/controller_runtime.rb
  53. +29 −26 activerecord/lib/active_record/scoping/default.rb
  54. +48 −65 activerecord/lib/active_record/scoping/named.rb
  55. +12 −11 activerecord/lib/active_record/validations.rb
  56. +1 −1 activerecord/lib/active_record/validations/associated.rb
  57. +8 −9 activerecord/lib/active_record/validations/presence.rb
  58. +9 −11 activerecord/lib/active_record/validations/uniqueness.rb
  59. +14 −1 activerecord/test/cases/counter_cache_test.rb
  60. +25 −0 activerecord/test/cases/dirty_test.rb
  61. +54 −0 activerecord/test/cases/hot_compatibility_test.rb
  62. +1 −1 activerecord/test/cases/store_test.rb
  63. +1 −1 activerecord/test/models/admin/user.rb
  64. +1 −1 activerecord/test/models/subscription.rb
  65. +1 −0 activerecord/test/schema/schema.rb
  66. +4 −0 activesupport/CHANGELOG.md
  67. +1 −1 activesupport/activesupport.gemspec
  68. +85 −63 activesupport/lib/active_support/cache.rb
  69. +1 −0 activesupport/lib/active_support/cache/memory_store.rb
  70. +11 −1 activesupport/lib/active_support/core_ext/string/conversions.rb
  71. +11 −1 activesupport/lib/active_support/notifications.rb
  72. +54 −39 activesupport/test/caching_test.rb
  73. +2 −2 activesupport/test/test_test.rb
  74. +9 −1 guides/source/4_0_release_notes.md
  75. +0 −1 guides/source/action_mailer_basics.md
  76. +0 −3 guides/source/active_record_querying.md
  77. +1 −1 guides/source/asset_pipeline.md
  78. +7 −13 guides/source/command_line.md
  79. +1 −55 guides/source/debugging_rails_applications.md
  80. +5 −1 guides/source/i18n.md
  81. +12 −0 guides/source/routing.md
  82. +15 −1 guides/source/upgrading_ruby_on_rails.md
  83. +0 −3 railties/Rakefile
  84. +6 −0 railties/lib/rails/application.rb
  85. +1 −1 railties/lib/rails/application/configuration.rb
  86. +4 −0 railties/lib/rails/generators/rails/app/templates/Gemfile
  87. +41 −4 railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
  88. +3 −1 railties/lib/rails/tasks/tmp.rake
  89. +2 −1 railties/test/application/assets_test.rb
  90. +5 −0 railties/test/generators/app_generator_test.rb
  91. +74 −2 railties/test/generators/namespaced_generators_test.rb
  92. +1 −1 railties/test/generators/scaffold_generator_test.rb
View
1 Gemfile
@@ -6,6 +6,7 @@ gem 'arel', github: 'rails/arel', branch: 'master'
gem 'mocha', '>= 0.11.2', :require => false
gem 'rack-test', github: 'brynary/rack-test'
+gem 'rack-cache', "~> 1.2"
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails'
View
5 actionmailer/CHANGELOG.md
@@ -1,5 +1,10 @@
## Rails 4.0.0 (unreleased) ##
+* Support `Mailer.deliver_foo(*args)` as a synonym for
+ `Mailer.foo(*args).deliver`. This makes it easy to write e.g.
+ `Mailer.expects(:deliver_foo)` when testing code that calls
+ the mailer. *Jon Leighton*
+
* Allow delivery method options to be set per mail instance *Aditya Sanghi*
If your smtp delivery settings are dynamic,
View
3 actionmailer/lib/action_mailer/base.rb
@@ -142,6 +142,7 @@ module ActionMailer
# for delivery later:
#
# Notifier.welcome(david).deliver # sends the email
+ # Notifier.deliver_welcome(david) # synonym for the former
# mail = Notifier.welcome(david) # => a Mail::Message object
# mail.deliver # sends the email
#
@@ -487,6 +488,8 @@ def set_payload_for_mail(payload, mail) #:nodoc:
def method_missing(method_name, *args)
if action_methods.include?(method_name.to_s)
QueuedMessage.new(queue, self, method_name, *args)
+ elsif method_name.to_s =~ /^deliver_(.+)$/ && action_methods.include?($1)
+ public_send($1, *args).deliver
else
super
end
View
6 actionmailer/lib/action_mailer/log_subscriber.rb
@@ -1,13 +1,15 @@
module ActionMailer
class LogSubscriber < ActiveSupport::LogSubscriber
def deliver(event)
+ return unless logger.info?
recipients = Array(event.payload[:to]).join(', ')
- info("\nSent mail to #{recipients} (%1.fms)" % event.duration)
+ info("\nSent mail to #{recipients} (#{event.duration.round(1)}ms)")
debug(event.payload[:mail])
end
def receive(event)
- info("\nReceived mail (%.1fms)" % event.duration)
+ return unless logger.info?
+ info("\nReceived mail (#{event.duration.round(1)}ms)")
debug(event.payload[:mail])
end
View
7 actionmailer/test/base_test.rb
@@ -662,6 +662,13 @@ def welcome
assert_equal ["robert.pankowecki@gmail.com"], DefaultFromMailer.welcome.from
end
+ test "Mailer.deliver_welcome calls Mailer.welcome.deliver" do
+ BaseMailer.deliveries.clear
+ BaseMailer.deliver_welcome(subject: 'omg')
+ assert_equal 1, BaseMailer.deliveries.length
+ assert_equal 'omg', BaseMailer.deliveries.first.subject
+ end
+
protected
# Execute the block setting the given values and restoring old values after
View
56 actionpack/CHANGELOG.md
@@ -1,5 +1,56 @@
## Rails 4.0.0 (unreleased) ##
+* Failsafe exception returns text/plain. *Steve Klabnik*
+
+* Remove actionpack's rack-cache dependency and declare the
+ dependency in the Gemfile.
+
+ *Guillermo Iguarán*
+
+* Rename internal variables on ActionController::TemplateAssertions to prevent
+ naming collisions. @partials, @templates and @layouts are now prefixed with an underscore.
+ Fix #7459
+
+ *Yves Senn*
+
+* `resource` and `resources` don't modify the passed options hash
+ Fix #7777
+
+ *Yves Senn*
+
+* Precompiled assets include aliases from foo.js to foo/index.js and vice versa.
+
+ # Precompiles phone-<digest>.css and aliases phone/index.css to phone.css.
+ config.assets.precompile = [ 'phone.css' ]
+
+ # Precompiles phone/index-<digest>.css and aliases phone.css to phone/index.css.
+ config.assets.precompile = [ 'phone/index.css' ]
+
+ # Both of these work with either precompile thanks to their aliases.
+ <%= stylesheet_link_tag 'phone', media: 'all' %>
+ <%= stylesheet_link_tag 'phone/index', media: 'all' %>
+
+ *Jeremy Kemper*
+
+* `assert_template` is no more passing with what ever string that matches
+ with the template name.
+
+ Before when we have a template `/layout/hello.html.erb`, `assert_template`
+ was passing with any string that matches. This behavior allowed false
+ positive like:
+
+ assert_template "layout"
+ assert_template "out/hello"
+
+ Now it only passes with:
+
+ assert_template "layout/hello"
+ assert_template "hello"
+
+ Fixes #3849.
+
+ *Hugolnx*
+
* `image_tag` will set the same width and height for image if numerical value
passed to `size` option.
@@ -44,9 +95,8 @@
*Luiz Felipe Garcia Pereira*
-* Sprockets integration has been extracted from Action Pack and the `sprockets-rails`
- gem should be added to Gemfile (under the assets group) in order to use Rails asset
- pipeline in future versions of Rails.
+* Sprockets integration has been extracted from Action Pack to the `sprockets-rails`
+ gem. `rails` gem is depending on `sprockets-rails` by default.
*Guillermo Iguaran*
View
1 actionpack/actionpack.gemspec
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
s.requirements << 'none'
s.add_dependency('activesupport', version)
- s.add_dependency('rack-cache', '~> 1.2')
s.add_dependency('builder', '~> 3.1.0')
s.add_dependency('rack', '~> 1.4.1')
s.add_dependency('rack-test', '~> 0.6.1')
View
10 actionpack/lib/action_controller/caching.rb
@@ -23,10 +23,10 @@ module ActionController #:nodoc:
# Configuration examples (MemoryStore is the default):
#
# config.action_controller.cache_store = :memory_store
- # config.action_controller.cache_store = :file_store, "/path/to/cache/directory"
- # config.action_controller.cache_store = :mem_cache_store, "localhost"
- # config.action_controller.cache_store = :mem_cache_store, Memcached::Rails.new("localhost:11211")
- # config.action_controller.cache_store = MyOwnStore.new("parameter")
+ # config.action_controller.cache_store = :file_store, '/path/to/cache/directory'
+ # config.action_controller.cache_store = :mem_cache_store, 'localhost'
+ # config.action_controller.cache_store = :mem_cache_store, Memcached::Rails.new('localhost:11211')
+ # config.action_controller.cache_store = MyOwnStore.new('parameter')
module Caching
extend ActiveSupport::Concern
extend ActiveSupport::Autoload
@@ -73,7 +73,7 @@ def caching_allowed?
end
protected
- # Convenience accessor
+ # Convenience accessor.
def cache(key, options = {}, &block)
if cache_configured?
cache_store.fetch(ActiveSupport::Cache.expand_cache_key(key, :controller), options, &block)
View
26 actionpack/lib/action_controller/caching/actions.rb
@@ -1,16 +1,16 @@
require 'set'
-module ActionController #:nodoc:
+module ActionController
module Caching
# Action caching is similar to page caching by the fact that the entire
# output of the response is cached, but unlike page caching, every
# request still goes through Action Pack. The key benefit of this is
# that filters run before the cache is served, which allows for
# authentication and other restrictions on whether someone is allowed
- # to execute such action. Example:
+ # to execute such action.
#
# class ListsController < ApplicationController
- # before_filter :authenticate, :except => :public
+ # before_filter :authenticate, except: :public
#
# caches_page :public
# caches_action :index, :show
@@ -35,8 +35,8 @@ module Caching
# <tt>http://david.example.com/lists.xml</tt>
# are treated like separate requests and so are cached separately.
# Keep in mind when expiring an action cache that
- # <tt>:action => 'lists'</tt> is not the same as
- # <tt>:action => 'list', :format => :xml</tt>.
+ # <tt>action: 'lists'</tt> is not the same as
+ # <tt>action: 'list', format: :xml</tt>.
#
# You can modify the default action cache path by passing a
# <tt>:cache_path</tt> option. This will be passed directly to
@@ -53,18 +53,18 @@ module Caching
# The following example depicts some of the points made above:
#
# class ListsController < ApplicationController
- # before_filter :authenticate, :except => :public
+ # before_filter :authenticate, except: :public
#
# caches_page :public
#
- # caches_action :index, :if => Proc.new do
+ # caches_action :index, if: Proc.new do
# !request.format.json? # cache if is not a JSON request
# end
#
- # caches_action :show, :cache_path => { :project => 1 },
- # :expires_in => 1.hour
+ # caches_action :show, cache_path: { project: 1 },
+ # expires_in: 1.hour
#
- # caches_action :feed, :cache_path => Proc.new do
+ # caches_action :feed, cache_path: Proc.new do
# if params[:user_id]
# user_list_url(params[:user_id, params[:id])
# else
@@ -73,7 +73,7 @@ module Caching
# end
# end
#
- # If you pass <tt>:layout => false</tt>, it will only cache your action
+ # If you pass <tt>layout: false</tt>, it will only cache your action
# content. That's useful when your layout has dynamic information.
#
# Warning: If the format of the request is determined by the Accept HTTP
@@ -162,9 +162,9 @@ def around(controller)
class ActionCachePath
attr_reader :path, :extension
- # If +infer_extension+ is true, the cache path extension is looked up from the request's
+ # If +infer_extension+ is +true+, the cache path extension is looked up from the request's
# path and format. This is desirable when reading and writing the cache, but not when
- # expiring the cache - expire_action should expire the same files regardless of the
+ # expiring the cache - +expire_action+ should expire the same files regardless of the
# request format.
def initialize(controller, options = {}, infer_extension = true)
if infer_extension
View
36 actionpack/lib/action_controller/caching/fragments.rb
@@ -1,29 +1,29 @@
-module ActionController #:nodoc:
+module ActionController
module Caching
- # Fragment caching is used for caching various blocks within
+ # Fragment caching is used for caching various blocks within
# views without caching the entire action as a whole. This is
- # useful when certain elements of an action change frequently or
- # depend on complicated state while other parts rarely change or
+ # useful when certain elements of an action change frequently or
+ # depend on complicated state while other parts rarely change or
# can be shared amongst multiple parties. The caching is done using
- # the <tt>cache</tt> helper available in the Action View. See
+ # the +cache+ helper available in the Action View. See
# ActionView::Helpers::CacheHelper for more information.
#
# While it's strongly recommended that you use key-based cache
# expiration (see links in CacheHelper for more information),
# it is also possible to manually expire caches. For example:
#
- # expire_fragment("name_of_cache")
+ # expire_fragment('name_of_cache')
module Fragments
- # Given a key (as described in <tt>expire_fragment</tt>), returns
- # a key suitable for use in reading, writing, or expiring a
+ # Given a key (as described in +expire_fragment+), returns
+ # a key suitable for use in reading, writing, or expiring a
# cached fragment. All keys are prefixed with <tt>views/</tt> and uses
# ActiveSupport::Cache.expand_cache_key for the expansion.
def fragment_cache_key(key)
ActiveSupport::Cache.expand_cache_key(key.is_a?(Hash) ? url_for(key).split("://").last : key, :views)
end
- # Writes <tt>content</tt> to the location signified by
- # <tt>key</tt> (see <tt>expire_fragment</tt> for acceptable formats).
+ # Writes +content+ to the location signified by
+ # +key+ (see +expire_fragment+ for acceptable formats).
def write_fragment(key, content, options = nil)
return content unless cache_configured?
@@ -35,8 +35,8 @@ def write_fragment(key, content, options = nil)
content
end
- # Reads a cached fragment from the location signified by <tt>key</tt>
- # (see <tt>expire_fragment</tt> for acceptable formats).
+ # Reads a cached fragment from the location signified by +key+
+ # (see +expire_fragment+ for acceptable formats).
def read_fragment(key, options = nil)
return unless cache_configured?
@@ -47,8 +47,8 @@ def read_fragment(key, options = nil)
end
end
- # Check if a cached fragment from the location signified by
- # <tt>key</tt> exists (see <tt>expire_fragment</tt> for acceptable formats)
+ # Check if a cached fragment from the location signified by
+ # +key+ exists (see +expire_fragment+ for acceptable formats).
def fragment_exist?(key, options = nil)
return unless cache_configured?
key = fragment_cache_key(key)
@@ -65,7 +65,7 @@ def fragment_exist?(key, options = nil)
# * String - This would normally take the form of a path, like
# <tt>pages/45/notes</tt>.
# * Hash - Treated as an implicit call to +url_for+, like
- # <tt>{:controller => "pages", :action => "notes", :id => 45}</tt>
+ # <tt>{ controller: 'pages', action: 'notes', id: 45}</tt>
# * Regexp - Will remove any fragment that matches, so
# <tt>%r{pages/\d*/notes}</tt> might remove all notes. Make sure you
# don't use anchors in the regex (<tt>^</tt> or <tt>$</tt>) because
@@ -74,8 +74,8 @@ def fragment_exist?(key, options = nil)
# only supported on caches that can iterate over all keys (unlike
# memcached).
#
- # +options+ is passed through to the cache store's <tt>delete</tt>
- # method (or <tt>delete_matched</tt>, for Regexp keys.)
+ # +options+ is passed through to the cache store's +delete+
+ # method (or <tt>delete_matched</tt>, for Regexp keys).
def expire_fragment(key, options = nil)
return unless cache_configured?
key = fragment_cache_key(key) unless key.is_a?(Regexp)
@@ -89,7 +89,7 @@ def expire_fragment(key, options = nil)
end
end
- def instrument_fragment_cache(name, key)
+ def instrument_fragment_cache(name, key) # :nodoc:
ActiveSupport::Notifications.instrument("#{name}.action_controller", :key => key){ yield }
end
end
View
91 actionpack/lib/action_controller/caching/pages.rb
@@ -1,68 +1,80 @@
require 'fileutils'
require 'active_support/core_ext/class/attribute_accessors'
-module ActionController #:nodoc:
+module ActionController
module Caching
- # Page caching is an approach to caching where the entire action output of is stored as a HTML file that the web server
- # can serve without going through Action Pack. This is the fastest way to cache your content as opposed to going dynamically
- # through the process of generating the content. Unfortunately, this incredible speed-up is only available to stateless pages
- # where all visitors are treated the same. Content management systems -- including weblogs and wikis -- have many pages that are
- # a great fit for this approach, but account-based systems where people log in and manipulate their own data are often less
- # likely candidates.
+ # Page caching is an approach to caching where the entire action output of is
+ # stored as a HTML file that the web server can serve without going through
+ # Action Pack. This is the fastest way to cache your content as opposed to going
+ # dynamically through the process of generating the content. Unfortunately, this
+ # incredible speed-up is only available to stateless pages where all visitors are
+ # treated the same. Content management systems -- including weblogs and wikis --
+ # have many pages that are a great fit for this approach, but account-based systems
+ # where people log in and manipulate their own data are often less likely candidates.
#
- # Specifying which actions to cache is done through the <tt>caches_page</tt> class method:
+ # Specifying which actions to cache is done through the +caches_page+ class method:
#
# class WeblogController < ActionController::Base
# caches_page :show, :new
# end
#
- # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>, which match the URLs used
- # that would normally trigger dynamic page generation. Page caching works by configuring a web server to first check for the
- # existence of files on disk, and to serve them directly when found, without passing the request through to Action Pack.
- # This is much faster than handling the full dynamic request in the usual way.
+ # This will generate cache files such as <tt>weblog/show/5.html</tt> and
+ # <tt>weblog/new.html</tt>, which match the URLs used that would normally trigger
+ # dynamic page generation. Page caching works by configuring a web server to first
+ # check for the existence of files on disk, and to serve them directly when found,
+ # without passing the request through to Action Pack. This is much faster than
+ # handling the full dynamic request in the usual way.
#
- # Expiration of the cache is handled by deleting the cached file, which results in a lazy regeneration approach where the cache
- # is not restored before another hit is made against it. The API for doing so mimics the options from +url_for+ and friends:
+ # Expiration of the cache is handled by deleting the cached file, which results
+ # in a lazy regeneration approach where the cache is not restored before another
+ # hit is made against it. The API for doing so mimics the options from +url_for+ and friends:
#
# class WeblogController < ActionController::Base
# def update
# List.update(params[:list][:id], params[:list])
- # expire_page :action => "show", :id => params[:list][:id]
- # redirect_to :action => "show", :id => params[:list][:id]
+ # expire_page action: 'show', id: params[:list][:id]
+ # redirect_to action: 'show', id: params[:list][:id]
# end
# end
#
- # Additionally, you can expire caches using Sweepers that act on changes in the model to determine when a cache is supposed to be
- # expired.
+ # Additionally, you can expire caches using Sweepers that act on changes in
+ # the model to determine when a cache is supposed to be expired.
module Pages
extend ActiveSupport::Concern
included do
- # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
- # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>Rails.root + "/public"</tt>). Changing
- # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
- # web server to look in the new location for cached files.
+ # The cache directory should be the document root for the web server and is
+ # set using <tt>Base.page_cache_directory = "/document/root"</tt>. For Rails,
+ # this directory has already been set to Rails.public_path (which is usually
+ # set to <tt>Rails.root + "/public"</tt>). Changing this setting can be useful
+ # to avoid naming conflicts with files in <tt>public/</tt>, but doing so will
+ # likely require configuring your web server to look in the new location for
+ # cached files.
class_attribute :page_cache_directory
self.page_cache_directory ||= ''
- # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
- # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
- # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
- # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
+ # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>.
+ # In these cases, the page caching mechanism will add one in order to make it
+ # easy for the cached files to be picked up properly by the web server. By
+ # default, this cache extension is <tt>.html</tt>. If you want something else,
+ # like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension.
+ # In cases where a request already has an extension, such as <tt>.xml</tt>
+ # or <tt>.rss</tt>, page caching will not add an extension. This allows it
+ # to work well with RESTful apps.
class_attribute :page_cache_extension
self.page_cache_extension ||= '.html'
- # The compression used for gzip. If false (default), the page is not compressed.
- # If can be a symbol showing the ZLib compression method, for example, :best_compression
- # or :best_speed or an integer configuring the compression level.
+ # The compression used for gzip. If +false+ (default), the page is not compressed.
+ # If can be a symbol showing the ZLib compression method, for example, <tt>:best_compression</tt>
+ # or <tt>:best_speed</tt> or an integer configuring the compression level.
class_attribute :page_cache_compression
self.page_cache_compression ||= false
end
module ClassMethods
# Expires the page that was cached with the +path+ as a key.
#
- # expire_page "/lists/show"
+ # expire_page '/lists/show'
def expire_page(path)
return unless perform_caching
path = page_cache_path(path)
@@ -75,7 +87,7 @@ def expire_page(path)
# Manually cache the +content+ in the key determined by +path+.
#
- # cache_page "I'm the cached content", "/lists/show"
+ # cache_page "I'm the cached content", '/lists/show'
def cache_page(content, path, extension = nil, gzip = Zlib::BEST_COMPRESSION)
return unless perform_caching
path = page_cache_path(path, extension)
@@ -90,19 +102,19 @@ def cache_page(content, path, extension = nil, gzip = Zlib::BEST_COMPRESSION)
end
# Caches the +actions+ using the page-caching approach that'll store
- # the cache in a path within the page_cache_directory that
+ # the cache in a path within the +page_cache_directory+ that
# matches the triggering url.
#
- # You can also pass a :gzip option to override the class configuration one.
+ # You can also pass a <tt>:gzip</tt> option to override the class configuration one.
#
# # cache the index action
# caches_page :index
#
# # cache the index action except for JSON requests
- # caches_page :index, :if => Proc.new { !request.format.json? }
+ # caches_page :index, if: Proc.new { !request.format.json? }
#
# # don't gzip images
- # caches_page :image, :gzip => false
+ # caches_page :image, gzip: false
def caches_page(*actions)
return unless perform_caching
options = actions.extract_options!
@@ -144,7 +156,7 @@ def instrument_page_cache(name, path)
# Expires the page that was cached with the +options+ as a key.
#
- # expire_page :controller => "lists", :action => "show"
+ # expire_page controller: 'lists', action: 'show'
def expire_page(options = {})
return unless self.class.perform_caching
@@ -161,10 +173,11 @@ def expire_page(options = {})
end
end
- # Manually cache the +content+ in the key determined by +options+. If no content is provided, the contents of response.body is used.
- # If no options are provided, the url of the current request being handled is used.
+ # Manually cache the +content+ in the key determined by +options+. If no content is provided,
+ # the contents of response.body is used. If no options are provided, the url of the current
+ # request being handled is used.
#
- # cache_page "I'm the cached content", :controller => "lists", :action => "show"
+ # cache_page "I'm the cached content", controller: 'lists', action: 'show'
def cache_page(content = nil, options = nil, gzip = Zlib::BEST_COMPRESSION)
return unless self.class.perform_caching && caching_allowed?
View
27 actionpack/lib/action_controller/caching/sweeping.rb
@@ -1,38 +1,41 @@
-module ActionController #:nodoc:
+module ActionController
module Caching
- # Sweepers are the terminators of the caching world and responsible for expiring caches when Active Record objects change.
- # They do this by being half-observers, half-filters and implementing callbacks for both roles. A Sweeper example:
+ # Sweepers are the terminators of the caching world and responsible for expiring
+ # caches when Active Record objects change. They do this by being half-observers,
+ # half-filters and implementing callbacks for both roles.
#
# class ListSweeper < ActionController::Caching::Sweeper
# observe List, Item
#
# def after_save(record)
# list = record.is_a?(List) ? record : record.list
- # expire_page(:controller => "lists", :action => %w( show public feed ), :id => list.id)
- # expire_action(:controller => "lists", :action => "all")
- # list.shares.each { |share| expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
+ # expire_page(controller: 'lists', action: %w( show public feed ), id: list.id)
+ # expire_action(controller: 'lists', action: 'all')
+ # list.shares.each { |share| expire_page(controller: 'lists', action: 'show', id: share.url_key) }
# end
# end
#
- # The sweeper is assigned in the controllers that wish to have its job performed using the <tt>cache_sweeper</tt> class method:
+ # The sweeper is assigned in the controllers that wish to have its job performed using
+ # the +cache_sweeper+ class method:
#
# class ListsController < ApplicationController
# caches_action :index, :show, :public, :feed
- # cache_sweeper :list_sweeper, :only => [ :edit, :destroy, :share ]
+ # cache_sweeper :list_sweeper, only: [ :edit, :destroy, :share ]
# end
#
# In the example above, four actions are cached and three actions are responsible for expiring those caches.
#
- # You can also name an explicit class in the declaration of a sweeper, which is needed if the sweeper is in a module:
+ # You can also name an explicit class in the declaration of a sweeper, which is needed
+ # if the sweeper is in a module:
#
# class ListsController < ApplicationController
# caches_action :index, :show, :public, :feed
- # cache_sweeper OpenBar::Sweeper, :only => [ :edit, :destroy, :share ]
+ # cache_sweeper OpenBar::Sweeper, only: [ :edit, :destroy, :share ]
# end
module Sweeping
extend ActiveSupport::Concern
- module ClassMethods #:nodoc:
+ module ClassMethods # :nodoc:
def cache_sweeper(*sweepers)
configuration = sweepers.extract_options!
@@ -51,7 +54,7 @@ def cache_sweeper(*sweepers)
end
if defined?(ActiveRecord) and defined?(ActiveRecord::Observer)
- class Sweeper < ActiveRecord::Observer #:nodoc:
+ class Sweeper < ActiveRecord::Observer # :nodoc:
attr_accessor :controller
def initialize(*args)
View
17 actionpack/lib/action_controller/log_subscriber.rb
@@ -4,6 +4,8 @@ class LogSubscriber < ActiveSupport::LogSubscriber
INTERNAL_PARAMS = %w(controller action format _method only_path)
def start_processing(event)
+ return unless logger.info?
+
payload = event.payload
params = payload[:params].except(*INTERNAL_PARAMS)
format = payload[:format]
@@ -14,6 +16,8 @@ def start_processing(event)
end
def process_action(event)
+ return unless logger.info?
+
payload = event.payload
additions = ActionController::Base.log_process_action(payload)
@@ -22,35 +26,36 @@ def process_action(event)
exception_class_name = payload[:exception].first
status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name)
end
- message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
+ message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{event.duration.round}ms"
message << " (#{additions.join(" | ")})" unless additions.blank?
info(message)
end
def halted_callback(event)
- info "Filter chain halted as #{event.payload[:filter]} rendered or redirected"
+ info("Filter chain halted as #{event.payload[:filter]} rendered or redirected")
end
def send_file(event)
- info("Sent file %s (%.1fms)" % [event.payload[:path], event.duration])
+ info("Sent file #{event.payload[:path]} (#{event.duration.round(1)}ms)")
end
def redirect_to(event)
- info "Redirected to #{event.payload[:location]}"
+ info("Redirected to #{event.payload[:location]}")
end
def send_data(event)
- info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
+ info("Sent data #{event.payload[:filename]} (#{event.duration.round(1)}ms)")
end
%w(write_fragment read_fragment exist_fragment?
expire_fragment expire_page write_page).each do |method|
class_eval <<-METHOD, __FILE__, __LINE__ + 1
def #{method}(event)
+ return unless logger.info?
key_or_path = event.payload[:key] || event.payload[:path]
human_name = #{method.to_s.humanize.inspect}
- info("\#{human_name} \#{key_or_path} \#{"(%.1fms)" % event.duration}")
+ info("\#{human_name} \#{key_or_path} (\#{event.duration.round(1)}ms)")
end
METHOD
end
View
58 actionpack/lib/action_controller/metal/conditional_get.rb
@@ -18,8 +18,6 @@ module ClassMethods
# may want to add the current user id to be part of the etag to prevent authorized displaying
# of cached pages.
#
- # === Example
- #
# class InvoicesController < ApplicationController
# etag { current_user.try :id }
#
@@ -34,25 +32,28 @@ def etag(&etagger)
end
end
- # Sets the etag, last_modified, or both on the response and renders a
+ # Sets the etag, +last_modified+, or both on the response and renders a
# <tt>304 Not Modified</tt> response if the request is already fresh.
#
- # Parameters:
- # * <tt>:etag</tt>
- # * <tt>:last_modified</tt>
- # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
+ # === Parameters:
+ #
+ # * <tt>:etag</tt>.
+ # * <tt>:last_modified</tt>.
+ # * <tt>:public</tt> By default the Cache-Control header is private, set this to
+ # +true+ if you want your application to be cachable by other devices (proxy caches).
#
- # Example:
+ # === Example:
#
# def show
# @article = Article.find(params[:id])
- # fresh_when(:etag => @article, :last_modified => @article.created_at, :public => true)
+ # fresh_when(etag: @article, last_modified: @article.created_at, public: true)
# end
#
# This will render the show template if the request isn't sending a matching etag or
# If-Modified-Since header and just a <tt>304 Not Modified</tt> response if there's a match.
#
- # You can also just pass a record where last_modified will be set by calling updated_at and the etag by passing the object itself. Example:
+ # You can also just pass a record where +last_modified+ will be set by calling
+ # +updated_at+ and the etag by passing the object itself.
#
# def show
# @article = Article.find(params[:id])
@@ -81,30 +82,33 @@ def fresh_when(record_or_options, additional_options = {})
head :not_modified if request.fresh?(response)
end
- # Sets the etag and/or last_modified on the response and checks it against
+ # Sets the +etag+ and/or +last_modified+ on the response and checks it against
# the client request. If the request doesn't match the options provided, the
# request is considered stale and should be generated from scratch. Otherwise,
# it's fresh and we don't need to generate anything and a reply of <tt>304 Not Modified</tt> is sent.
#
- # Parameters:
- # * <tt>:etag</tt>
- # * <tt>:last_modified</tt>
- # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
+ # === Parameters:
+ #
+ # * <tt>:etag</tt>.
+ # * <tt>:last_modified</tt>.
+ # * <tt>:public</tt> By default the Cache-Control header is private, set this to
+ # +true+ if you want your application to be cachable by other devices (proxy caches).
#
- # Example:
+ # === Example:
#
# def show
# @article = Article.find(params[:id])
#
- # if stale?(:etag => @article, :last_modified => @article.created_at)
+ # if stale?(etag: @article, last_modified: @article.created_at)
# @statistics = @article.really_expensive_call
# respond_to do |format|
# # all the supported formats
# end
# end
# end
#
- # You can also just pass a record where last_modified will be set by calling updated_at and the etag by passing the object itself. Example:
+ # You can also just pass a record where +last_modified+ will be set by calling
+ # updated_at and the etag by passing the object itself.
#
# def show
# @article = Article.find(params[:id])
@@ -122,7 +126,7 @@ def fresh_when(record_or_options, additional_options = {})
# def show
# @article = Article.find(params[:id])
#
- # if stale?(@article, :public => true)
+ # if stale?(@article, public: true)
# @statistics = @article.really_expensive_call
# respond_to do |format|
# # all the supported formats
@@ -134,18 +138,18 @@ def stale?(record_or_options, additional_options = {})
!request.fresh?(response)
end
- # Sets a HTTP 1.1 Cache-Control header. Defaults to issuing a <tt>private</tt> instruction, so that
- # intermediate caches must not cache the response.
+ # Sets a HTTP 1.1 Cache-Control header. Defaults to issuing a +private+
+ # instruction, so that intermediate caches must not cache the response.
#
# expires_in 20.minutes
- # expires_in 3.hours, :public => true
- # expires_in 3.hours, :public => true, :must_revalidate => true
+ # expires_in 3.hours, public: true
+ # expires_in 3.hours, public: true, must_revalidate: true
#
# This method will overwrite an existing Cache-Control header.
# See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities.
#
# The method will also ensure a HTTP Date header for client compatibility.
- def expires_in(seconds, options = {}) #:doc:
+ def expires_in(seconds, options = {})
response.cache_control.merge!(
:max_age => seconds,
:public => options.delete(:public),
@@ -157,9 +161,9 @@ def expires_in(seconds, options = {}) #:doc:
response.date = Time.now unless response.date?
end
- # Sets a HTTP 1.1 Cache-Control header of <tt>no-cache</tt> so no caching should occur by the browser or
- # intermediate caches (like caching proxy servers).
- def expires_now #:doc:
+ # Sets a HTTP 1.1 Cache-Control header of <tt>no-cache</tt> so no caching should
+ # occur by the browser or intermediate caches (like caching proxy servers).
+ def expires_now
response.cache_control.replace(:no_cache => true)
end
View
20 actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -7,15 +7,15 @@ module ActionController
#
# params = ActionController::Parameters.new(a: {})
# params.fetch(:b)
- # # => ActionController::ParameterMissing: key not found: b
+ # # => ActionController::ParameterMissing: param not found: b
# params.require(:a)
- # # => ActionController::ParameterMissing: key not found: a
+ # # => ActionController::ParameterMissing: param not found: a
class ParameterMissing < KeyError
attr_reader :param # :nodoc:
def initialize(param) # :nodoc:
@param = param
- super("key not found: #{param}")
+ super("param not found: #{param}")
end
end
@@ -124,10 +124,10 @@ def permit!
# # => {"name"=>"Francesco"}
#
# ActionController::Parameters.new(person: nil).require(:person)
- # # => ActionController::ParameterMissing: key not found: person
+ # # => ActionController::ParameterMissing: param not found: person
#
# ActionController::Parameters.new(person: {}).require(:person)
- # # => ActionController::ParameterMissing: key not found: person
+ # # => ActionController::ParameterMissing: param not found: person
def require(key)
self[key].presence || raise(ParameterMissing.new(key))
end
@@ -160,7 +160,7 @@ def require(key)
# }
# })
#
- # permitted = params.permit(person: [ :name, { pets: [ :name ] } ])
+ # permitted = params.permit(person: [ :name, { pets: :name } ])
# permitted.permitted? # => true
# permitted[:person][:name] # => "Francesco"
# permitted[:person][:age] # => nil
@@ -212,7 +212,7 @@ def [](key)
#
# params = ActionController::Parameters.new(person: { name: 'Francesco' })
# params.fetch(:person) # => {"name"=>"Francesco"}
- # params.fetch(:none) # => ActionController::ParameterMissing: key not found: none
+ # params.fetch(:none) # => ActionController::ParameterMissing: param not found: none
# params.fetch(:none, 'Francesco') # => "Francesco"
# params.fetch(:none) { 'Francesco' } # => "Francesco"
def fetch(key, *args)
@@ -269,7 +269,7 @@ def each_element(object)
end
end
- # == Strong Parameters
+ # == Strong \Parameters
#
# It provides an interface for protecting attributes from end-user
# assignment. This makes Action Controller parameters forbidden
@@ -290,9 +290,9 @@ def each_element(object)
# end
#
# # This will pass with flying colors as long as there's a person key in the
- # # parameters, otherwise it'll raise a ActionController::MissingParameter
+ # # parameters, otherwise it'll raise an ActionController::MissingParameter
# # exception, which will get caught by ActionController::Base and turned
- # # into that 400 Bad Request reply.
+ # # into a 400 Bad Request reply.
# def update
# redirect_to current_account.people.find(params[:id]).tap { |person|
# person.update_attributes!(person_params)
View
55 actionpack/lib/action_controller/test_case.rb
@@ -12,16 +12,16 @@ module TemplateAssertions
end
def setup_subscriptions
- @partials = Hash.new(0)
- @templates = Hash.new(0)
- @layouts = Hash.new(0)
+ @_partials = Hash.new(0)
+ @_templates = Hash.new(0)
+ @_layouts = Hash.new(0)
ActiveSupport::Notifications.subscribe("render_template.action_view") do |name, start, finish, id, payload|
path = payload[:layout]
if path
- @layouts[path] += 1
+ @_layouts[path] += 1
if path =~ /^layouts\/(.*)/
- @layouts[$1] += 1
+ @_layouts[$1] += 1
end
end
end
@@ -32,11 +32,11 @@ def setup_subscriptions
partial = path =~ /^.*\/_[^\/]*$/
if partial
- @partials[path] += 1
- @partials[path.split("/").last] += 1
+ @_partials[path] += 1
+ @_partials[path.split("/").last] += 1
end
- @templates[path] += 1
+ @_templates[path] += 1
end
end
@@ -46,9 +46,9 @@ def teardown_subscriptions
end
def process(*args)
- @partials = Hash.new(0)
- @templates = Hash.new(0)
- @layouts = Hash.new(0)
+ @_partials = Hash.new(0)
+ @_templates = Hash.new(0)
+ @_layouts = Hash.new(0)
super
end
@@ -86,31 +86,38 @@ def assert_template(options = {}, message = nil)
response.body
case options
- when NilClass, String, Symbol, Regexp
+ when NilClass, Regexp, String, Symbol
options = options.to_s if Symbol === options
- rendered = @templates
+ rendered = @_templates
msg = message || sprintf("expecting <%s> but rendering with <%s>",
options.inspect, rendered.keys)
matches_template =
- if options
+ case options
+ when String
+ rendered.any? do |t, num|
+ options_splited = options.split(File::SEPARATOR)
+ t_splited = t.split(File::SEPARATOR)
+ t_splited.last(options_splited.size) == options_splited
+ end
+ when Regexp
rendered.any? { |t,num| t.match(options) }
- else
- @templates.blank?
+ when NilClass
+ rendered.blank?
end
assert matches_template, msg
when Hash
if options.key?(:layout)
expected_layout = options[:layout]
msg = message || sprintf("expecting layout <%s> but action rendered <%s>",
- expected_layout, @layouts.keys)
+ expected_layout, @_layouts.keys)
case expected_layout
when String, Symbol
- assert_includes @layouts.keys, expected_layout.to_s, msg
+ assert_includes @_layouts.keys, expected_layout.to_s, msg
when Regexp
- assert(@layouts.keys.any? {|l| l =~ expected_layout }, msg)
+ assert(@_layouts.keys.any? {|l| l =~ expected_layout }, msg)
when nil, false
- assert(@layouts.empty?, msg)
+ assert(@_layouts.empty?, msg)
end
end
@@ -121,17 +128,17 @@ def assert_template(options = {}, message = nil)
assert_equal(v, actual_locals[k])
end
elsif expected_count = options[:count]
- actual_count = @partials[expected_partial]
+ actual_count = @_partials[expected_partial]
msg = message || sprintf("expecting %s to be rendered %s time(s) but rendered %s time(s)",
expected_partial, expected_count, actual_count)
assert(actual_count == expected_count.to_i, msg)
else
msg = message || sprintf("expecting partial <%s> but action rendered <%s>",
- options[:partial], @partials.keys)
- assert_includes @partials, expected_partial, msg
+ options[:partial], @_partials.keys)
+ assert_includes @_partials, expected_partial, msg
end
elsif options.key?(:partial)
- assert @partials.empty?,
+ assert @_partials.empty?,
"Expected no partials to be rendered"
end
else
View
6 actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -15,11 +15,11 @@ module ActionDispatch
# If any exception happens inside the exceptions app, this middleware
# catches the exceptions and returns a FAILSAFE_RESPONSE.
class ShowExceptions
- FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
- ["<html><body><h1>500 Internal Server Error</h1>" <<
+ FAILSAFE_RESPONSE = [500, { 'Content-Type' => 'text/plain' },
+ ["500 Internal Server Error\n" <<
"If you are the administrator of this website, then please read this web " <<
"application's log file and/or the web server's log file to find out what " <<
- "went wrong.</body></html>"]]
+ "went wrong."]]
def initialize(app, exceptions_app)
@app = app
View
4 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1038,7 +1038,7 @@ def resources_path_names(options)
# === Options
# Takes same options as +resources+.
def resource(*resources, &block)
- options = resources.extract_options!
+ options = resources.extract_options!.dup
if apply_common_behavior_for(:resource, resources, options, &block)
return self
@@ -1204,7 +1204,7 @@ def resource(*resources, &block)
# # resource actions are at /admin/posts.
# resources :posts, :path => "admin/posts"
def resources(*resources, &block)
- options = resources.extract_options!
+ options = resources.extract_options!.dup
if apply_common_behavior_for(:resources, resources, options, &block)
return self
View
4 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -369,9 +369,9 @@ def font_url(source)
# <tt>:size</tt> will be ignored if the value is not in the correct format.
#
# image_tag("icon")
- # # => <img src="/assets/icon" alt="Icon" />
+ # # => <img alt="Icon" src="/assets/icon" />
# image_tag("icon.png")
- # # => <img src="/assets/icon.png" alt="Icon" />
+ # # => <img alt="Icon" src="/assets/icon.png" />
# image_tag("icon.png", :size => "16x10", :alt => "Edit Entry")
# # => <img src="/assets/icon.png" width="16" height="10" alt="Edit Entry" />
# image_tag("/icons/icon.gif", :size => "16")
View
7 actionpack/lib/action_view/log_subscriber.rb
@@ -3,10 +3,13 @@ module ActionView
#
# Provides functionality so that Rails can output logs from Action View.
class LogSubscriber < ActiveSupport::LogSubscriber
+ VIEWS_PATTERN = /^app\/views\//.freeze
+
def render_template(event)
+ return unless logger.info?
message = " Rendered #{from_rails_root(event.payload[:identifier])}"
message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
- message << (" (%.1fms)" % event.duration)
+ message << " (#{event.duration.round(1)}ms)"
info(message)
end
alias :render_partial :render_template
@@ -19,7 +22,7 @@ def logger
protected
def from_rails_root(string)
- string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "")
+ string.sub("#{Rails.root}/", "").sub(VIEWS_PATTERN, "")
end
end
end
View
7 actionpack/lib/action_view/test_case.rb
@@ -196,16 +196,17 @@ def view
:@_result,
:@_routes,
:@controller,
- :@layouts,
+ :@_layouts,
:@locals,
:@method_name,
:@output_buffer,
- :@partials,
+ :@_partials,
:@passed,
:@rendered,
:@request,
:@routes,
- :@templates,
+ :@tagged_logger,
+ :@_templates,
:@options,
:@test_passed,
:@view,
View
22 actionpack/test/controller/action_pack_assertions_test.rb
@@ -7,6 +7,7 @@ class ActionPackAssertionsController < ActionController::Base
def nothing() head :ok end
def hello_world() render :template => "test/hello_world"; end
+ def hello_repeating_in_path() render :template => "test/hello/hello"; end
def hello_xml_world() render :template => "test/hello_xml_world"; end
@@ -464,13 +465,34 @@ def test_fails_with_incorrect_string
end
end
+ def test_fails_with_incorrect_string_that_matches
+ get :hello_world
+ assert_raise(ActiveSupport::TestCase::Assertion) do
+ assert_template 'est/he'
+ end
+ end
+
+ def test_fails_with_repeated_name_in_path
+ get :hello_repeating_in_path
+ assert_raise(ActiveSupport::TestCase::Assertion) do
+ assert_template 'test/hello'
+ end
+ end
+
def test_fails_with_incorrect_symbol
get :hello_world
assert_raise(ActiveSupport::TestCase::Assertion) do
assert_template :hello_planet
end
end
+ def test_fails_with_incorrect_symbol_that_matches
+ get :hello_world
+ assert_raise(ActiveSupport::TestCase::Assertion) do
+ assert_template :"est/he"
+ end
+ end
+
def test_fails_with_wrong_layout
get :render_with_layout
assert_raise(ActiveSupport::TestCase::Assertion) do
View
47 actionpack/test/controller/caching_test.rb
@@ -5,6 +5,43 @@
CACHE_DIR = 'test_cache'
# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
+
+class CachingMetalController < ActionController::Metal
+ abstract!
+
+ include ActionController::Caching
+
+ self.page_cache_directory = FILE_STORE_PATH
+ self.cache_store = :file_store, FILE_STORE_PATH
+end
+
+class PageCachingMetalTestController < CachingMetalController
+ caches_page :ok
+
+ def ok
+ self.response_body = 'ok'
+ end
+end
+
+class PageCachingMetalTest < ActionController::TestCase
+ tests PageCachingMetalTestController
+
+ def setup
+ FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
+ FileUtils.mkdir_p(FILE_STORE_PATH)
+ end
+
+ def teardown
+ FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
+ end
+
+ def test_should_cache_get_with_ok_status
+ get :ok
+ assert_response :ok
+ assert File.exist?("#{FILE_STORE_PATH}/page_caching_metal_test/ok.html"), 'get with ok status should have been cached'
+ end
+end
+
ActionController::Base.page_cache_directory = FILE_STORE_PATH
class CachingController < ActionController::Base
@@ -862,7 +899,7 @@ def test_fragment_caching_in_partials
get :html_fragment_cached_with_partial
assert_response :success
assert_match(/Old fragment caching in a partial/, @response.body)
-
+
assert_match("Old fragment caching in a partial",
@store.read("views/test.host/functional_caching/html_fragment_cached_with_partial/#{template_digest("functional_caching/_partial", "html")}"))
end
@@ -872,7 +909,7 @@ def test_render_inline_before_fragment_caching
assert_response :success
assert_match(/Some inline content/, @response.body)
assert_match(/Some cached content/, @response.body)
- assert_match("Some cached content",
+ assert_match("Some cached content",
@store.read("views/test.host/functional_caching/inline_fragment_cached/#{template_digest("functional_caching/inline_fragment_cached", "html")}"))
end
@@ -883,7 +920,7 @@ def test_html_formatted_fragment_caching
assert_equal expected_body, @response.body
- assert_equal "<p>ERB</p>",
+ assert_equal "<p>ERB</p>",
@store.read("views/test.host/functional_caching/formatted_fragment_cached/#{template_digest("functional_caching/formatted_fragment_cached", "html")}")
end
@@ -897,7 +934,7 @@ def test_xml_formatted_fragment_caching
assert_equal " <p>Builder</p>\n",
@store.read("views/test.host/functional_caching/formatted_fragment_cached/#{template_digest("functional_caching/formatted_fragment_cached", "xml")}")
end
-
+
private
def template_digest(name, format)
ActionView::Digestor.digest(name, format, @controller.lookup_context)
@@ -949,5 +986,5 @@ def test_safe_buffer
cache_helper.send :fragment_for, 'Test fragment name', 'Test fragment', &Proc.new{ nil }
end
end
-
end
+
View
16 actionpack/test/controller/show_exceptions_test.rb
@@ -93,4 +93,20 @@ def test_render_fallback_exception
assert_equal 'text/html', response.content_type.to_s
end
end
+
+ class ShowFailsafeExceptionsTest < ActionDispatch::IntegrationTest
+ def test_render_failsafe_exception
+ @app = ShowExceptionsOverridenController.action(:boom)
+ @exceptions_app = @app.instance_variable_get(:@exceptions_app)
+ @app.instance_variable_set(:@exceptions_app, nil)
+ $stderr = StringIO.new
+
+ get '/', {}, 'HTTP_ACCEPT' => 'text/json'
+ assert_response :internal_server_error
+ assert_equal 'text/plain', response.content_type.to_s
+
+ @app.instance_variable_set(:@exceptions_app, @exceptions_app)
+ $stderr = STDERR
+ end
+ end
end
View
2 actionpack/test/controller/spec_type_test.rb
@@ -3,7 +3,7 @@
class ApplicationController < ActionController::Base; end
class ModelsController < ApplicationController; end
-class SpecTypeTest < ActiveSupport::TestCase
+class ActionControllerSpecTypeTest < ActiveSupport::TestCase
def assert_controller actual
assert_equal ActionController::TestCase, actual
end
View
20 actionpack/test/dispatch/routing_test.rb
@@ -1124,6 +1124,26 @@ def test_resources_for_uncountable_names
assert_equal '/sheep/1/_it', _it_sheep_path(1)
end
+ def test_resource_does_not_modify_passed_options
+ options = {:id => /.+?/, :format => /json|xml/}
+ self.class.stub_controllers do |routes|
+ routes.draw do
+ resource :user, options
+ end
+ end
+ assert_equal({:id => /.+?/, :format => /json|xml/}, options)
+ end
+
+ def test_resources_does_not_modify_passed_options
+ options = {:id => /.+?/, :format => /json|xml/}
+ self.class.stub_controllers do |routes|
+ routes.draw do
+ resources :users, options
+ end
+ end
+ assert_equal({:id => /.+?/, :format => /json|xml/}, options)
+ end
+
def test_path_names
get '/pt/projetos'
assert_equal 'projects#index', @response.body
View
1 actionpack/test/dispatch/session/cache_store_test.rb
@@ -1,4 +1,5 @@
require 'abstract_unit'
+require 'fixtures/session_autoload_test/session_autoload_test/foo'
class CacheStoreTest < ActionDispatch::IntegrationTest
class TestController < ActionController::Base
View
1 actionpack/test/fixtures/test/hello/hello.erb
@@ -0,0 +1 @@
+Hello world!
View
32 actionpack/test/metal/caching_test.rb
@@ -1,32 +0,0 @@
-require 'abstract_unit'
-
-CACHE_DIR = 'test_cache'
-# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
-FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
-
-class CachingController < ActionController::Metal
- abstract!
-
- include ActionController::Caching
-
- self.page_cache_directory = FILE_STORE_PATH
- self.cache_store = :file_store, FILE_STORE_PATH
-end
-
-class PageCachingTestController < CachingController
- caches_page :ok
-
- def ok
- self.response_body = "ok"
- end
-end
-
-class PageCachingTest < ActionController::TestCase
- tests PageCachingTestController
-
- def test_should_cache_get_with_ok_status
- get :ok
- assert_response :ok
- assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/ok.html"), "get with ok status should have been cached"
- end
-end
View
2 actionpack/test/template/spec_type_test.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
-class SpecTypeTest < ActiveSupport::TestCase
+class ActionViewSpecTypeTest < ActiveSupport::TestCase
def assert_view actual
assert_equal ActionView::TestCase, actual
end
View
38 activerecord/CHANGELOG.md
@@ -1,5 +1,23 @@
## Rails 4.0.0 (unreleased) ##
+* Fix `reset_counters` crashing on `has_many :through` associations.
+ Fix #7822.
+
+ *lulalala*
+
+* Support for partial inserts.
+
+ When inserting new records, only the fields which have been changed
+ from the defaults will actually be included in the INSERT statement.
+ The other fields will be populated by the database.
+
+ This is more efficient, and also means that it will be safe to
+ remove database columns without getting subsequent errors in running
+ app processes (so long as the code in those processes doesn't
+ contain any references to the removed column).
+
+ *Jon Leighton*
+
* Allow before and after validations to take an array of lifecycle events
*John Foley*
@@ -288,6 +306,15 @@
*Jon Leighton*
+* `Relation#order`: make new order prepend old one.
+
+ User.order("name asc").order("created_at desc")
+ # SELECT * FROM users ORDER BY created_at desc, name asc
+
+ This also affects order defined in `default_scope` or any kind of associations.
+
+ *Bogdan Gusiev*
+
* `Model.all` now returns an `ActiveRecord::Relation`, rather than an
array of records. Use `Relation#to_a` if you really want an array.
@@ -317,6 +344,17 @@
*Jon Leighton*
+* Added `#update_columns` method which updates the attributes from
+ the passed-in hash without calling save, hence skipping validations and
+ callbacks. `ActiveRecordError` will be raised when called on new objects
+ or when at least one of the attributes is marked as read only.
+
+ post.attributes # => {"id"=>2, "title"=>"My title", "body"=>"My content", "author"=>"Peter"}
+ post.update_columns(title: 'New title', author: 'Sebastian') # => true
+ post.attributes # => {"id"=>2, "title"=>"New title", "body"=>"My content", "author"=>"Sebastian"}
+
+ *Sebastian Martinez + Rafael Mendonça França*
+
* The migration generator now creates a join table with (commented) indexes every time
the migration name contains the word `join_table`:
View
4 activerecord/Rakefile
@@ -112,8 +112,8 @@ namespace :postgresql do
desc 'Build the PostgreSQL test databases'
task :build_databases do
config = ARTest.config['connections']['postgresql']
- %x( createdb -E UTF8 #{config['arunit']['database']} )
- %x( createdb -E UTF8 #{config['arunit2']['database']} )
+ %x( createdb -E UTF8 -T template0 #{config['arunit']['database']} )
+ %x( createdb -E UTF8 -T template0 #{config['arunit2']['database']} )
# prepare hstore
version = %x( createdb --version ).strip.gsub(/(.*)(\d\.\d\.\d)$/, "\\2")
View
32 activerecord/lib/active_record/associations/collection_proxy.rb
@@ -42,11 +42,15 @@ def load_target
@association.load_target
end
+ # Returns +true+ if the association has been loaded, otherwise +false+.
+ #
+ # person.pets.loaded? # => false
+ # person.pets
+ # person.pets.loaded? # => true
def loaded?
@association.loaded?
end
- ##
# Works in two ways.
#
# *First:* Specify a subset of fields to be selected from the result set.
@@ -104,9 +108,8 @@ def select(select = nil, &block)
@association.select(select, &block)
end
- ##
# Finds an object in the collection responding to the +id+. Uses the same
- # rules as +ActiveRecord::Base.find+. Returns +ActiveRecord::RecordNotFound++
+ # rules as <tt>ActiveRecord::Base.find</tt>. Returns <tt>ActiveRecord::RecordNotFound</tt>
# error if the object can not be found.
#
# class Person < ActiveRecord::Base
@@ -135,7 +138,6 @@ def find(*args, &block)
@association.find(*args, &block)
end
- ##
# Returns the first record, or the first +n+ records, from the collection.
# If the collection is empty, the first form returns +nil+, and the second
# form returns an empty array.
@@ -166,7 +168,6 @@ def first(*args)
@association.first(*args)
end
- ##
# Returns the last record, or the last +n+ records, from the collection.
# If the collection is empty, the first form returns +nil+, and the second
# form returns an empty array.
@@ -197,7 +198,6 @@ def last(*args)
@association.last(*args)
end
- ##
# Returns a new object of the collection type that has been instantiated
# with +attributes+ and linked to this object, but have not yet been saved.
# You can pass an array of attributes hashes, this will return an array
@@ -226,7 +226,6 @@ def build(attributes = {}, &block)
@association.build(attributes, &block)
end
- ##
# Returns a new object of the collection type that has been instantiated with
# attributes, linked to this object and that has already been saved (if it
# passes the validations).
@@ -257,7 +256,6 @@ def create(attributes = {}, &block)
@association.create(attributes, &block)
end
- ##
# Like +create+, except that if the record is invalid, raises an exception.
#
# class Person
@@ -274,7 +272,6 @@ def create!(attributes = {}, &block)
@association.create!(attributes, &block)
end
- ##
# Add one or more records to the collection by setting their foreign keys
# to the association's primary key. Since << flattens its argument list and
# inserts each record, +push+ and +concat+ behave identically. Returns +self+
@@ -303,7 +300,6 @@ def concat(*records)
@association.concat(*records)
end
- ##
# Replace this collection with +other_array+. This will perform a diff
# and delete/add only records that have changed.
#
@@ -330,7 +326,6 @@ def replace(other_array)
@association.replace(other_array)
end
- ##
# Deletes all the records from the collection. For +has_many+ associations,
# the deletion is done according to the strategy specified by the <tt>:dependent</tt>
# option. Returns an array with the deleted records.
@@ -423,7 +418,6 @@ def delete_all
@association.delete_all
end
- ##
# Deletes the records of the collection directly from the database.
# This will _always_ remove the records ignoring the +:dependent+
# option.
@@ -450,7 +444,6 @@ def destroy_all
@association.destroy_all
end
- ##
# Deletes the +records+ supplied and removes them from the collection. For
# +has_many+ associations, the deletion is done according to the strategy
# specified by the <tt>:dependent</tt> option. Returns an array with the
@@ -514,7 +507,7 @@ def destroy_all
# Pet.find(1, 3)
# # => ActiveRecord::RecordNotFound: Couldn't find all Pets with IDs (1, 3)
#
- # If it is set to <tt>:delete_all</tt>, all the +records+ are deleted
+ # If it is set to <tt>:delete_all</tt>, all the +records+ are deleted
# *without* calling their +destroy+ method.
#
# class Person < ActiveRecord::Base
@@ -569,7 +562,6 @@ def delete(*records)
@association.delete(*records)
end
- ##
# Destroys the +records+ supplied and removes them from the collection.
# This method will _always_ remove record from the database ignoring
# the +:dependent+ option. Returns an array with the removed records.
@@ -642,7 +634,6 @@ def destroy(*records)
@association.destroy(*records)
end
- ##
# Specifies whether the records should be unique or not.
#
# class Person < ActiveRecord::Base
@@ -661,7 +652,6 @@ def uniq
@association.uniq
end
- ##
# Count all records using SQL.
#
# class Person < ActiveRecord::Base
@@ -679,7 +669,6 @@ def count(column_name = nil, options = {})
@association.count(column_name, options)
end
- ##
# Returns the size of the collection. If the collection hasn't been loaded,
# it executes a <tt>SELECT COUNT(*)</tt> query.
#
@@ -704,7 +693,6 @@ def size
@association.size
end
- ##
# Returns the size of the collection calling +size+ on the target.
# If the collection has been already loaded, +length+ and +size+ are
# equivalent.
@@ -728,7 +716,6 @@ def length
@association.length
end
- ##
# Returns +true+ if the collection is empty.
#
# class Person < ActiveRecord::Base
@@ -746,7 +733,6 @@ def empty?
@association.empty?
end
- ##
# Returns +true+ if the collection is not empty.
#
# class Person < ActiveRecord::Base
@@ -780,7 +766,6 @@ def any?(&block)
@association.any?(&block)
end
- ##
# Returns true if the collection has more than one record.
# Equivalent to <tt>collection.size > 1</tt>.
#
@@ -819,7 +804,6 @@ def many?(&block)
@association.many?(&block)
end
- ##
# Returns +true+ if the given object is present in the collection.
#
# class Person < ActiveRecord::Base
@@ -889,7 +873,7 @@ def ==(other)
end
# Returns a new array of objects from the collection. If the collection
- # hasn't been loaded, it fetches the records from the database.
+ # hasn't been loaded, it fetches the records from the database.
#
# class Person < ActiveRecord::Base
# has_many :pets
View
10 activerecord/lib/active_record/attribute_methods.rb
@@ -207,8 +207,8 @@ def clone_attribute_value(reader_method, attribute_name)
value
end
- def arel_attributes_with_values_for_create(pk_attribute_allowed)
- arel_attributes_with_values(attributes_for_create(pk_attribute_allowed))
+ def arel_attributes_with_values_for_create(attribute_names)
+ arel_attributes_with_values(attributes_for_create(attribute_names))
end
def arel_attributes_with_values_for_update(attribute_names)
@@ -242,9 +242,9 @@ def attributes_for_update(attribute_names)
# Filters out the primary keys, from the attribute names, when the primary
# key is to be generated (e.g. the id attribute has no value).
- def attributes_for_create(pk_attribute_allowed)
- @attributes.keys.select do |name|
- column_for_attribute(name) && (pk_attribute_allowed || !pk_attribute?(name))
+ def attributes_for_create(attribute_names)
+ attribute_names.select do |name|
+ column_for_attribute(name) && !(pk_attribute?(name) && id.nil?)
end
end
View
28 activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -7,7 +7,7 @@ module ActiveRecord
end
module AttributeMethods
- module Dirty
+ module Dirty # :nodoc:
extend ActiveSupport::Concern
include ActiveModel::Dirty
@@ -21,7 +21,7 @@ module Dirty
end
# Attempts to +save+ the record and clears changed attributes if successful.
- def save(*) #:nodoc:
+ def save(*)
if status = super
@previously_changed = changes
@changed_attributes.clear
@@ -30,15 +30,15 @@ def save(*) #:nodoc:
end
# Attempts to <tt>save!</tt> the record and clears changed attributes if successful.
- def save!(*) #:nodoc:
+ def save!(*)
super.tap do
@previously_changed = changes
@changed_attributes.clear
end
end
# <tt>reload</tt> the record and clears changed attributes.
- def reload(*) #:nodoc:
+ def reload(*)
super.tap do
@previously_changed.clear
@changed_attributes.clear
@@ -64,15 +64,29 @@ def write_attribute(attr, value)
end
def update(*)
+ partial_updates? ? super(keys_for_partial_update) : super
+ end
+
+ def create(*)
if partial_updates?
- # Serialized attributes should always be written in case they've been
- # changed in place.
- super(changed | (attributes.keys & self.class.serialized_attributes.keys))
+ keys = keys_for_partial_update
+
+ # This is an extremely bloody annoying necessity to work around mysql being crap.
+ # See test_mysql_text_not_null_defaults
+ keys.concat self.class.columns.select(&:explicit_default?).map(&:name)
+
+ super keys
else
super
end
end
+ # Serialized attributes should always be written in case they've been
+ # changed in place.
+ def keys_for_partial_update
+ changed | (attributes.keys & self.class.serialized_attributes.keys)
+ end
+
def _field_changed?(attr, old, value)
if column = column_for_attribute(attr)
if column.number? && (changes_from_nil_to_empty_string?(column, old, value) ||
View
26 activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -5,28 +5,29 @@ module AttributeMethods
module PrimaryKey
extend ActiveSupport::Concern
- # Returns this record's primary key value wrapped in an Array if one is available
+ # Returns this record's primary key value wrapped in an Array if one is
+ # available.
def to_key
key = self.id
[key] if key
end
- # Returns the primary key value
+ # Returns the primary key value.
def id
read_attribute(<