<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -17,15 +17,15 @@ module Ardes
         options.assert_valid_keys(:only, :except)
         raise ArgumentError, &quot;you can only specify either :except or :only, not both&quot; if options[:only] &amp;&amp; options[:except]
         mixin = self.dup
-        actions_to_remove(options).each {|a| mixin.remove_action(a) }
+        action_methods_to_remove(options).each {|a| mixin.remove_action_method(a) }
         controller.send :include, mixin
       end
       
-      def remove_action(action)
+      def remove_action_method(action)
         undef_method action
       end
       
-      def actions_to_remove(options = {})
+      def action_methods_to_remove(options = {})
         if options[:only]
           instance_methods - options[:only].map(&amp;:to_s)
         elsif options[:except]</diff>
      <filename>lib/ardes/resources_controller/include_actions.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>144de668978ff5345f04c1842815b115dc055789</id>
    </parent>
  </parents>
  <author>
    <name>Ian White</name>
    <email>ian.w.white@gmail.com</email>
  </author>
  <url>http://github.com/ianwhite/resources_controller/commit/ab631bcfcbbc0c4e38296e314c20658c6e383c30</url>
  <id>ab631bcfcbbc0c4e38296e314c20658c6e383c30</id>
  <committed-date>2008-10-09T22:02:20-07:00</committed-date>
  <authored-date>2008-10-09T22:02:20-07:00</authored-date>
  <message>Changed some methods names because of a conflict</message>
  <tree>06f4a0b71963d9f0c0aca0806cd1e4bb83ab8174</tree>
  <committer>
    <name>Ian White</name>
    <email>ian.w.white@gmail.com</email>
  </committer>
</commit>
