jekyll-admin 0.10.2 → 0.11.0

data/lib/jekyll-admin/server.rb

@@ -1,108 +1,108 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  class Server < Sinatra::Base
-    ROUTES = %w(collections configuration data drafts pages static_files).freeze
-    include JekyllAdmin::PathHelper
-    include JekyllAdmin::FileHelper
-
-    register Sinatra::Namespace
-
-    configure :development do
-      register Sinatra::Reloader
-      enable :logging
-    end
-
-    configure :development, :test do
-      require "sinatra/cross_origin"
-      register Sinatra::CrossOrigin
-      enable  :cross_origin
-      disable :allow_credentials
-      set :allow_methods, [:delete, :get, :options, :post, :put]
-    end
-
-    get "/" do
-      json ROUTES.map { |r| ["#{r}_api", URI.join(base_url, "/_api/", r)] }.to_h
-    end
-
-    # CORS preflight
-    options "*" do
-      render_404 unless settings.development? || settings.test?
-      status 204
-    end
-
-    private
-
-    def json(object, options = {})
-      content_type :json
-      JSON.pretty_generate(object, options)
-    end
-
-    def site
-      JekyllAdmin.site
-    end
-
-    def render_404
-      status 404
-      content_type :json
-      halt
-    end
-
-    def request_payload
-      @request_payload ||= if request_body.to_s.empty?
-                             {}
-                           else
-                             JSON.parse(request_body)
-                           end
-    end
-
-    def base_url
-      "#{request.scheme}://#{request.host_with_port}"
-    end
-
-    def front_matter
-      request_payload["front_matter"]
-    end
-
-    def document_body
-      body = +""
-      body << if front_matter && !front_matter.empty?
-                YAML.dump(restored_front_matter).strip
-                  .gsub(": 'null'", ": null") # restore null values
-              else
-                "---"
-              end
-      body << "\n---\n\n"
-      body << request_payload["raw_content"].to_s
-      body << "\n" unless body.end_with?("\n")
-      body
-    end
-    alias_method :page_body, :document_body
-
-    def request_body
-      @request_body ||= begin
-        request.body.rewind
-        request.body.read
-      end
-    end
-
-    def namespace
-      namespace = request.path_info.split("/")[1].to_s.downcase
-      namespace if ROUTES.include?(namespace)
-    end
-
-    # verbose 'null' values in front matter
-    def restored_front_matter
-      front_matter.map do |key, value|
-        value = "null" if value.nil?
-        [key, value]
-      end.to_h
-    end
-  end
-end
-
-# load individual route configurations
-JekyllAdmin::Server::ROUTES.each { |name| require_relative File.join("server", name) }
-
-# load namespaces outside route configurations
-require_relative "server/site_meta"
+# frozen_string_literal: true
+
+module JekyllAdmin
+  class Server < Sinatra::Base
+    ROUTES = %w(collections configuration data drafts pages static_files).freeze
+    include JekyllAdmin::PathHelper
+    include JekyllAdmin::FileHelper
+
+    register Sinatra::Namespace
+
+    configure :development do
+      register Sinatra::Reloader
+      enable :logging
+    end
+
+    configure :development, :test do
+      require "sinatra/cross_origin"
+      register Sinatra::CrossOrigin
+      enable  :cross_origin
+      disable :allow_credentials
+      set :allow_methods, [:delete, :get, :options, :post, :put]
+    end
+
+    get "/" do
+      json ROUTES.map { |r| ["#{r}_api", URI.join(base_url, "/_api/", r)] }.to_h
+    end
+
+    # CORS preflight
+    options "*" do
+      render_404 unless settings.development? || settings.test?
+      status 204
+    end
+
+    private
+
+    def json(object, options = {})
+      content_type :json
+      JSON.pretty_generate(object, options)
+    end
+
+    def site
+      JekyllAdmin.site
+    end
+
+    def render_404
+      status 404
+      content_type :json
+      halt
+    end
+
+    def request_payload
+      @request_payload ||= if request_body.to_s.empty?
+                             {}
+                           else
+                             JSON.parse(request_body)
+                           end
+    end
+
+    def base_url
+      "#{request.scheme}://#{request.host_with_port}"
+    end
+
+    def front_matter
+      request_payload["front_matter"]
+    end
+
+    def document_body
+      body = +""
+      body << if front_matter && !front_matter.empty?
+                YAML.dump(restored_front_matter).strip
+                  .gsub(": 'null'", ": null") # restore null values
+              else
+                "---"
+              end
+      body << "\n---\n\n"
+      body << request_payload["raw_content"].to_s
+      body << "\n" unless body.end_with?("\n")
+      body
+    end
+    alias_method :page_body, :document_body
+
+    def request_body
+      @request_body ||= begin
+        request.body.rewind
+        request.body.read
+      end
+    end
+
+    def namespace
+      namespace = request.path_info.split("/")[1].to_s.downcase
+      namespace if ROUTES.include?(namespace)
+    end
+
+    # verbose 'null' values in front matter
+    def restored_front_matter
+      front_matter.map do |key, value|
+        value = "null" if value.nil?
+        [key, value]
+      end.to_h
+    end
+  end
+end
+
+# load individual route configurations
+JekyllAdmin::Server::ROUTES.each { |name| require_relative File.join("server", name) }
+
+# load namespaces outside route configurations
+require_relative "server/site_meta"

