jekyll-admin 0.8.1 → 0.11.0

data/lib/jekyll-admin/server/{collection.rb → collections.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllAdmin
   class Server < Sinatra::Base
     namespace "/collections" do
@@ -23,8 +25,11 @@ module JekyllAdmin
       put "/:collection_id/*?/?:path.:ext" do
         ensure_collection
 
-        if renamed?
+        if new?
+          ensure_not_overwriting_existing_file
+        elsif renamed?
           ensure_requested_file
+          ensure_not_overwriting_existing_file
           delete_file_without_process path
         end
 
@@ -66,13 +71,15 @@ module JekyllAdmin
       end
 
       def entries
+        collections_dir = site.config["collections_dir"]
+        collection_id, splats = params.values_at("collection_id", "splat")
         args = {
-          :base         => site.source,
-          :content_type => params["collection_id"],
-          :splat        => params["splat"].first,
+          :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)
+        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)

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module JekyllAdmin
   class Server < Sinatra::Base
     namespace "/configuration" do
       get do
-        json({
+        json(
           :content     => parsed_configuration,
-          :raw_content => raw_configuration,
-        })
+          :raw_content => raw_configuration
+        )
       end
 
       put do
@@ -16,14 +18,15 @@ module JekyllAdmin
       private
 
       def overrides
