From 3b0a0ac2bfad87b0dd4d967d93dd9d06d4c41931 Mon Sep 17 00:00:00 2001 From: mertkahyaoglu Date: Fri, 23 Jun 2017 21:54:22 +0300 Subject: [PATCH 1/5] do not call site.process twice --- lib/jekyll-admin.rb | 2 +- lib/jekyll-admin/file_helper.rb | 19 +++++++++++++++++-- lib/jekyll-admin/server/collection.rb | 2 +- lib/jekyll-admin/server/data.rb | 2 +- lib/jekyll-admin/server/page.rb | 2 +- lib/jekyll-admin/server/static_file.rb | 2 +- lib/jekyll/commands/build.rb | 14 -------------- lib/jekyll/commands/serve.rb | 2 -- 8 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 lib/jekyll/commands/build.rb diff --git a/lib/jekyll-admin.rb b/lib/jekyll-admin.rb index 172f00a64..85c932e84 100644 --- a/lib/jekyll-admin.rb +++ b/lib/jekyll-admin.rb @@ -39,7 +39,7 @@ def self.site # Monkey Patches require_relative "./jekyll/commands/serve" -require_relative "./jekyll/commands/build" +# require_relative "./jekyll/commands/build" [Jekyll::Page, Jekyll::Document, Jekyll::StaticFile, Jekyll::Collection].each do |klass| klass.include JekyllAdmin::APIable diff --git a/lib/jekyll-admin/file_helper.rb b/lib/jekyll-admin/file_helper.rb index 867dfac6d..ff47a1a23 100644 --- a/lib/jekyll-admin/file_helper.rb +++ b/lib/jekyll-admin/file_helper.rb @@ -21,14 +21,29 @@ def write_file(path, content) File.open(path, "wb") do |file| file.write(content) end - site.process + if ENV["RACK_ENV"] + Jekyll.logger.debug "PROCESSING" + site.process + else + site.read + end end # Delete the file at the given path def delete_file(path) Jekyll.logger.debug "DELETING:", path FileUtils.rm_f sanitized_path(path) - site.process + if ENV["RACK_ENV"] + Jekyll.logger.debug "PROCESSING" + site.process + else + site.read + end + end + + def delete_file_without_process(path) + Jekyll.logger.debug "DELETING:", path + FileUtils.rm_f sanitized_path(path) end private diff --git a/lib/jekyll-admin/server/collection.rb b/lib/jekyll-admin/server/collection.rb index d6afaa974..667405808 100644 --- a/lib/jekyll-admin/server/collection.rb +++ b/lib/jekyll-admin/server/collection.rb @@ -25,7 +25,7 @@ class Server < Sinatra::Base if renamed? ensure_requested_file - delete_file path + delete_file_without_process path end write_file write_path, document_body diff --git a/lib/jekyll-admin/server/data.rb b/lib/jekyll-admin/server/data.rb index 0e4bed1da..fe87eabf0 100644 --- a/lib/jekyll-admin/server/data.rb +++ b/lib/jekyll-admin/server/data.rb @@ -17,7 +17,7 @@ class Server < Sinatra::Base put "/*?/?:path.:ext" do if renamed? ensure_requested_file - delete_file path + delete_file_without_process path end write_file write_path, data_file_body diff --git a/lib/jekyll-admin/server/page.rb b/lib/jekyll-admin/server/page.rb index b8b237185..322d6e471 100644 --- a/lib/jekyll-admin/server/page.rb +++ b/lib/jekyll-admin/server/page.rb @@ -16,7 +16,7 @@ class Server < Sinatra::Base if renamed? ensure_requested_file - delete_file path + delete_file_without_process path end write_file write_path, page_body diff --git a/lib/jekyll-admin/server/static_file.rb b/lib/jekyll-admin/server/static_file.rb index 75187f89d..29d3ef8bf 100644 --- a/lib/jekyll-admin/server/static_file.rb +++ b/lib/jekyll-admin/server/static_file.rb @@ -18,7 +18,7 @@ class Server < Sinatra::Base put "/*" do if renamed? ensure_requested_file - delete_file path + delete_file_without_process path end write_file(write_path, static_file_body) diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb deleted file mode 100644 index 1396ca71b..000000000 --- a/lib/jekyll/commands/build.rb +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index f755e3fe6..6b88a647f 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -16,8 +16,6 @@ def start_up_webrick(opts, destination) def jekyll_admin_monkey_patch(server) server.mount "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer server.mount "/_api", Rack::Handler::WEBrick, JekyllAdmin::Server - Jekyll.logger.warn "Auto-regeneration:", "disabled by JekyllAdmin." - Jekyll.logger.warn "", "The site will regenerate only via the Admin interface." Jekyll.logger.info "JekyllAdmin mode:", ENV["RACK_ENV"] || "production" end end From 5b84de65cfaa0a1c8f03bbd958a7d58c60c8c3ad Mon Sep 17 00:00:00 2001 From: mertkahyaoglu Date: Sun, 23 Jul 2017 14:33:33 +0300 Subject: [PATCH 2/5] temporary read in dev mode --- lib/jekyll-admin/file_helper.rb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/jekyll-admin/file_helper.rb b/lib/jekyll-admin/file_helper.rb index ff47a1a23..f7a0f3f2c 100644 --- a/lib/jekyll-admin/file_helper.rb +++ b/lib/jekyll-admin/file_helper.rb @@ -21,24 +21,14 @@ def write_file(path, content) File.open(path, "wb") do |file| file.write(content) end - if ENV["RACK_ENV"] - Jekyll.logger.debug "PROCESSING" - site.process - else - site.read - end + site.read end # Delete the file at the given path def delete_file(path) Jekyll.logger.debug "DELETING:", path FileUtils.rm_f sanitized_path(path) - if ENV["RACK_ENV"] - Jekyll.logger.debug "PROCESSING" - site.process - else - site.read - end + site.read end def delete_file_without_process(path) From b63f7245284af8b4b978283b533f323305a28197 Mon Sep 17 00:00:00 2001 From: mertkahyaoglu Date: Fri, 4 Aug 2017 21:25:43 +0300 Subject: [PATCH 3/5] site.process when deleting --- lib/jekyll-admin/file_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll-admin/file_helper.rb b/lib/jekyll-admin/file_helper.rb index f7a0f3f2c..6d8db637a 100644 --- a/lib/jekyll-admin/file_helper.rb +++ b/lib/jekyll-admin/file_helper.rb @@ -28,7 +28,7 @@ def write_file(path, content) def delete_file(path) Jekyll.logger.debug "DELETING:", path FileUtils.rm_f sanitized_path(path) - site.read + site.process end def delete_file_without_process(path) From d66c26dd63abbaeb5513210ee928c2afa8d65624 Mon Sep 17 00:00:00 2001 From: mertkahyaoglu Date: Sun, 6 Aug 2017 11:41:18 +0300 Subject: [PATCH 4/5] remove require comment --- lib/jekyll-admin.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/jekyll-admin.rb b/lib/jekyll-admin.rb index 85c932e84..7025b6051 100644 --- a/lib/jekyll-admin.rb +++ b/lib/jekyll-admin.rb @@ -39,7 +39,6 @@ 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 From 9cbe87a72b96c0feae98131e8051e16ea0609c11 Mon Sep 17 00:00:00 2001 From: mertkahyaoglu Date: Sat, 23 Sep 2017 20:51:24 +0300 Subject: [PATCH 5/5] environment check --- lib/jekyll-admin/file_helper.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/jekyll-admin/file_helper.rb b/lib/jekyll-admin/file_helper.rb index 6d8db637a..840f4062a 100644 --- a/lib/jekyll-admin/file_helper.rb +++ b/lib/jekyll-admin/file_helper.rb @@ -21,7 +21,12 @@ def write_file(path, content) File.open(path, "wb") do |file| file.write(content) end - site.read + # we should fully process in dev mode for tests to pass + if ENV["RACK_ENV"] == "production" + site.read + else + site.process + end end # Delete the file at the given path