jekyll-admin 0.8.1 → 0.9.0

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

@@ -1,90 +1,91 @@
-module JekyllAdmin
-  class Server < Sinatra::Base
-    namespace "/pages" do
-      get "/*?/?:path.:ext" do
-        ensure_requested_file
-        json requested_file.to_api(:include_content => true)
-      end
-
-      get "/?*" do
-        ensure_directory
-        json entries.map(&:to_api)
-      end
-
-      put "/*?/?:path.:ext" do
-        ensure_html_content
-
-        if renamed?
-          ensure_requested_file
-          delete_file_without_process path
-        end
-
-        write_file write_path, page_body
-
-        json written_file.to_api(:include_content => true)
-      end
-
-      delete "/*?/?:path.:ext" do
-        ensure_requested_file
-        delete_file path
-        content_type :json
-        status 200
-        halt
-      end
-
-      private
-
-      def ensure_html_content
-        return if html_content?
-        content_type :json
-        halt 422, json("error_message" => "Invalid file extension for pages")
-      end
-
-      def html_content?
-        page = JekyllAdmin::PageWithoutAFile.new(
-          site,
-          site.source,
-          "",
-          request_payload["path"] || filename
-        )
-        page.data = request_payload["front_matter"]
-        page.html?
-      end
-
-      def pages
-        site.pages.select(&:html?)
-      end
-
-      def directory_pages
-        pages.find_all do |p|
-          sanitized_path(File.dirname(p.path)) == directory_path
-        end
-      end
-
-      # returns relative path of root level directories that contain pages
-      def directory_paths
-        pages.map { |p| File.dirname(p.path).split("/")[0] }.uniq
-      end
-
-      def entries
-        args = {
-          :base         => site.source,
-          :content_type => "pages",
-          :splat        => params["splat"].first,
-        }
-        # 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 pages
-        if params["splat"].first.empty?
-          directories = directories.select do |d|
-            directory_paths.include? d.name.to_s
-          end
-        end
-        # merge directories with the pages at the same level
-        directories.concat(directory_pages)
-      end
-    end
-  end
-end
+module JekyllAdmin
+  class Server < Sinatra::Base
+    namespace "/pages" do
+      get "/*?/?:path.:ext" do
+        ensure_requested_file
+        json requested_file.to_api(:include_content => true)
+      end
+
+      get "/?*" do
+        ensure_directory
+        json entries.map(&:to_api)
+      end
+
+      put "/*?/?:path.:ext" do
+        ensure_html_content
+
+        if renamed?
+          ensure_requested_file
+          delete_file_without_process path
+        end
+
+        write_file write_path, page_body
+
+        json written_file.to_api(:include_content => true)
+      end
+
+      delete "/*?/?:path.:ext" do
+        ensure_requested_file
+        delete_file path
+        content_type :json
+        status 200
+        halt
+      end
+
+      private
+
+      def ensure_html_content
+        return if html_content?
+
+        content_type :json
+        halt 422, json("error_message" => "Invalid file extension for pages")
+      end
+
+      def html_content?
+        page = JekyllAdmin::PageWithoutAFile.new(
+          site,
+          site.source,
+          "",
+          request_payload["path"] || filename
+        )
+        page.data = request_payload["front_matter"]
+        page.html?
+      end
+
+      def pages
+        site.pages.select(&:html?)
+      end
+
+      def directory_pages
+        pages.find_all do |p|
+          sanitized_path(File.dirname(p.path)) == directory_path
+        end
+      end
+
+      # returns relative path of root level directories that contain pages
+      def directory_paths
+        pages.map { |p| File.dirname(p.path).split("/")[0] }.uniq
+      end
+
+      def entries
+        args = {
+          :base         => site.source,
+          :content_type => "pages",
+          :splat        => params["splat"].first,
+        }
+        # 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 pages
+        if params["splat"].first.empty?
+          directories = directories.select do |d|
+            directory_paths.include? d.name.to_s
+          end
+        end
+        # merge directories with the pages at the same level
+        directories.concat(directory_pages)
+      end
+    end
+  end
+end

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

@@ -1,61 +1,61 @@
-module JekyllAdmin
-  class Server < Sinatra::Base
-    namespace "/static_files" do
-      get do
-        json static_files.map(&:to_api)
-      end
-
-      get "/*" do
-        if requested_file
-          json requested_file.to_api(:include_content => true)
-        elsif !static_files_for_path.empty?
-          json static_files_for_path.map(&:to_api)
-        else
-          render_404
-        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
-
-      def static_file_body
-        if !request_payload["raw_content"].to_s.empty?
-          request_payload["raw_content"].to_s
-        else
-          Base64.decode64 request_payload["encoded_content"].to_s
-        end
-      end
-
-      def static_files
-        site.static_files
-      end
-
-      def file_list_dir(path) end
-
-      def static_files_for_path
-        # Joined with / to ensure user can't do partial paths
-        base_path = File.join(path, "/")
-        static_files.select do |f|
-          f.path.start_with? base_path
-        end
-      end
-    end
-  end
-end
+module JekyllAdmin
+  class Server < Sinatra::Base
+    namespace "/static_files" do
+      get do
+        json static_files.map(&:to_api)
+      end
+
+      get "/*" do
+        if requested_file
+          json requested_file.to_api(:include_content => true)
+        elsif !static_files_for_path.empty?
+          json static_files_for_path.map(&:to_api)
+        else
+          render_404
+        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
+
+      def static_file_body
+        if !request_payload["raw_content"].to_s.empty?
+          request_payload["raw_content"].to_s
+        else
+          Base64.decode64 request_payload["encoded_content"].to_s
+        end
+      end
+
+      def static_files
+        site.static_files
+      end
+
+      def file_list_dir(path) end
+
+      def static_files_for_path
+        # Joined with / to ensure user can't do partial paths
+        base_path = File.join(path, "/")
+        static_files.select do |f|
+          f.path.start_with? base_path
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-admin/static_server.rb

@@ -1,24 +1,24 @@
-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.".freeze
-
-    # 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
+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.".freeze
+
+    # 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,67 +1,71 @@
-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
-    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
-
-    # 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
+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
+    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/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