crystal-lang · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016
Showing with 68 additions and 7 deletions.

+55 −5 src/compiler/crystal/tools/playground/server.cr

+6 −1 src/compiler/crystal/tools/playground/views/layout.html.ecr

+7 −1 src/http/server/handlers/static_file_handler.cr
diff --git a/src/compiler/crystal/tools/playground/server.cr b/src/compiler/crystal/tools/playground/server.cr
@@ -188,9 +188,23 @@ module Crystal::Playground
   end
 
   abstract class PlaygroundPage
+    @resources = [] of Resource
+
     def render_with_layout(io, &block)
       ECR.embed "#{__DIR__}/views/layout.html.ecr", io
     end
+
+    protected def add_resource(kind, src)
+      @resources << Resource.new(kind, src)
+    end
+
+    def each_resource(kind)
+      @resources.each do |res|
+        yield res if res.kind == kind
+      end
+    end
+
+    record Resource, kind : Symbol, src : String
   end
 
   class FileContentPage < PlaygroundPage
@@ -211,13 +225,19 @@ module Crystal::Playground
         end
         content
       rescue e
-        e.message
+        e.message || "Error: generating content for #{@filename}"
       end
     end
 
     def to_s(io)
-      render_with_layout(io) do
-        content
+      body = content
+      # avoid the layout if the file is a full html
+      if File.extname(@filename).starts_with?(".htm") && content.starts_with?("<!")
+        io << body
+      else
+        render_with_layout(io) do
+          body
+        end
       end
     end
 
@@ -294,18 +314,47 @@ module Crystal::Playground
 
   class WorkbookHandler < HTTP::Handler
     def call(context)
-      case {context.request.method, context.request.resource}
+      case {context.request.method, context.request.path}
       when {"GET", /\/workbook\/playground\/(.*)/}
         files = Dir["playground/#{$1}.{md,html,cr}"]
         if files.size > 0
           context.response.headers["Content-Type"] = "text/html"
-          context.response << FileContentPage.new(files[0])
+          page = FileContentPage.new(files[0])
+          load_resources page
+          context.response << page
           return
         end
       end
 
       call_next(context)
     end
+
+    def load_resources(page : PlaygroundPage)
+      Dir["playground/resources/*.css"].each do |file|
+        page.add_resource :css, "/workbook/#{file}"
+      end
+      Dir["playground/resources/*.js"].each do |file|
+        page.add_resource :js, "/workbook/#{file}"
+      end
+    end
+  end
+
+  class PathStaticFileHandler < HTTP::StaticFileHandler
+    def initialize(@path : String, public_dir : String, fallthrough = true)
+      super(public_dir, fallthrough)
+    end
+
+    def call(context)
+      if context.request.path.try &.starts_with?(@path)
+        super
+      else
+        call_next(context)
+      end
+    end
+
+    def request_path(path : String) : String
+      path[@path.size..-1]
+    end
   end
 
   class PathWebSocketHandler < HTTP::WebSocketHandler
@@ -426,6 +475,7 @@ module Crystal::Playground
         PageHandler.new("/about", File.join(views_dir, "_about.html")),
         PageHandler.new("/settings", File.join(views_dir, "_settings.html")),
         PageHandler.new("/workbook", WorkbookIndexPage.new),
+        PathStaticFileHandler.new("/workbook/playground/resources", "playground/resources", false),
         WorkbookHandler.new,
         EnvironmentHandler.new(self),
         HTTP::StaticFileHandler.new(public_dir),

diff --git a/src/compiler/crystal/tools/playground/views/layout.html.ecr b/src/compiler/crystal/tools/playground/views/layout.html.ecr
@@ -7,7 +7,9 @@
     <link rel="stylesheet" href="/vendor/CodeMirror-5.12.0/theme/neat.css">
     <link rel="stylesheet" href="/vendor/octicons-3.5.0/octicons.css">
     <link rel="stylesheet" type="text/css" href="/application.css">
-
+    <% each_resource(:css) do |res| %>
+      <link rel="stylesheet" type="text/css" href="<%= res.src %>">
+    <% end %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
     <title>Crystal Playground</title>
@@ -54,5 +56,8 @@
     <script type="text/javascript" src="/settings.js"></script>
     <script type="text/javascript" src="/session.js"></script>
     <script type="text/javascript" src="/application.js"></script>
+    <% each_resource(:js) do |res| %>
+      <script type="text/javascript" src="<%= res.src %>"></script>
+    <% end %>
   </body>
 </html>
diff --git a/src/http/server/handlers/static_file_handler.cr b/src/http/server/handlers/static_file_handler.cr
@@ -30,7 +30,7 @@ class HTTP::StaticFileHandler < HTTP::Handler
 
     original_path = context.request.path.not_nil!
     is_dir_path = original_path.ends_with? "/"
-    request_path = URI.unescape(original_path)
+    request_path = self.request_path(URI.unescape(original_path))
 
     # File path cannot contains '\0' (NUL) because all filesystem I know
     # don't accept '\0' character as file name.
@@ -67,6 +67,12 @@ class HTTP::StaticFileHandler < HTTP::Handler
     end
   end
 
+  # given a full path of the request, returns the path
+  # of the file that should be expanded at the public_dir
+  protected def request_path(path : String) : String
+    path
+  end
+
   private def redirect_to(context, url)
     context.response.status_code = 302