Merge pull request #320 from jekyll/prevent-race-condition-on-change

When updating a document or page, read item by itself

Author: mertkahyaoglu

lib/jekyll-admin.rb

@@ -39,6 +39,8 @@ def self.site
 
 # Monkey Patches
 require_relative "./jekyll/commands/serve"
+require_relative "./jekyll/commands/build"
+
 [Jekyll::Page, Jekyll::Document, Jekyll::StaticFile, Jekyll::Collection].each do |klass|
   klass.include JekyllAdmin::APIable
   klass.include JekyllAdmin::URLable

lib/jekyll/commands/build.rb

@@ -0,0 +1,14 @@
+module Jekyll
+  module Commands
+    class Build < Command
+      class << self
+        alias_method :original_build, :build
+
+        def build(site, options)
+          options["watch"] = false
+          original_build(site, options)
+        end
+      end
+    end
+  end
+end

script/test-server

@@ -5,4 +5,4 @@ set -e
 script/branding
 
 cd ./spec/fixtures/site || exit
-RACK_ENV=development bundle exec jekyll serve --verbose
+RACK_ENV=development bundle exec jekyll serve --verbose --watch

spec/jekyll-admin/integration_spec.rb

@@ -1,7 +1,7 @@
 describe "integration" do
   let(:source) { fixture_path("site") }
   let(:dest) { File.join(source, "_site") }
-  let(:args) { ["--detach", "--source", source, "--destination", dest] }
+  let(:args) { ["--detach", "--watch", "--source", source, "--destination", dest] }
   let(:start_command) { %w(bundle exec jekyll serve).concat(args) }
   let(:stop_command) { ["pkill", "-f", "jekyll"] }
   let(:server) { "http://localhost:4000" }
@@ -44,4 +44,21 @@
       expect(response.body).to match("collections_api")
     end
   end
+
+  context "watching" do
+    it "Jekyll isn't watching", :skip => Gem.win_platform? do
+      File.open(File.join(source, "page.md"), "a") do |f|
+        f.puts "peek-a-boo"
+      end
+      content = File.read(File.join(source, "page.md"))
+      output = File.read(File.join(dest, "page.html"))
+
+      expect(content).to include("peek-a-boo")
+      expect(output).not_to include("peek-a-boo")
+
+      File.open(File.join(source, "page.md"), "w+") do |f|
+        f.write "---\nfoo: bar\n---\n\n# Test Page\n"
+      end
+    end
+  end
 end