Better name for helper

app/helpers/administrate/application_helper.rb

@@ -35,7 +35,7 @@ def model_from_resource(resource_name)
     #   - Symbol: name of a resource class
     #   - Class: resource class
     #   - ActiveRecord::Base: resource instance
-    def administrate_valid_action?(target, action_name)
+    def accessible_action?(target, action_name)
       target = target.to_sym if target.is_a?(String)
       target_class_or_class_name =
         target.is_a?(ActiveRecord::Base) ? target.class : target

app/views/administrate/application/_collection.html.erb

@@ -59,13 +59,13 @@ to display a collection of resources in an HTML table.
   <tbody>
     <% resources.each do |resource| %>
       <tr class="js-table-row"
-          <% if administrate_valid_action?(resource, :show) %>
+          <% if accessible_action?(resource, :show) %>
             <%= %(tabindex=0 role=link data-url=#{polymorphic_path([namespace, resource])}) %>
           <% end %>
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
-            <% if administrate_valid_action?(resource, :show) -%>
+            <% if accessible_action?(resource, :show) -%>
               <a href="<%= polymorphic_path([namespace, resource]) -%>"
                  tabindex="-1"
                  class="action-show"

app/views/administrate/application/_collection_item_actions.html.erb

@@ -3,7 +3,7 @@
     t("administrate.actions.edit"),
     [:edit, namespace, resource],
     class: "action-edit",
-  ) if administrate_valid_action?(resource, :edit) %></td>
+  ) if accessible_action?(resource, :edit) %></td>
 <% end %>
 
 <% if existing_action?(:destroy, collection_presenter.resource_name) %>
@@ -13,5 +13,5 @@
     class: "text-color-red",
     method: :delete,
     data: { confirm: t("administrate.actions.confirm") }
-  ) if administrate_valid_action?(resource, :destroy) %></td>
+  ) if accessible_action?(resource, :destroy) %></td>
 <% end %>

app/views/administrate/application/_index_header.html.erb

@@ -23,6 +23,6 @@
       ),
       [:new, namespace, page.resource_path.to_sym],
       class: "button",
-    ) if administrate_valid_action?(new_resource, :new) %>
+    ) if accessible_action?(new_resource, :new) %>
   </div>
 </header>

app/views/administrate/application/_navigation.html.erb

@@ -15,6 +15,6 @@ as defined by the routes in the `admin/` namespace
       display_resource_name(resource),
       resource_index_route(resource),
       class: "navigation__link navigation__link--#{nav_link_state(resource)}"
-    ) if administrate_valid_action?(resource.singularize, :index) %>
+    ) if accessible_action?(resource.singularize, :index) %>
   <% end %>
 </nav>

app/views/administrate/application/edit.html.erb

@@ -27,7 +27,7 @@ It displays a header, and renders the `_form` partial to do the heavy lifting.
       t("administrate.actions.show_resource", name: page.page_title),
       [namespace, page.resource],
       class: "button",
-    ) if administrate_valid_action?(page.resource, :show) %>
+    ) if accessible_action?(page.resource, :show) %>
   </div>
 </header>
 

app/views/administrate/application/show.html.erb

@@ -28,15 +28,15 @@ as well as a link to its edit page.
       t("administrate.actions.edit_resource", name: page.page_title),
       [:edit, namespace, page.resource],
       class: "button",
-    ) if administrate_valid_action?(page.resource, :edit) %>
+    ) if accessible_action?(page.resource, :edit) %>
 
     <%= link_to(
       t("administrate.actions.destroy"),
       [namespace, page.resource],
       class: "button button--danger",
       method: :delete,
       data: { confirm: t("administrate.actions.confirm") }
-    ) if administrate_valid_action?(page.resource, :destroy) %>
+    ) if accessible_action?(page.resource, :destroy) %>
   </div>
 </header>
 

app/views/fields/belongs_to/_index.html.erb

@@ -16,7 +16,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if administrate_valid_action?(field.data, :show) %>
+  <% if accessible_action?(field.data, :show) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

app/views/fields/belongs_to/_show.html.erb

@@ -16,7 +16,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if administrate_valid_action?(field.data, :show) %>
+  <% if accessible_action?(field.data, :show) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

app/views/fields/has_one/_index.html.erb

@@ -17,7 +17,7 @@ By default, the relationship is rendered as a link to the associated object.
 
 <% if field.linkable? %>
   <%= link_to_if(
-    administrate_valid_action?(field.data, :show),
+    accessible_action?(field.data, :show),
     field.display_associated_resource,
     [namespace, field.data],
   ) %>

