Disable watch to prevent race condition between threads calling site.process

lib/jekyll-admin/server/collection.rb

@@ -29,8 +29,7 @@ class Server < Sinatra::Base
         end
 
         write_file(write_path, document_body)
-        updated_document = collection.docs.find { |d| d.path == write_path }
-        render_404 if updated_document.nil?
+        ensure_document
         json updated_document.to_api(:include_content => true)
       end
 
@@ -76,7 +75,10 @@ def relative_document_path
       end
 
       def document
-        collection.docs.find { |d| d.path == document_path }
+        collection.docs.find { |d| d.path == document_path } ||
+          Jekyll::Document.new(write_path, {
+            :collection => collection, :site => site,
+          }).tap(&:read)
       end
 
       def directory_docs

lib/jekyll-admin/server/page.rb

@@ -20,8 +20,7 @@ class Server < Sinatra::Base
         end
 
         write_file(write_path, page_body)
-        updated_page = pages.find { |p| p.path == write_path }
-        render_404 if updated_page.nil?
+        ensure_page
         json updated_page.to_api(:include_content => true)
       end
 
@@ -85,7 +84,9 @@ def relative_page_path
       end
 
       def page
-        site.pages.find { |p| sanitized_path(p.path) == page_path }
+        Jekyll::Page.new(
+          site, site.source, File.dirname(page_path), File.basename(page_path)
+        )
       end
 
       def directory_path

lib/jekyll-admin/server/static_file.rb

@@ -52,8 +52,13 @@ def static_files
 
       def file_list_dir(path) end
 
+      # TODO: StaticFile.new needs to be taught about the collection the
+      # file belongs to, if it belongs to a collection.
       def static_file
-        static_files.find { |f| f.path == static_file_path }
+        static_files.find { |f| f.path == static_file_path } ||
+          Jekyll::StaticFile.new(
+            site, site.source, File.dirname(static_file_path), File.basename(static_file_path)
+          )
       end
 
       def static_files_for_path