dhh · May 17, 2025 04:58 · Apr 16, 2014 · Apr 7, 2014 · Apr 7, 2014 · Apr 7, 2014
diff --git a/documents.rb b/documents.rb
@@ -1,10 +1,12 @@
 # config/routes.rb
 resources :documents do
-  resources :versions, controller: "documents/versions" do
-    post :restore, on: :member
-  end
+  scope module: 'documents' do
+    resources :versions do
+      post :restore, on: :member
+    end
 
-  resource :lock, controller: "documents/locks"
+    resource :lock
+  end
 end
 
 

diff --git a/documents.rb b/documents.rb
@@ -35,8 +35,6 @@ module Documents
   class LocksController < ApplicationController
     include DocumentScoped, ProjectScoped
 
-    before_action :set_document
-
     def update
       @document.lock!(current_person)
     end

diff --git a/documents.rb b/documents.rb
@@ -17,7 +17,7 @@ def index
   end
 
   def show
-    @document = @project.documents.trashed_or_not.find_by_id(params[:id])
+    @document = @project.documents.find(params[:id])
   end
 
   def new
@@ -81,6 +81,6 @@ module DocumentScoped
 
   private
     def set_document
-      @document = @project.documents.trashed_or_not.find_by_id(params[:document_id])
+      @document = @project.documents.find(params[:document_id])
     end
 end
diff --git a/documents.rb b/documents.rb
@@ -1,3 +1,13 @@
+# config/routes.rb
+resources :documents do
+  resources :versions, controller: "documents/versions" do
+    post :restore, on: :member
+  end
+
+  resource :lock, controller: "documents/locks"
+end
+
+
 # app/controllers/documents_controller.rb
 class DocumentsController < ApplicationController
   include ProjectScoped

diff --git a/documents.rb b/documents.rb
@@ -1,5 +1,7 @@
 # app/controllers/documents_controller.rb
 class DocumentsController < ApplicationController
+  include ProjectScoped
+
   def index
     @documents = @project.documents
   end
@@ -21,6 +23,8 @@ def create
 # app/controllers/documents/locks_controller.rb
 module Documents
   class LocksController < ApplicationController
+    include DocumentScoped, ProjectScoped
+
     before_action :set_document
 
     def update
@@ -30,19 +34,16 @@ def update
     def destroy
       @document.unlock!(current_person)
     end
-
-    private
-      def set_document
-        @document = @project.documents.trashed_or_not.find(params[:document_id])
-      end
   end
 end
 
 
 # app/controllers/documents/versions_controller.rb
 module Documents
   class VersionsController < ApplicationController
-    before_action :set_document, :set_version
+    include DocumentScoped, ProjectScoped
+
+    before_action :set_version
 
     def show
     end
@@ -53,12 +54,23 @@ def restore
 
 
     private
-      def set_document
-        @document = @project.documents.trashed_or_not.find_by_id(params[:document_id])
-      end
-
       def set_version
         @version = @document.versions.find(params[:id])
       end
   end
+end
+
+
+# app/controllers/concerns/document_scoped.rb
+module DocumentScoped
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_document
+  end
+
+  private
+    def set_document
+      @document = @project.documents.trashed_or_not.find_by_id(params[:document_id])
+    end
 end
diff --git a/documents.rb b/documents.rb
@@ -0,0 +1,64 @@
+# app/controllers/documents_controller.rb
+class DocumentsController < ApplicationController
+  def index
+    @documents = @project.documents
+  end
+
+  def show
+    @document = @project.documents.trashed_or_not.find_by_id(params[:id])
+  end
+
+  def new
+    @document = Document.new
+  end
+
+  def create
+    @document = @project.documents.create! document_params.merge(creator: current_person)
+  end
+end
+
+
+# app/controllers/documents/locks_controller.rb
+module Documents
+  class LocksController < ApplicationController
+    before_action :set_document
+
+    def update
+      @document.lock!(current_person)
+    end
+
+    def destroy
+      @document.unlock!(current_person)
+    end
+
+    private
+      def set_document
+        @document = @project.documents.trashed_or_not.find(params[:document_id])
+      end
+  end
+end
+
+
+# app/controllers/documents/versions_controller.rb
+module Documents
+  class VersionsController < ApplicationController
+    before_action :set_document, :set_version
+
+    def show
+    end
+
+    def restore
+      @document.restore!(@version)
+    end
+
+
+    private
+      def set_document
+        @document = @project.documents.trashed_or_not.find_by_id(params[:document_id])
+      end
+
+      def set_version
+        @version = @document.versions.find(params[:id])
+      end
+  end
+end