vendor/plugins/aaa/test/include_into_test.rb
@@ -38,7 +38,7 @@
<li><a href="#"> </a></li>
</ul>
<ul id="attributes">
- <% if @article && controller.controller_name == 'articles' && controller.action_name == 'edit' %>
+ <% if @article && controller.controller_name == 'articles' && controller.action_name == 'edit' -%>
<li><label for="search">Revision:</label></li>
<li>
<select name="filter" id="revisionnum">
@@ -46,7 +46,7 @@
<%= options_from_collection_for_select @article.versions.reverse, :version, :version, params[:version].to_i %>
</select>
</li>
- <% end %>
+ <% end -%>
<% if controller.controller_name == 'comments' && controller.action_name == 'index' -%>
<li><label for="comments_view">Show comments:</label></li>
<li>
@@ -54,7 +54,7 @@
<%= options_for_select ['All', 'Unapproved', 'Approved'], params[:filter].to_s.humanize %>
</select>
</li>
- <% end %>
+ <% end -%>
</ul>
</div>
-<% end unless @article.new_record? && @article.comments.empty? -%>
\ No newline at end of file
+<% end unless @article && @article.new_record? && @article.comments.size == 0 -%>
\ No newline at end of file
app/views/admin/articles/_page_nav.rhtml
@@ -3,7 +3,7 @@
Module.class_eval do
# A hash that maps Class names to an array of Modules to mix in when the class is instantiated.
- @@class_mixins = {}
+ @@class_mixins = {} unless defined?(@@class_mixins)
mattr_reader :class_mixins
# Specifies that this module should be included into the given classes when they are instantiated.
@@ -11,18 +11,46 @@ Module.class_eval do
# module FooMethods
# include_into "Foo", "Bar"
# end
+ #
+ # You can also specify a hash to have your module's methods alias_method_chained to the target
+ # class' methods.
+ #
+ # module FooMethods
+ # include_into "Foo", :method => :feature
+ # end
+ #
+ # This will alias Foo#method to the newly included FooMethods#method_with_feature. The former
+ # method Foo#method will continue to be available as Foo#method_without_feature.
+ #
def include_into(*klasses)
klasses.flatten!
+ aliases = klasses.last.is_a?(Hash) ? klasses.pop : {}
klasses.each do |klass|
- (@@class_mixins[klass] ||= []) << name.to_s
+ (@@class_mixins[klass] ||= []) << [name.to_s, aliases]
@@class_mixins[klass].uniq!
end
end
-
+
# add any class mixins that have been registered for this class
def auto_include!
- mixins = @@class_mixins[name]
- send(:include, *mixins.collect { |name| name.constantize }) if mixins
+ if mixins = @@class_mixins[name]
+ mixins.each do |name, aliases|
+ include name.constantize
+ aliases.each { |args| alias_chain *args }
+ end
+ end
+ end
+
+ def alias_chain(target, feature)
+ (class << self; self end).class_eval <<-EOC, __FILE__, __LINE__
+ def method_added_with_#{target}_#{feature}(method)
+ if method == :#{target} && !method_defined?(:#{target}_without_#{feature})
+ alias_method_chain :#{target}, :#{feature}
+ end
+ method_added_without_#{target}_#{feature}(method)
+ end
+ alias_method_chain :method_added, :#{target}_#{feature}
+ EOC
end
end
vendor/plugins/aaa/init.rb
1cd5005248cd280b894971da122345a1616d280f
b9b07612fbb61a73530bd0920ef62ddbddfb2aa7
rick
technoweenie@gmail.com
http://github.com/francois/mephisto/commit/2772ec18227b04b3cb618748a2900a7b93b84d94
2772ec18227b04b3cb618748a2900a7b93b84d94
2008-02-13T10:12:12-08:00
2008-02-13T10:12:12-08:00
Merge branch 'rel-0.8'
4381c9dcb98d67e4ad78416831a93b6afdb80cdc
rick
technoweenie@gmail.com