static-rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d31f3821438735e307f98dd5f4a48215d0b1d678915369a7abd459b3b40145
-  data.tar.gz: bc7b15c689693e533a75ac378db060396cde1839edb0acffc04c30e18872bf77
+  metadata.gz: 3159e387c25a9742f063230f554490e70d41e4be4a318eed738e26480c048cb6
+  data.tar.gz: da86a266cb8bd5559e5ec71d90a84c0ca0539449d8f7259d1ed0654abe3a0c64
 SHA512:
-  metadata.gz: f645e5e515d712acd3c1a81935d560d3ef0f2be3a42e5fd42af4320cf6a4ae25e14843b0c076dfda4ec5b980a12cc436cfbef527768704f97c6e89ac2e7e17f6
-  data.tar.gz: 61600757a2e549dc5bff49b8fe01da9c0f45eac4a1fd6ba815ea4aafb5655270bfa457ac76c98a0927b98e61bcf741b40a0089f0cfb55f612ad0de386b0fa9d4
+  metadata.gz: 4be0b00df5deaacc0c414bf743b78b5feff4f589e44b93378d5de40458e9f56733c83315f9e58cfa9d08c0627d26193994bbec01f86b18924e980e7dc8271f3b
+  data.tar.gz: 1c42430d7193cf13eb21579f5647ecd53f07e010092c2056bef17848aed64a588c8c5919241760fb867e67734d2878559f127c6347b082fe5ef4c77387cc6454

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.5
+
+* Add a site option `compile_404_file_path` to specify a file to be used as a
+  404 page when serving compiled assets and no file is found
+
 ## 0.0.4
 
 * Add a cookie named `_csrf_token` by default to all static site requests, so

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    static-rails (0.0.4)
+    static-rails (0.0.5)
       rack-proxy (~> 0.6)
       railties (>= 5.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3)
-      actionview (= 6.0.3)
-      activesupport (= 6.0.3)
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3)
-      activesupport (= 6.0.3)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.3)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -56,9 +56,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3)
-      actionpack (= 6.0.3)
-      activesupport (= 6.0.3)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)

data/README.md

@@ -153,6 +153,10 @@ To tell the gem about your static sites, assign an array of hashes as `sites`
   path to which production assets are compiled, relative to the site's
   `source_dir`
 
+* **compile_404_file_path** (Optional) When `serve_compiled_assets` is true,
+  this file (relative to the `compile_dir`) will be served whenever the
+  request's path does not match a file on disk
+
 ## Configuring your static site generators
 
 Assuming you won't be mounting your static site to your app's root `/` path,

data/lib/generators/templates/static.rb

@@ -66,6 +66,9 @@ StaticRails.config do |config|
     #
     #   # The destination of production-compiled assets, relative to Rails root
     #   compile_dir: "static/blog/dist"
+    #
+    #   # A 404 page to be sent when serving compiled assets and no file matches
+    #   compile_404_file_path: "404.html"
     # },
   ]
 end

data/lib/static-rails/configuration.rb

@@ -13,10 +13,10 @@ module StaticRails
     # When Rails invokes our Railtie, we'll save off a reference to the Rails app
     attr_accessor :app
 
-    # When true, the ProxyMiddleware will be added
+    # When true, our middleware will proxy requests to static site servers
     attr_accessor :proxy_requests
 
-    # When true, the StaticMiddleware will be added
+    # When true, our middleware will serve sites' compiled asset files
     attr_accessor :serve_compiled_assets
 
     # Number of seconds to wait on sites to confirm servers are ready

data/lib/static-rails/site.rb

@@ -14,6 +14,7 @@ module StaticRails
     :server_path,
     :compile_command,
     :compile_dir,
+    :compile_404_file_path,
     keyword_init: true
   )
 

data/lib/static-rails/static_middleware.rb

@@ -17,7 +17,7 @@ module StaticRails
       if (req.get? || req.head?) && (site = @matches_request_to_static_site.call(req))
         file_handler = file_handler_for(site)
         path = req.path_info.gsub(/^#{site.url_root_path}/, "").chomp("/")
-        if (match = file_handler.match?(path))
+        if (match = matching_file_for(file_handler, site, path))
           req.path_info = match
           return file_handler.serve(req)
         end
@@ -35,5 +35,13 @@ module StaticRails
         StaticRails.config.app.root.join(site.compile_dir).to_s
       )
     end
+
+    def matching_file_for(file_handler, site, path)
+      if (match = file_handler.match?(path))
+        match
+      elsif site.compile_404_file_path.present?
+        file_handler.match?(site.compile_404_file_path)
+      end
+    end
   end
 end

data/lib/static-rails/version.rb

@@ -1,3 +1,3 @@
 module StaticRails
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: static-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Justin Searls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -62,7 +62,6 @@ files:
 - lib/static-rails.rb
 - lib/static-rails/compile.rb
 - lib/static-rails/configuration.rb
-- lib/static-rails/csrf_middleware.rb
 - lib/static-rails/determines_whether_to_handle_request.rb
 - lib/static-rails/error.rb
 - lib/static-rails/gets_csrf_token.rb

data/lib/static-rails/csrf_middleware.rb

@@ -1,20 +0,0 @@
-require_relative "gets_csrf_token"
-
-module StaticRails
-  class CsrfMiddleware
-    def initialize(app)
-      @app = app
-      @gets_csrf_token = GetsCsrfToken.new
-    end
-
-    def call(env)
-      if env["__static_rails_evil_request_for_csrf_token"]
-        req = Rack::Request.new(env)
-        [200, {}, [@gets_csrf_token.call(req)]].tap do
-        end
-      else
-        @app.call(env)
-      end
-    end
-  end
-end