aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/caching.rb8
-rw-r--r--activerecord/CHANGELOG12
-rw-r--r--activesupport/CHANGELOG2
3 files changed, 18 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index cdfcafa3d7..87d0558284 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -37,7 +37,7 @@ module ActionController #:nodoc:
# 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
- def self.append_features(base)
+ def self.append_features(base) #:nodoc:
super
base.extend(ClassMethods)
base.class_eval do
@@ -107,7 +107,7 @@ module ActionController #:nodoc:
# "david.somewhere.com/lists/show/1". This allows the cacher to differentiate between "david.somewhere.com/lists/" and
# "jamis.somewhere.com/lists/" -- which is a helpful way of assisting the subdomain-as-account-key pattern.
module Actions
- def self.append_features(base)
+ def self.append_features(base) #:nodoc:
super
base.extend(ClassMethods)
base.send(:attr_accessor, :rendered_action_cache)
@@ -123,7 +123,7 @@ module ActionController #:nodoc:
expire_fragment(url_for(options).split("://").last)
end
- class ActionCacheFilter
+ class ActionCacheFilter #:nodoc:
def initialize(*actions)
@actions = actions
end
@@ -170,7 +170,7 @@ module ActionController #:nodoc:
#
# TO BE WRITTEN...
module Fragments
- def self.append_features(base)
+ def self.append_features(base) #:nodoc:
super
base.class_eval do
@@cache_store = MemoryStore.new
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 817caebc8f..a6289ce2c2 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,17 @@
*SVN*
+* Added that Observers can use the observes class method instead of overwriting self.observed_class().
+
+ Before:
+ class ListSweeper < ActiveRecord::Base
+ def self.observed_class() [ List, Item ]
+ end
+
+ After:
+ class ListSweeper < ActiveRecord::Base
+ observes List, Item
+ end
+
* Fixed that conditions in has_many and has_and_belongs_to_many should be interpolated just like the finder_sql is
* Fixed Base#update_attribute to be indifferent to whether a string or symbol is used to describe the name
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index f16ab7941f..391447140d 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1 +1,3 @@
+* Added that Inflector now accepts Symbols and Classes by calling .to_s on the word supplied
+
* Added time unit extensions to Fixnum that'll return the period in seconds, like 2.days + 4.hours. \ No newline at end of file