jekyll-admin 0.10.2 → 0.11.0

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

@@ -1,25 +1,25 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  class Server < Sinatra::Base
-    # Jekyll::Site instance method names that return a Hash.
-    META_KEYS = [:categories, :layouts, :tags].freeze
-    private_constant :META_KEYS
-
-    namespace "/site_meta" do
-      get "/?" do
-        json site_meta
-      end
-
-      private
-
-      # Stash a Hash generated with pre-determined keys.
-      def site_meta
-        @site_meta ||= META_KEYS.zip(META_KEYS.map { |k| site.send(k).keys }).to_h
-      end
-
-      # Reset memoization of `#site_meta` when the site regenerates
-      Jekyll::Hooks.register(:site, :after_reset) { @site_meta = nil }
-    end
-  end
-end
+# frozen_string_literal: true
+
+module JekyllAdmin
+  class Server < Sinatra::Base
+    # Jekyll::Site instance method names that return a Hash.
+    META_KEYS = [:categories, :layouts, :tags].freeze
+    private_constant :META_KEYS
+
+    namespace "/site_meta" do
+      get "/?" do
+        json site_meta
+      end
+
+      private
+
+      # Stash a Hash generated with pre-determined keys.
+      def site_meta
+        @site_meta ||= META_KEYS.zip(META_KEYS.map { |k| site.send(k).keys }).to_h
+      end
+
+      # Reset memoization of `#site_meta` when the site regenerates
+      Jekyll::Hooks.register(:site, :after_reset) { @site_meta = nil }
+    end
+  end
+end

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

@@ -1,83 +1,83 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  class Server < Sinatra::Base
-    namespace "/static_files" do
-      # End-point to retrieve all static-files in site
-      get "/index" do
-        json site.static_files.map(&:to_api)
-      end
-
-      # End-point to retrieve individual directories that contain static-files
-      get "/?*" do
-        render_404 unless File.exist?(path)
-
-        if requested_file
-          json requested_file.to_api(:include_content => true)
-        else
-          json entries.map(&:to_api)
-        end
-      end
-
-      put "/*" do
-        if renamed?
-          ensure_requested_file
-          delete_file_without_process path
-        end
-
-        write_file(write_path, static_file_body)
-        json written_file.to_api(:include_content => true)
-      end
-
-      delete "/*" do
-        ensure_requested_file
-        delete_file path
-        content_type :json
-        status 200
-        halt
-      end
-
-      private
-
-      # returns relative path of root level directories that contain static files
-      def dirs_at_root
-        static_files.map do |file|
-          File.dirname(file.path.sub("#{site.source}/", "")).split("/")[0]
-        end.uniq
-      end
-
-      def directory_files
-        static_files.find_all do |file|
-          sanitized_path(File.dirname(file.path)) == directory_path
-        end
-      end
-
-      def entries
-        splat = params["splat"].first
-        args = {
-          :base         => site.source,
-          :content_type => "static_files",
-          :splat        => splat,
-        }
-        # get all directories inside the requested directory
-        directory = JekyllAdmin::Directory.new(directory_path, args)
-        directories = directory.directories
-
-        # exclude root level directories which do not have static files
-        directories = directories.select { |d| dirs_at_root.include? d.name.to_s } if splat.empty?
-        directories.concat(directory_files)
-      end
-
-      def static_file_body
-        raw_content = request_payload["raw_content"]
-        return raw_content if raw_content.is_a?(String) && raw_content != ""
-
-        Base64.decode64 request_payload["encoded_content"].to_s
-      end
-
-      def static_files
-        site.static_files.select { |f| f.path.start_with? site.source }
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module JekyllAdmin
+  class Server < Sinatra::Base
+    namespace "/static_files" do
+      # End-point to retrieve all static-files in site
+      get "/index" do
+        json site.static_files.map(&:to_api)
+      end
+
+      # End-point to retrieve individual directories that contain static-files
+      get "/?*" do
+        render_404 unless File.exist?(path)
+
+        if requested_file
+          json requested_file.to_api(:include_content => true)
+        else
+          json entries.map(&:to_api)
+        end
+      end
+
+      put "/*" do
+        if renamed?
+          ensure_requested_file
+          delete_file_without_process path
+        end
+
+        write_file(write_path, static_file_body)
+        json written_file.to_api(:include_content => true)
+      end
+
+      delete "/*" do
+        ensure_requested_file
+        delete_file path
+        content_type :json
+        status 200
+        halt
+      end
+
+      private
+
+      # returns relative path of root level directories that contain static files
+      def dirs_at_root
+        static_files.map do |file|
+          File.dirname(file.path.sub("#{site.source}/", "")).split("/")[0]
+        end.uniq
+      end
+
+      def directory_files
+        static_files.find_all do |file|
+          sanitized_path(File.dirname(file.path)) == directory_path
+        end
+      end
+
+      def entries
+        splat = params["splat"].first
+        args = {
+          :base         => site.source,
+          :content_type => "static_files",
+          :splat        => splat,
+        }
+        # get all directories inside the requested directory
+        directory = JekyllAdmin::Directory.new(directory_path, **args)
+        directories = directory.directories
+
+        # exclude root level directories which do not have static files
+        directories = directories.select { |d| dirs_at_root.include? d.name.to_s } if splat.empty?
+        directories.concat(directory_files)
+      end
+
+      def static_file_body
+        raw_content = request_payload["raw_content"]
+        return raw_content if raw_content.is_a?(String) && raw_content != ""
+
+        Base64.decode64 request_payload["encoded_content"].to_s
+      end
+
+      def static_files
+        site.static_files.select { |f| f.path.start_with? site.source }
+      end
+    end
+  end
+end