data/lib/jekyll-admin/server/collections.rb

@@ -1,89 +1,89 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  class Server < Sinatra::Base
-    namespace "/collections" do
-      get do
-        json(site.collections.map { |c| c[1].to_api })
-      end
-
-      get "/:collection_id" do
-        ensure_collection
-        json collection.to_api
-      end
-
-      get "/:collection_id/*?/?:path.:ext" do
-        ensure_requested_file
-        json requested_file.to_api(:include_content => true)
-      end
-
-      get "/:collection_id/entries/?*" do
-        ensure_directory
-        json entries.map(&:to_api)
-      end
-
-      put "/:collection_id/*?/?:path.:ext" do
-        ensure_collection
-
-        if new?
-          ensure_not_overwriting_existing_file
-        elsif renamed?
-          ensure_requested_file
-          ensure_not_overwriting_existing_file
-          delete_file_without_process path
-        end
-
-        write_file write_path, document_body
-        json written_file.to_api(:include_content => true)
-      end
-
-      delete "/:collection_id/*?/?:path.:ext" do
-        ensure_requested_file
-        delete_file path
-        content_type :json
-        status 200
-        halt
-      end
-
-      private
-
-      def collection
-        collection = site.collections.find { |l, _c| l == params["collection_id"] }
-        collection[1] if collection
-      end
-
-      def document_id
-        path = "#{params["splat"].first}/#{filename}"
-        path.gsub(%r!(\d{4})/(\d{2})/(\d{2})/(.*)!, '\1-\2-\3-\4')
-      end
-
-      def directory_docs
-        collection.docs.find_all { |d| File.dirname(d.path) == directory_path }
-      end
-
-      def ensure_collection
-        render_404 if collection.nil?
-      end
-
-      def ensure_directory
-        ensure_collection
-        render_404 unless Dir.exist?(directory_path)
-      end
-
-      def entries
-        collections_dir = site.config["collections_dir"]
-        collection_id, splats = params.values_at("collection_id", "splat")
-        args = {
-          :base         => site.in_source_dir(collections_dir, "_#{collection_id}"),
-          :content_type => collection_id,
-          :splat        => splats&.first,
-        }
-        # get the directories inside the requested directory
-        directory = JekyllAdmin::Directory.new(directory_path, args)
-        directories = directory.directories
-        # merge directories with the documents at the same level
-        directories.concat(directory_docs.sort_by(&:date).reverse)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module JekyllAdmin
+  class Server < Sinatra::Base
+    namespace "/collections" do
+      get do
+        json(site.collections.map { |c| c[1].to_api })
+      end
+
+      get "/:collection_id" do
+        ensure_collection
+        json collection.to_api
+      end
+
+      get "/:collection_id/*?/?:path.:ext" do
+        ensure_requested_file
+        json requested_file.to_api(:include_content => true)
+      end
+
+      get "/:collection_id/entries/?*" do
+        ensure_directory
+        json entries.map(&:to_api)
+      end
+
+      put "/:collection_id/*?/?:path.:ext" do
+        ensure_collection
+
+        if new?
+          ensure_not_overwriting_existing_file
+        elsif renamed?
+          ensure_requested_file
+          ensure_not_overwriting_existing_file
+          delete_file_without_process path
+        end
+
+        write_file write_path, document_body
+        json written_file.to_api(:include_content => true)
+      end
+
+      delete "/:collection_id/*?/?:path.:ext" do
+        ensure_requested_file
+        delete_file path
+        content_type :json
+        status 200
+        halt
+      end
+
+      private
+
+      def collection
+        collection = site.collections.find { |l, _c| l == params["collection_id"] }
+        collection[1] if collection
+      end
+
+      def document_id
+        path = "#{params["splat"].first}/#{filename}"
+        path.gsub(%r!(\d{4})/(\d{2})/(\d{2})/(.*)!, '\1-\2-\3-\4')
+      end
+
+      def directory_docs
+        collection.docs.find_all { |d| File.dirname(d.path) == directory_path }
+      end
+
+      def ensure_collection
+        render_404 if collection.nil?
+      end
+
+      def ensure_directory
+        ensure_collection
+        render_404 unless Dir.exist?(directory_path)
+      end
+
+      def entries
+        collections_dir = site.config["collections_dir"]
+        collection_id, splats = params.values_at("collection_id", "splat")
+        args = {
+          :base         => site.in_source_dir(collections_dir, "_#{collection_id}"),
+          :content_type => collection_id,
+          :splat        => splats&.first,
+        }
+        # get the directories inside the requested directory
+        directory = JekyllAdmin::Directory.new(directory_path, **args)
+        directories = directory.directories
+        # merge directories with the documents at the same level
+        directories.concat(directory_docs.sort_by(&:date).reverse)
+      end
+    end
+  end
+end