app/views/fields/has_one/_show.html.erb

@@ -19,7 +19,7 @@ All show page attributes of has_one relationship would be rendered
   <fieldset class="attribute--nested">
     <legend>
       <%= link_to_if(
-        administrate_valid_action?(field.data, :show),
+        accessible_action?(field.data, :show),
         field.display_associated_resource,
         [namespace, field.data],
       ) %>

app/views/fields/polymorphic/_index.html.erb

@@ -17,7 +17,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if administrate_valid_action?(field.data, :show) %>
+  <% if accessible_action?(field.data, :show) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data]

app/views/fields/polymorphic/_show.html.erb

@@ -17,7 +17,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if administrate_valid_action?(field.data, :show) %>
+  <% if accessible_action?(field.data, :show) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

lib/administrate.rb

@@ -24,7 +24,7 @@ def self.warn_of_deprecated_option(name)
   def self.warn_of_deprecated_authorization_method(method)
     ActiveSupport::Deprecation.warn(
       "The method `#{method}` is deprecated. " +
-      "Please use `administrate_valid_action?` instead, " +
+      "Please use `accessible_action?` instead, " +
       "or see the documentation for other options.",
     )
   end

spec/administrate/views/fields/belongs_to/_index_spec.rb

@@ -32,15 +32,15 @@
   context "if associated resource has a show route" do
     context "and the user has permission to access it" do
       it "displays link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(true)
+        allow(view).to receive(:accessible_action?).and_return(true)
         render_belongs_to_index
         expect(rendered.strip).to include(link)
       end
     end
 
     context "and the user does not have permission to access it" do
       it "hides link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(false)
+        allow(view).to receive(:accessible_action?).and_return(false)
         render_belongs_to_index
         expect(rendered.strip).to_not include(link)
       end
@@ -49,7 +49,7 @@
 
   context "if associated resource has no show route" do
     it "hides link" do
-      allow(view).to receive(:administrate_valid_action?).and_return(false)
+      allow(view).to receive(:accessible_action?).and_return(false)
       render_belongs_to_index
       expect(rendered.strip).to_not include(link)
     end

spec/administrate/views/fields/belongs_to/_show_spec.rb

@@ -17,15 +17,15 @@
   context "if associated resource has a show route" do
     context "and the user has permission to access it" do
       it "displays link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(true)
+        allow(view).to receive(:accessible_action?).and_return(true)
         render_belongs_to_show
         expect(rendered.strip).to include(link)
       end
     end
 
     context "and the user does not have permission to access it" do
       it "hides link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(false)
+        allow(view).to receive(:accessible_action?).and_return(false)
         render_belongs_to_show
         expect(rendered.strip).to_not include(link)
       end
@@ -34,7 +34,7 @@
 
   context "if associated resource has no show route" do
     it "hides link" do
-      allow(view).to receive(:administrate_valid_action?).and_return(false)
+      allow(view).to receive(:accessible_action?).and_return(false)
       render_belongs_to_show
       expect(rendered.strip).to_not include(link)
     end

spec/administrate/views/fields/has_one/_index_spec.rb

@@ -22,7 +22,7 @@
     end
 
     it "displays nothing" do
-      allow(view).to receive(:administrate_valid_action?).and_return(true)
+      allow(view).to receive(:accessible_action?).and_return(true)
       render_has_one_index
       expect(rendered.strip).to eq("")
     end
@@ -31,15 +31,15 @@
   context "if associated resource has a show route" do
     context "and the user has permission to access it" do
       it "displays link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(true)
+        allow(view).to receive(:accessible_action?).and_return(true)
         render_has_one_index
         expect(rendered.strip).to include(link)
       end
     end
 
     context "and the user does not have permission to access it" do
       it "hides link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(false)
+        allow(view).to receive(:accessible_action?).and_return(false)
         render_has_one_index
         expect(rendered.strip).to_not include(link)
       end
@@ -48,7 +48,7 @@
 
   context "if associated resource has no show route" do
     it "hides link" do
-      allow(view).to receive(:administrate_valid_action?).and_return(false)
+      allow(view).to receive(:accessible_action?).and_return(false)
       render_has_one_index
       expect(rendered.strip).to_not include(link)
     end

spec/administrate/views/fields/has_one/_show_spec.rb

@@ -3,7 +3,7 @@
 
 describe "fields/has_one/_show", type: :view do
   before do