-        {
+        @overrides ||= {
           "source" => sanitized_path("/"),
         }
       end
 
       # Computed configuration, with updates and defaults
+      # Returns an instance of Jekyll::Configuration
       def configuration
-        @configuration ||= Jekyll.configuration(overrides)
+        @configuration ||= site.config.merge(overrides)
       end
 
       # Configuration data, as read by Jekyll
@@ -35,7 +38,7 @@ module JekyllAdmin
       def raw_configuration
         File.read(
           configuration_path,
-          Jekyll::Utils.merged_file_read_opts(site, {})
+          **Jekyll::Utils.merged_file_read_opts(site, {})
         )
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllAdmin
   class Server < Sinatra::Base
     # supported extensions, in order of preference, for now, no .csv
@@ -47,12 +49,12 @@ module JekyllAdmin
 
       def entries
         args = {
-          :base         => sanitized_path(DataFile.data_dir),
+          :base         => site.in_source_dir(DataFile.data_dir),
           :content_type => "data",
           :splat        => splats.first,
         }
         # get all directories inside the requested directory
-        directory = JekyllAdmin::Directory.new(directory_path, args)
+        directory = JekyllAdmin::Directory.new(directory_path, **args)
         directories = directory.directories
 
         # exclude root level directories which do not have data files

data/lib/jekyll-admin/server/{draft.rb → drafts.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllAdmin
   class Server < Sinatra::Base
     namespace "/drafts" do
@@ -14,8 +16,11 @@ module JekyllAdmin
       put "/*?/?:path.:ext" do
         ensure_html_content
 
-        if renamed?
+        if new?
+          ensure_not_overwriting_existing_file
+        elsif renamed?
           ensure_requested_file
+          ensure_not_overwriting_existing_file
           delete_file_without_process path
         end
 
@@ -37,9 +42,7 @@ module JekyllAdmin
       # file but reside in a separate directory, `<source_dir>/_drafts/`
       def drafts
         posts = site.collections.find { |l, _c| l == "posts" }
-        if posts
-          posts[1].docs.find_all { |d| d.output_ext == ".html" && d.draft? }
-        end
+        posts[1].docs.find_all { |d| d.output_ext == ".html" && d.draft? } if posts
       end
 
       # return drafts at the same level as directory
@@ -71,18 +74,19 @@ module JekyllAdmin
 
       def ensure_html_content
         return if html_content?
+
         content_type :json
         halt 422, json("error_message" => "Invalid file extension for drafts")
       end
 
       def entries
         args = {
-          :base         => site.source,
+          :base         => site.in_source_dir("_drafts"),
           :content_type => "drafts",
           :splat        => params["splat"].first,
         }
         # get the directories inside the requested directory
-        directory = JekyllAdmin::Directory.new(directory_path, args)
+        directory = JekyllAdmin::Directory.new(directory_path, **args)
         directories = directory.directories
 
         # exclude root level directories which do not have drafts
@@ -96,7 +100,7 @@ module JekyllAdmin
       end
 
       def html_content?
-        draft = JekyllAdmin::PageWithoutAFile.new(
+        draft = Jekyll::PageWithoutAFile.new(
           site,
           site.source,
           "_drafts",

data/lib/jekyll-admin/server/{page.rb → pages.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllAdmin
   class Server < Sinatra::Base
     namespace "/pages" do
@@ -14,13 +16,15 @@ module JekyllAdmin
       put "/*?/?:path.:ext" do
         ensure_html_content
 
-        if renamed?
+        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, page_body
-
         json written_file.to_api(:include_content => true)
       end
 
@@ -36,12 +40,13 @@ module JekyllAdmin
 
       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(
+        page = Jekyll::PageWithoutAFile.new(
           site,
           site.source,
           "",
@@ -52,7 +57,21 @@ module JekyllAdmin
       end
 
       def pages
-        site.pages.select(&:html?)
+        site.pages.select { |p| html_page_at_source?(p) }
+      end
+
+      # Test if a given page is *physically located* within the source directory and outputs
+      # to an HTML file.
+      # We don't want *virtual pages* that are generated via plugins.
+      def html_page_at_source?(page)
+        return false unless page.html?
+
+        # If page is not an instance of a `Jekyll::Page` subclass, then it needs additional
+        # inspection.
+        # Can't use `is_a?(Jekyll::Page)` here because it returns true for subclass instances
+        return true if page.class == Jekyll::Page
+
+        File.exist?(site.in_source_dir(page.relative_path))
       end
 
       def directory_pages
@@ -73,7 +92,7 @@ module JekyllAdmin
           :splat        => params["splat"].first,
         }
         # get all directories inside the requested directory
-        directory = JekyllAdmin::Directory.new(directory_path, args)
+        directory = JekyllAdmin::Directory.new(directory_path, **args)
         directories = directory.directories
 
         # exclude root level directories which do not have pages

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

@@ -0,0 +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

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

@@ -0,0 +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

data/lib/jekyll-admin/static_server.rb

@@ -1,8 +1,10 @@
+# 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.".freeze
+    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

data/lib/jekyll-admin/urlable.rb

@@ -1,12 +1,14 @@
+# 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)
@@ -23,6 +25,7 @@ module JekyllAdmin
 
     def entries_url
       return unless is_a?(Jekyll::Collection)
+
       "#{api_url}/entries"
     end
 
@@ -30,6 +33,9 @@ module JekyllAdmin
 
     # 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_!, "")}"
@@ -45,6 +51,8 @@ module JekyllAdmin
         "/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

data/lib/jekyll-admin/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JekyllAdmin
-  VERSION = "0.8.1".freeze
+  VERSION = "0.11.0"
 end

data/lib/jekyll/commands/serve.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Commands
     class Serve < Command
       class << self
+        private
+
         def start_up_webrick(opts, destination)
-          if opts["livereload"]
-            @reload_reactor.start(opts)
-          end
+          @reload_reactor.start(opts) if opts["livereload"]
 
-          server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
-          server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
+          @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(server)
+          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
+          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)
-          server.mount "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer
-          server.mount "/_api",  Rack::Handler::WEBrick, JekyllAdmin::Server
+        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

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Mert Kahyaoğlu
 - GitHub Open Source
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -54,33 +60,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
+        version: '1.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,19 +116,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
@@ -137,20 +143,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 description: Jekyll::Admin is a drop in administrative framework for Jekyll sites.
 email:
 - mertkahyaoglu93@gmail.com
@@ -166,36 +158,43 @@ files:
 - lib/jekyll-admin/data_file.rb
 - lib/jekyll-admin/directory.rb
 - lib/jekyll-admin/file_helper.rb
-- lib/jekyll-admin/page_without_a_file.rb
 - lib/jekyll-admin/path_helper.rb
-- lib/jekyll-admin/public/03945ac4fc7fdefc44bc110bf1ba2393.svg
-- lib/jekyll-admin/public/059514c92565e4045da1a69525dd9ec0.ttf
-- lib/jekyll-admin/public/1dc35d25e61d819a9c357074014867ab.ttf
-- lib/jekyll-admin/public/25a32416abee198dd821b0b17a198a8f.eot
-- lib/jekyll-admin/public/33a752211d05af6684e26ec63c2ed965.gif
-- lib/jekyll-admin/public/55131026930a0cd4539d1e2fdb92722d.ttf
-- lib/jekyll-admin/public/8b4968b70019a0551a72940c5a2020d3.png
-- lib/jekyll-admin/public/8ea28ca3bfdf27145068e81dd07a34c6.png
-- lib/jekyll-admin/public/99adb54b0f30c0758bb4cb9ed5b80aa8.woff
-- lib/jekyll-admin/public/a770b6797b68e3f8920e473eb824bac0.gif
-- lib/jekyll-admin/public/bfc14ac982326f7d0b1340e20d3e0c37.ttf
-- lib/jekyll-admin/public/bundle.js
-- lib/jekyll-admin/public/bundle.js.map
-- lib/jekyll-admin/public/c8ddf1e5e5bf3682bc7bebf30f394148.woff
-- lib/jekyll-admin/public/d7c639084f684d66a1bc66855d193ed8.svg
-- lib/jekyll-admin/public/e44520ab9079ea7633bfa874bed5d21d.eot
-- lib/jekyll-admin/public/e6cf7c6ec7c2d6f670ae9d762604cb0b.woff2
+- lib/jekyll-admin/public/asset-manifest.json
 - lib/jekyll-admin/public/favicon.ico
 - lib/jekyll-admin/public/index.html
-- lib/jekyll-admin/public/styles.css
-- lib/jekyll-admin/public/styles.css.map
+- lib/jekyll-admin/public/precache-manifest.64226b0470ae7a98d28d6c8a80943541.js
+- lib/jekyll-admin/public/service-worker.js
+- lib/jekyll-admin/public/static/css/2.9311179f.chunk.css
+- lib/jekyll-admin/public/static/css/2.9311179f.chunk.css.map
+- lib/jekyll-admin/public/static/css/main.51bccafc.chunk.css
+- lib/jekyll-admin/public/static/css/main.51bccafc.chunk.css.map
+- lib/jekyll-admin/public/static/js/2.c4e847cc.chunk.js
+- lib/jekyll-admin/public/static/js/2.c4e847cc.chunk.js.LICENSE.txt
+- lib/jekyll-admin/public/static/js/2.c4e847cc.chunk.js.map
+- lib/jekyll-admin/public/static/js/main.2ce220f0.chunk.js
+- lib/jekyll-admin/public/static/js/main.2ce220f0.chunk.js.map
+- lib/jekyll-admin/public/static/js/runtime-main.e35fac22.js
+- lib/jekyll-admin/public/static/js/runtime-main.e35fac22.js.map
+- lib/jekyll-admin/public/static/media/fontawesome-webfont.1dc35d25.ttf
+- lib/jekyll-admin/public/static/media/fontawesome-webfont.25a32416.eot
+- lib/jekyll-admin/public/static/media/fontawesome-webfont.c8ddf1e5.woff
+- lib/jekyll-admin/public/static/media/fontawesome-webfont.d7c63908.svg
+- lib/jekyll-admin/public/static/media/fontawesome-webfont.e6cf7c6e.woff2
+- lib/jekyll-admin/public/static/media/lato-bold.55131026.ttf
+- lib/jekyll-admin/public/static/media/lato-regular.059514c9.ttf
+- lib/jekyll-admin/public/static/media/loader-big.a770b679.gif
+- lib/jekyll-admin/public/static/media/rw-widgets.12f0820c.woff
+- lib/jekyll-admin/public/static/media/rw-widgets.792dcd18.svg
+- lib/jekyll-admin/public/static/media/rw-widgets.bc7c4a59.eot
+- lib/jekyll-admin/public/static/media/rw-widgets.eceddf47.ttf
 - lib/jekyll-admin/server.rb
-- lib/jekyll-admin/server/collection.rb
+- lib/jekyll-admin/server/collections.rb
 - lib/jekyll-admin/server/configuration.rb
 - lib/jekyll-admin/server/data.rb
-- lib/jekyll-admin/server/draft.rb
-- lib/jekyll-admin/server/page.rb
-- lib/jekyll-admin/server/static_file.rb
+- lib/jekyll-admin/server/drafts.rb
+- lib/jekyll-admin/server/pages.rb
+- lib/jekyll-admin/server/site_meta.rb
+- lib/jekyll-admin/server/static_files.rb
 - lib/jekyll-admin/static_server.rb
 - lib/jekyll-admin/urlable.rb
 - lib/jekyll-admin/version.rb
@@ -205,7 +204,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -213,16 +212,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: wp-admin for Jekyll, but better
 test_files: []