data/lib/jekyll-admin/server/configuration.rb

@@ -1,60 +1,60 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  class Server < Sinatra::Base
-    namespace "/configuration" do
-      get do
-        json(
-          :content     => parsed_configuration,
-          :raw_content => raw_configuration
-        )
-      end
-
-      put do
-        write_file(configuration_path, configuration_body)
-        json request_payload
-      end
-
-      private
-
-      def overrides
-        @overrides ||= {
-          "source" => sanitized_path("/"),
-        }
-      end
-
-      # Computed configuration, with updates and defaults
-      # Returns an instance of Jekyll::Configuration
-      def configuration
-        @configuration ||= site.config.merge(overrides)
-      end
-
-      # Configuration data, as read by Jekyll
-      def parsed_configuration
-        configuration.read_config_file(configuration_path)
-      end
-
-      # Raw configuration content, as it sits on disk
-      def raw_configuration
-        File.read(
-          configuration_path,
-          Jekyll::Utils.merged_file_read_opts(site, {})
-        )
-      end
-
-      # Returns the path to the *first* config file discovered
-      def configuration_path
-        sanitized_path configuration.config_files(overrides).first
-      end
-
-      # The user's uploaded configuration for updates
-      # Instead of extracting `raw_content` directly from the `request_payload`,
-      #   assign the data to a new variable and then extract the `raw_content`
-      #   from it to circumvent CORS violation in `development` mode.
-      def configuration_body
-        payload = request_payload
-        payload["raw_content"]
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module JekyllAdmin
+  class Server < Sinatra::Base
+    namespace "/configuration" do
+      get do
+        json(
+          :content     => parsed_configuration,
+          :raw_content => raw_configuration
+        )
+      end
+
+      put do
+        write_file(configuration_path, configuration_body)
+        json request_payload
+      end
+
+      private
+
+      def overrides
+        @overrides ||= {
+          "source" => sanitized_path("/"),
+        }
+      end
+
+      # Computed configuration, with updates and defaults
+      # Returns an instance of Jekyll::Configuration
+      def configuration
+        @configuration ||= site.config.merge(overrides)
+      end
+
+      # Configuration data, as read by Jekyll
+      def parsed_configuration
+        configuration.read_config_file(configuration_path)
+      end
+
+      # Raw configuration content, as it sits on disk
+      def raw_configuration
+        File.read(
+          configuration_path,
+          **Jekyll::Utils.merged_file_read_opts(site, {})
+        )
+      end
+
+      # Returns the path to the *first* config file discovered
+      def configuration_path
+        sanitized_path configuration.config_files(overrides).first
+      end
+
+      # The user's uploaded configuration for updates
+      # Instead of extracting `raw_content` directly from the `request_payload`,
+      #   assign the data to a new variable and then extract the `raw_content`
+      #   from it to circumvent CORS violation in `development` mode.
+      def configuration_body
+        payload = request_payload
+        payload["raw_content"]
+      end
+    end
+  end
+end