data/lib/jekyll-admin/static_server.rb

@@ -1,26 +1,26 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  class StaticServer < Sinatra::Base
-    set :public_dir, File.expand_path("./public", File.dirname(__FILE__))
-
-    MUST_BUILD_MESSAGE = "Front end not yet built. Run `script/build` to build."
-
-    # Allow `/admin` and `/admin/`, and `/admin/*` to serve `/public/dist/index.html`
-    get "/*" do
-      send_file index_path
-    end
-
-    # Provide a descriptive error message in dev. if frontend is not build
-    not_found do
-      status 404
-      MUST_BUILD_MESSAGE if settings.development? || settings.test?
-    end
-
-    private
-
-    def index_path
-      @index_path ||= File.join(settings.public_folder, "index.html")
-    end
-  end
-end
+# frozen_string_literal: true
+
+module JekyllAdmin
+  class StaticServer < Sinatra::Base
+    set :public_dir, File.expand_path("./public", File.dirname(__FILE__))
+
+    MUST_BUILD_MESSAGE = "Front end not yet built. Run `script/build` to build."
+
+    # Allow `/admin` and `/admin/`, and `/admin/*` to serve `/public/dist/index.html`
+    get "/*" do
+      send_file index_path
+    end
+
+    # Provide a descriptive error message in dev. if frontend is not build
+    not_found do
+      status 404
+      MUST_BUILD_MESSAGE if settings.development? || settings.test?
+    end
+
+    private
+
+    def index_path
+      @index_path ||= File.join(settings.public_folder, "index.html")
+    end
+  end
+end

data/lib/jekyll-admin/urlable.rb

