lib/active_admin/resource/routes.rb in activeadmin-0.6.6 vs lib/active_admin/resource/routes.rb in activeadmin-1.0.0.pre1

@@ -1,29 +1,33 @@
 module ActiveAdmin
   class Resource
     module Routes
-      # @params params [Hash] of params: {study_id: 3}
+      # @param params [Hash] of params: { study_id: 3 }
       # @return [String] the path to this resource collection page
       # @example "/admin/posts"
       def route_collection_path(params = {})
         RouteBuilder.new(self).collection_path(params)
       end
-      
+
       # @param resource [ActiveRecord::Base] the instance we want the path of
       # @return [String] the path to this resource collection page
       # @example "/admin/posts/1"
       def route_instance_path(resource)
         RouteBuilder.new(self).instance_path(resource)
       end
 
+      def route_edit_instance_path(resource)
+        RouteBuilder.new(self).edit_instance_path(resource)
+      end
+
       # Returns the routes prefix for this config
       def route_prefix
         namespace.module_name.try(:underscore)
       end
 
       def route_uncountable?
-        config = controller.resources_configuration[:self]
+        config = resources_configuration[:self]
 
         config[:route_collection_name] == config[:route_instance_name]
       end
 
       private
@@ -33,33 +37,45 @@
           @resource = resource
         end
 
         def collection_path(params)
           route_name = route_name(
-            resource.controller.resources_configuration[:self][:route_collection_name],
-            (resource.route_uncountable? ? 'index_path' : 'path')
+            resource.resources_configuration[:self][:route_collection_name],
+            suffix: (resource.route_uncountable? ? "index_path" : "path")
           )
 
-          routes.send(route_name, *route_collection_params(params))
+          routes.public_send route_name, *route_collection_params(params)
         end
 
         # @return [String] the path to this resource collection page
         # @param instance [ActiveRecord::Base] the instance we want the path of
         # @example "/admin/posts/1"
         def instance_path(instance)
-          route_name = route_name(resource.controller.resources_configuration[:self][:route_instance_name])
+          route_name = route_name(resource.resources_configuration[:self][:route_instance_name])
 
-          routes.send(route_name, *route_instance_params(instance))
+          routes.public_send route_name, *route_instance_params(instance)
         end
 
+        # @return [String] the path to the edit page of this resource
+        # @param instance [ActiveRecord::Base] the instance we want the path of
+        # @example "/admin/posts/1/edit"
+        def edit_instance_path(instance)
+          path = resource.resources_configuration[:self][:route_instance_name]
+          route_name = route_name(path, action: :edit)
+
+          routes.public_send route_name, *route_instance_params(instance)
+        end
+
         private
 
         attr_reader :resource
 
-        def route_name(resource_path_name, suffix = 'path')
+        def route_name(resource_path_name, options = {})
+          suffix = options[:suffix] || "path"
           route = []
 
+          route << options[:action]           # "edit" or "new"
           route << resource.route_prefix      # "admin"
           route << belongs_to_name if nested? # "category"
           route << resource_path_name         # "posts" or "post"
           route << suffix                     # "path" or "index path"
 
@@ -68,11 +84,11 @@
 
 
         # @return params to pass to instance path
         def route_instance_params(instance)
           if nested?
-            [instance.send(belongs_to_name).to_param, instance.to_param]
+            [instance.public_send(belongs_to_name).to_param, instance.to_param]
           else
             instance.to_param
           end
         end
 
@@ -89,10 +105,10 @@
         def belongs_to_name
           resource.belongs_to_config.target.resource_name.singular if nested?
         end
 
         def routes
-          Rails.application.routes.url_helpers
+          Helpers::Routes
         end
       end
     end
   end
 end