lib/adeia/controller_resource.rb in adeia-0.11.0 vs lib/adeia/controller_resource.rb in adeia-0.11.2

@@ -36,11 +36,11 @@
       @controller.store_location
     end
 
     def load_resource
       begin
-        @resource = resource_class.find(@controller.params.fetch(:id))
+        @resource ||= resource_class.find(@controller.params.fetch(:id))
         @controller.instance_variable_set("@#{resource_name}", @resource)
       rescue KeyError
         raise MissingParams.new(:id)
       end
     end
@@ -79,13 +79,13 @@
 
     private
 
     def resource_class
       begin
-        @controller.controller_path.classify.constantize
+        @controller_name.classify.constantize
       rescue NameError
-        @controller.controller_name.classify.constantize
+        @controller_name.classify.demodulize.constantize
       end
     end
 
     def resource_name
       resource_class.model_name.element
@@ -116,6 +116,6 @@
       end
     end
 
   end
 
-end
\ No newline at end of file
+end