@@ -1,75 +1,75 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  # Abstract module to be included in Convertible and Document to provide
-  # additional, URL-specific functionality without duplicating logic
-  module URLable
-    # Absolute URL to the HTTP(S) rendered/served representation of this resource
-    def http_url
-      return if is_a?(Jekyll::Collection) || is_a?(JekyllAdmin::DataFile)
-      return if is_a?(Jekyll::Document) && !collection.write?
-
-      @http_url ||= Addressable::URI.new(
-        :scheme => scheme, :host => host, :port => port,
-        :path => path_with_base(JekyllAdmin.site.config["baseurl"], url)
-      ).normalize.to_s
-    end
-
-    # Absolute URL to the API representation of this resource
-    def api_url
-      @api_url ||= Addressable::URI.new(
-        :scheme => scheme, :host => host, :port => port,
-        :path => path_with_base("/_api", resource_path)
-      ).normalize.to_s
-    end
-
-    def entries_url
-      return unless is_a?(Jekyll::Collection)
-
-      "#{api_url}/entries"
-    end
-
-    private
-
-    # URL path relative to `_api/` to retreive the given resource via the API
-    # Note: we can't use a case statement here, because === doesn't like includes
-    #
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/PerceivedComplexity
-    def resource_path
-      if is_a?(Jekyll::Document) && draft?
-        "/#{relative_path.sub(%r!\A_!, "")}"
-      elsif is_a?(Jekyll::Document)
-        "/collections/#{relative_path.sub(%r!\A_!, "")}"
-      elsif is_a?(Jekyll::Collection)
-        "/collections/#{label}"
-      elsif is_a?(JekyllAdmin::DataFile)
-        "/data/#{relative_path}"
-      elsif is_a?(Jekyll::StaticFile)
-        "/static_files/#{relative_path}"
-      elsif is_a?(Jekyll::Page)
-        "/pages/#{relative_path}"
-      end
-    end
-    # rubocop:enable Metrics/PerceivedComplexity
-    # rubocop:enable Metrics/CyclomaticComplexity
-
-    # URI.join doesn't like joining two relative paths, and File.join may join
-    # with `\` rather than with `/` on windows
-    def path_with_base(base, path)
-      [base, path].join("/").squeeze("/")
-    end
-
-    def scheme
-      JekyllAdmin.site.config["scheme"] || "http"
-    end
-
-    def host
-      JekyllAdmin.site.config["host"].sub("127.0.0.1", "localhost")
-    end
-
-    def port
-      JekyllAdmin.site.config["port"]
-    end
-  end
-end
+# frozen_string_literal: true
+
+module JekyllAdmin
+  # Abstract module to be included in Convertible and Document to provide
+  # additional, URL-specific functionality without duplicating logic
+  module URLable
+    # Absolute URL to the HTTP(S) rendered/served representation of this resource
+    def http_url
+      return if is_a?(Jekyll::Collection) || is_a?(JekyllAdmin::DataFile)
+      return if is_a?(Jekyll::Document) && !collection.write?
+
+      @http_url ||= Addressable::URI.new(
+        :scheme => scheme, :host => host, :port => port,
+        :path => path_with_base(JekyllAdmin.site.config["baseurl"], url)
+      ).normalize.to_s
+    end
+
+    # Absolute URL to the API representation of this resource
+    def api_url
+      @api_url ||= Addressable::URI.new(
+        :scheme => scheme, :host => host, :port => port,
+        :path => path_with_base("/_api", resource_path)
+      ).normalize.to_s
+    end
+
+    def entries_url
+      return unless is_a?(Jekyll::Collection)
+
+      "#{api_url}/entries"
+    end
+
+    private
+
+    # URL path relative to `_api/` to retreive the given resource via the API
+    # Note: we can't use a case statement here, because === doesn't like includes
+    #
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def resource_path
+      if is_a?(Jekyll::Document) && draft?
+        "/#{relative_path.sub(%r!\A_!, "")}"
+      elsif is_a?(Jekyll::Document)
+        "/collections/#{relative_path.sub(%r!\A_!, "")}"
+      elsif is_a?(Jekyll::Collection)
+        "/collections/#{label}"
+      elsif is_a?(JekyllAdmin::DataFile)
+        "/data/#{relative_path}"
+      elsif is_a?(Jekyll::StaticFile)
+        "/static_files/#{relative_path}"
+      elsif is_a?(Jekyll::Page)
+        "/pages/#{relative_path}"
+      end
+    end
+    # rubocop:enable Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    # URI.join doesn't like joining two relative paths, and File.join may join
+    # with `\` rather than with `/` on windows
+    def path_with_base(base, path)
+      [base, path].join("/").squeeze("/")
+    end
+
+    def scheme
+      JekyllAdmin.site.config["scheme"] || "http"
+    end
+
+    def host
+      JekyllAdmin.site.config["host"].sub("127.0.0.1", "localhost")
+    end
+
+    def port
+      JekyllAdmin.site.config["port"]
+    end
+  end
+end

data/lib/jekyll-admin/version.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-module JekyllAdmin
-  VERSION = "0.10.2"
-end
+# frozen_string_literal: true
+
+module JekyllAdmin
+  VERSION = "0.11.0"
+end

data/lib/jekyll/commands/serve.rb

@@ -1,30 +1,30 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Commands
-    class Serve < Command
-      class << self
-        private
-
-        def start_up_webrick(opts, destination)
-          @reload_reactor.start(opts) if opts["livereload"]
-
-          @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-          @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
-
-          jekyll_admin_monkey_patch
-
-          Jekyll.logger.info "Server address:", server_address(@server, opts)
-          launch_browser @server, opts if opts["open_url"]
-          boot_or_detach @server, opts
-        end
-
-        def jekyll_admin_monkey_patch
-          @server.mount "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer
-          @server.mount "/_api",  Rack::Handler::WEBrick, JekyllAdmin::Server
-          Jekyll.logger.info "JekyllAdmin mode:", ENV["RACK_ENV"] || "production"
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Commands
+    class Serve < Command
+      class << self
+        private
+
+        def start_up_webrick(opts, destination)
+          @reload_reactor.start(opts) if opts["livereload"]
+
+          @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
+          @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
+
+          jekyll_admin_monkey_patch
+
+          Jekyll.logger.info "Server address:", server_address(@server, opts)
+          launch_browser @server, opts if opts["open_url"]
+          boot_or_detach @server, opts
+        end
+
+        def jekyll_admin_monkey_patch
+          @server.mount "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer
+          @server.mount "/_api",  Rack::Handler::WEBrick, JekyllAdmin::Server
+          Jekyll.logger.info "JekyllAdmin mode:", ENV["RACK_ENV"] || "production"
+        end
+      end
+    end
+  end
+end