-    allow(view).to receive(:administrate_valid_action?).and_return(true)
+    allow(view).to receive(:accessible_action?).and_return(true)
   end
 
   context "without an associated record" do
@@ -111,7 +111,7 @@
 
     context "when linking the record is not allowed" do
       it "displays the record without a link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(false)
+        allow(view).to receive(:accessible_action?).and_return(false)
         product = create(:product)
         nested_show = instance_double(
           "Administrate::Page::Show",

spec/administrate/views/fields/polymorphic/_index_spec.rb

@@ -29,15 +29,15 @@
   context "if associated resource has a show route" do
     context "and the user has permission to access it" do
       it "displays link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(true)
+        allow(view).to receive(:accessible_action?).and_return(true)
         render_polymorphic_index
         expect(rendered.strip).to include(link)
       end
     end
 
     context "and the user does not have permission to access it" do
       it "hides link" do
-        allow(view).to receive(:administrate_valid_action?).and_return(false)
+        allow(view).to receive(:accessible_action?).and_return(false)
         render_polymorphic_index
         expect(rendered.strip).to_not include(link)
       end
@@ -46,7 +46,7 @@
 
   context "if associated resource has no show route" do
     it "hides link" do
-      allow(view).to receive(:administrate_valid_action?).and_return(false)
+      allow(view).to receive(:accessible_action?).and_return(false)
       render_polymorphic_index
       expect(rendered.strip).to_not include(link)
     end

spec/administrate/views/fields/polymorphic/_show_spec.rb

@@ -31,7 +31,7 @@
         attribute: "product",
       )
 
-      allow(view).to receive(:administrate_valid_action?).and_return(true)
+      allow(view).to receive(:accessible_action?).and_return(true)
 
       render(
         partial: "fields/polymorphic/show",

spec/example_app/app/views/admin/customers/_index_header.html.erb

@@ -28,6 +28,6 @@
       ),
       [:new, namespace, page.resource_path.to_sym],
       class: "button",
-    ) if administrate_valid_action?(new_resource, :new) %>
+    ) if accessible_action?(new_resource, :new) %>
   </div>
 </header>

spec/helpers/administrate/application_helper_spec.rb

@@ -102,14 +102,14 @@
     end
   end
 
-  describe "#administrate_valid_action?" do
+  describe "#accessible_action?" do
     context "when given a string target" do
       it "checks the class it names with `existing_action?` and `authorized_action?`" do
         class MyResource; end
         ctx = double(existing_action?: true, authorized_action?: true)
         ctx.extend(Administrate::ApplicationHelper)
 
-        ctx.administrate_valid_action?("my_resource", "foo")
+        ctx.accessible_action?("my_resource", "foo")
 
         expect(ctx).to(
           have_received(:existing_action?).with("foo", :my_resource),
@@ -128,7 +128,7 @@ class MyResource; end
         ctx = double(existing_action?: true, authorized_action?: true)
         ctx.extend(Administrate::ApplicationHelper)
 
-        ctx.administrate_valid_action?(:my_resource, "foo")
+        ctx.accessible_action?(:my_resource, "foo")
 
         expect(ctx).to(
           have_received(:existing_action?).with("foo", :my_resource),
@@ -147,7 +147,7 @@ class MyResource; end
         ctx = double(existing_action?: true, authorized_action?: true)
         ctx.extend(Administrate::ApplicationHelper)
 
-        ctx.administrate_valid_action?(MyResource, "foo")
+        ctx.accessible_action?(MyResource, "foo")
 
         expect(ctx).to have_received(:existing_action?).with("foo", MyResource)
         expect(ctx).to(
@@ -164,7 +164,7 @@ class MyResource; end
         ctx.extend(Administrate::ApplicationHelper)
 
         object = Product.new
-        ctx.administrate_valid_action?(object, "foo")
+        ctx.accessible_action?(object, "foo")
 
         expect(ctx).to have_received(:existing_action?).with("foo", Product)
         expect(ctx).to have_received(:authorized_action?).with("foo", object)
@@ -178,7 +178,7 @@ class MyResource; end
         ctx.extend(Administrate::ApplicationHelper)
 
         object = MyResource.new
-        ctx.administrate_valid_action?(object, "foo")
+        ctx.accessible_action?(object, "foo")
 
         expect(ctx).to have_received(:existing_action?).with("foo", MyResource)
         expect(ctx).to have_received(:authorized_action?).with("foo", object)