sdoc_live 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c58eaf82f18b4feb7c431156e8ba8be018e22eb57b8b62d69e0e0c503e2085c
-  data.tar.gz: 372965feda50bdc4bc08b196d3acbbc43af6fe2b7fb4461b622bbb4f80c0befa
+  metadata.gz: c308a3b0c63dae1cd0325824aecadac55373be489c0371d7a00710129527533e
+  data.tar.gz: c69d278e885d057d746c433431333a10bd34e9595e9b881a99c8ebe38569914f
 SHA512:
-  metadata.gz: 224cc2e187603628bb1e76664ef87ff8f6c33640d34512d38e7f262b1e96490a3e05dc07ed2cc08f78e372adf8a016bae6c55199f2a9de3c57ebbcc1ea2e5bfb
-  data.tar.gz: dc1222d122c5992e1e9505e752305a28b164b0d55dff3bbdc3f3b19aae4d630c76d6940be15fd45201426e1c548172bea7722b61cf6f3f95eb4ffec2ef02c2f2
+  metadata.gz: f82f91308407a7a993f5fd58bfaf26490e02ad7ee91edfa7d5065faea40411638c461011820efa61f1939bf671915f2de5297bf5fdad9868a0e7fa45ad56b0e9
+  data.tar.gz: 0c0930e0ab7c5196057648904952eadbd8674abd79a2972081b0d0ed698128e01b70c0a4a6ecb4b4490a2061bbdd3d059fe7a458c9c3d49af3cc5e08a5047f82

data/lib/sdoc_live/engine.rb

@@ -6,47 +6,63 @@ module SdocLive
       load File.expand_path("../tasks/sdoc_live.rake", __dir__)
     end
 
-    initializer "sdoc_live.static" do |app|
-      doc_root = (SdocLive.configuration.output_dir || app.root.join("tmp", "doc")).to_s
-
-      SdocLive::Engine.routes.draw do
-        doc_app = ::Rack::Static.new(
-          ->(_) { [404, { "content-type" => "text/plain" }, ["Not Found"]] },
-          urls: ["/"],
-          root: doc_root,
-          index: "index.html"
-        )
-
-        mount doc_app, at: "/"
-      end
+    initializer "sdoc_live.static" do
+      doc_root = (SdocLive.configuration.output_dir || Rails.root.join("tmp", "doc")).to_s
+
+      config.middleware.use(SdocLive::StaticFiles, doc_root)
     end
 
-    initializer "sdoc_live.trailing_slash", after: :add_routing_paths do |app|
-      mount_path = nil
+  end
 
-      app.routes.routes.each do |route|
-        if route.app.respond_to?(:app) && route.app.app == SdocLive::Engine
-          mount_path = route.path.spec.to_s.gsub("(.:format)", "").chomp("/")
-          break
-        end
+  class StaticFiles
+
+    def initialize(app, doc_root)
+      @app = app
+      @doc_root = doc_root
+    end
+
+    def call(env)
+      mount_path = find_mount_path(env)
+      return @app.call(env) unless mount_path
+
+      path_info = env["PATH_INFO"]
+
+      if path_info == mount_path
+        query = env["QUERY_STRING"].to_s.empty? ? "" : "?#{ env['QUERY_STRING'] }"
+        return [301, { "location" => "#{ mount_path }/#{ query }" }, []]
       end
 
-      if mount_path && !mount_path.empty?
-        app.middleware.use(Class.new do
-          define_method(:initialize) { |a| @app = a }
-
-          define_method(:call) do |env|
-            if env["PATH_INFO"] == mount_path && !env["PATH_INFO"].end_with?("/")
-              query = env["QUERY_STRING"].to_s.empty? ? "" : "?#{ env['QUERY_STRING'] }"
-              [301, { "location" => "#{ mount_path }/#{ query }", "content-type" => "text/html" }, ["Redirecting..."]]
-            else
-              @app.call(env)
-            end
-          end
-        end)
+      return @app.call(env) unless path_info.start_with?("#{ mount_path }/")
+
+      relative_path = path_info.delete_prefix(mount_path)
+      relative_path = "/index.html" if relative_path == "/"
+
+      file_path = File.join(@doc_root, relative_path)
+      file_path = File.join(file_path, "index.html") if File.directory?(file_path)
+
+      if File.file?(file_path)
+        serve_file(file_path)
+      else
+        @app.call(env)
+      end
+    end
+
+    private
+
+    def find_mount_path(env)
+      @mount_path ||= begin
+        routes = Rails.application.routes.routes
+        route = routes.detect { |r| r.app.respond_to?(:app) && r.app.app == SdocLive::Engine }
+        route&.path&.spec&.to_s&.gsub("(.:format)", "")&.chomp("/")
       end
     end
 
+    def serve_file(path)
+      content_type = Rack::Mime.mime_type(File.extname(path), "application/octet-stream")
+      body = File.read(path, mode: "rb")
+      [200, { "content-type" => content_type, "content-length" => body.bytesize.to_s }, [body]]
+    end
+
   end
 
 end

data/lib/sdoc_live/version.rb

@@ -1,5 +1,5 @@
 module SdocLive
 
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdoc_live
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - 16554289+optimuspwnius@users.noreply.github.com