jekyll-admin 0.8.0 → 0.10.2

data/lib/jekyll-admin/public/{03945ac4fc7fdefc44bc110bf1ba2393.svg → static/media/rw-widgets.792dcd18.svg}

@@ -1,18 +1,24 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2015 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
 <defs>
 <font id="rw-widgets" horiz-adv-x="1000" >
 <font-face font-family="rw-widgets" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="up-dir" unicode="&#xe800;" d="m571 171q0-14-10-25t-25-10h-500q-15 0-25 10t-11 25 11 26l250 250q10 10 25 10t25-10l250-250q10-11 10-26z" horiz-adv-x="571.4" />
-<glyph glyph-name="left-dir" unicode="&#xe801;" d="m357 600v-500q0-14-10-25t-26-11-25 11l-250 250q-10 11-10 25t10 25l250 250q11 11 25 11t26-11 10-25z" horiz-adv-x="357.1" />
-<glyph glyph-name="right-dir" unicode="&#xe802;" d="m321 350q0-14-10-25l-250-250q-11-11-25-11t-25 11-11 25v500q0 15 11 25t25 11 25-11l250-250q10-10 10-25z" horiz-adv-x="357.1" />
-<glyph glyph-name="down-dir" unicode="&#xe803;" d="m571 457q0-14-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 11-11 25t11 25 25 11h500q14 0 25-11t10-25z" horiz-adv-x="571.4" />
-<glyph glyph-name="calendar" unicode="&#xe804;" d="m71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-8 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 36 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 36 27 63t63 26h35q37 0 63-26t27-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" />
-<glyph glyph-name="clock" unicode="&#xe805;" d="m500 546v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13z m232-196q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
-<glyph glyph-name="search" unicode="&#xe806;" d="m643 386q0 103-74 176t-176 74-177-74-73-176 73-177 177-73 176 73 74 177z m286-465q0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+<glyph glyph-name="up-dir" unicode="&#xe800;" d="M571 171q0-14-10-25t-25-10h-500q-15 0-25 10t-11 25 11 26l250 250q10 10 25 10t25-10l250-250q10-11 10-26z" horiz-adv-x="571.4" />
+
+<glyph glyph-name="search" unicode="&#xe801;" d="M643 386q0 103-73 176t-177 74-177-74-73-176 73-177 177-73 177 73 73 177z m286-465q0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 153-31 125-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="down-dir" unicode="&#xe803;" d="M571 457q0-14-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 11-11 25t11 25 25 11h500q14 0 25-11t10-25z" horiz-adv-x="571.4" />
+
+<glyph glyph-name="calendar" unicode="&#xe804;" d="M71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-7 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 37 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 37 27 63t63 26h35q37 0 64-26t26-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="clock" unicode="&#xe805;" d="M500 546v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13z m232-196q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="angle-left" unicode="&#xf104;" d="M350 546q0-7-6-12l-219-220 219-219q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-260 261q-6 5-6 12t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13z" horiz-adv-x="357.1" />
+
+<glyph glyph-name="angle-right" unicode="&#xf105;" d="M332 314q0-7-5-12l-261-261q-5-5-12-5t-13 5l-28 28q-6 6-6 13t6 13l219 219-219 220q-6 5-6 12t6 13l28 28q5 6 13 6t12-6l261-260q5-5 5-13z" horiz-adv-x="357.1" />
 </font>
 </defs>
 </svg>

data/lib/jekyll-admin/server.rb

@@ -1,101 +1,108 @@
-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, %i[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 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 = 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
-    end
-    alias page_body document_body
-
-    private
-
-    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
-
-require "jekyll-admin/server/collection"
-require "jekyll-admin/server/configuration"
-require "jekyll-admin/server/data"
-require "jekyll-admin/server/draft"
-require "jekyll-admin/server/page"
-require "jekyll-admin/server/static_file"
+# 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/{collection.rb → collections.rb}

@@ -1,82 +1,89 @@
-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 renamed?
-          ensure_requested_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
-        args = {
-          :base         => site.source,
-          :content_type => params["collection_id"],
-          :splat        => params["splat"].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,57 +1,60 @@
-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
-        {
-          "source" => sanitized_path("/"),
-        }
-      end
-
-      # Computed configuration, with updates and defaults
-      def configuration
-        @configuration ||= Jekyll.configuration(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