static-rails 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c9c3f77b3746fd75f797c4c33815e5c699af9e4c1c9a88f56234117406d1b7f
-  data.tar.gz: bf8d899c95891497e8a17492d58315993af2d189f7a3ea3e848937f04e252a81
+  metadata.gz: 03ce2ba0869984457f2559cbb246e1c5c4e7335ff2050fcde5d40b8bb7206d8d
+  data.tar.gz: d77d6cc728e3b107d142ec2f8c72532a1d34e6bd26d44e1b7d6fbf6f4cde525d
 SHA512:
-  metadata.gz: 8ae97c0207f5fcfe0516d78e43738ec6c8def425312dd0af03070c488927ee812824b1ec3742ee21e874e3d8e47568f44e1bd577757aa0054f8a3dcadce7c943
-  data.tar.gz: f840d03e50b3017ecccc9a259d9f89e0ce92dc76b735f47bc6a8873c17efb6f87ece051eb6167f6a11f603e88c5e5c5ca2afac9b9f2d886bf098e63fc0491133
+  metadata.gz: 8edb6f4136b02e64b01e9ca46fb5322eb963a7ec3769b98aa93c71d8c22adb6f6232ef4660c16c049eb8f1ee58d702368918e6aeb5956202ff84605c3c690eb9
+  data.tar.gz: 0452ae2dd5985d8cd7f741a637888262da0d08126edaafa0bafafd0de2bfcbf27b79d033ee41e017a65753a1556df20d37ff25faccbad8e94b71bc60b16f0ace

data/.circleci/config.yml

@@ -13,31 +13,17 @@ jobs:
       # One of the apps needs hugo
       - run: sudo apt-get update && sudo apt-get install -y --no-install-recommends hugo
 
+      # Make sure we use the right Bundler
+      - run: gem install bundler --version `tail -1 Gemfile.lock`
+
       # Bundle install dependencies
       - type: cache-restore
         key: v1-main-{{ checksum "Gemfile.lock" }}
 
-      - run: gem install bundler --version `tail -1 Gemfile.lock`
-      - run: bundle install --path vendor/bundle
-
-      - type: cache-save
-        key: v1-main-{{ checksum "Gemfile.lock" }}
-        paths:
-          - vendor/bundle
-
       # Bundle install dependencies for example app
       - type: cache-restore
         key: v1-example-{{ checksum "example/Gemfile.lock" }}
 
-      - run: |
-          cd example
-          bundle install --path vendor/bundle
-
-      - type: cache-save
-        key: v1-example-{{ checksum "example/Gemfile.lock" }}
-        paths:
-          - example/vendor/bundle
-
       # Yarn dependencies
       - restore_cache:
           keys:
@@ -45,29 +31,10 @@ jobs:
             # fallback to using the latest cache if no exact match is found
             - v2-yarn-
 
-      - run: |
-          cd example
-          yarn install
-
-      - save_cache:
-          paths:
-            - example/node_modules
-            - ~/.cache
-          key: v2-yarn-{{ checksum "example/yarn.lock" }}
-
       # Bundle install dependencies for jekyll app
       - type: cache-restore
         key: v1-jekyll-{{ checksum "example/static/docs/Gemfile.lock" }}
 
-      - run: |
-          cd example/static/docs
-          bundle install --path vendor/bundle
-
-      - type: cache-save
-        key: v1-jekyll-{{ checksum "example/static/docs/Gemfile.lock" }}
-        paths:
-          - example/static/docs/vendor/bundle
-
       # Npm install for Eleventy app
       - restore_cache:
           keys:
@@ -75,16 +42,32 @@ jobs:
             # fallback to using the latest cache if no exact match is found
             - v1-eleventy-
 
-      - run: |
-          cd example/static/blog-docs
-          npm install
+      - run: ./script/setup
+
+      - type: cache-save
+        key: v1-main-{{ checksum "Gemfile.lock" }}
+        paths:
+          - vendor/bundle
+
+      - type: cache-save
+        key: v1-example-{{ checksum "example/Gemfile.lock" }}
+        paths:
+          - example/vendor/bundle
+
+      - save_cache:
+          paths:
+            - example/node_modules
+            - ~/.cache
+          key: v2-yarn-{{ checksum "example/yarn.lock" }}
+
+      - type: cache-save
+        key: v1-jekyll-{{ checksum "example/static/docs/Gemfile.lock" }}
+        paths:
+          - example/static/docs/vendor/bundle
 
       - save_cache:
           paths:
             - example/static/blog-docs/node_modules
           key: v1-eleventy-{{ checksum "example/static/blog-docs/package-lock.json" }}
 
-      - run: bundle exec rake standard:fix
-      - run: |
-          cd example
-          ./script/test
+      - run: ./script/test

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/bundle
+/example/vendor/bundle

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.13
+
+* 404 pages served in production via a site's `compile_404_file_path` setting
+  will now also send the HTTP status code of 404 instead of 200
+
 ## 0.0.12
 
 * Fix an issue in which enabling force_ssl would result in redirects to the

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    static-rails (0.0.12)
+    static-rails (0.0.13)
       rack-proxy (~> 0.6)
       railties (>= 5.0.0)
 
@@ -40,7 +40,7 @@ GEM
     method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
     parser (2.7.1.3)
@@ -87,7 +87,7 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/lib/static-rails/static_middleware.rb

@@ -18,8 +18,8 @@ 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 (found = find_file_for(file_handler, site, path, req.accept_encoding))
-          return file_handler.serve(req, *found)
+        if (result = serve_file_for(file_handler, site, path, req))
+          return result
         end
       end
 
@@ -40,11 +40,19 @@ module StaticRails
       )
     end
 
-    def find_file_for(file_handler, site, path, accept_encoding)
-      if (found = file_handler.find_file(path, accept_encoding: accept_encoding))
-        found
+    def serve_file_for(file_handler, site, path, req)
+      if (found = file_handler.find_file(path, accept_encoding: req.accept_encoding))
+        serve_file(file_handler, found, req)
       elsif site.compile_404_file_path.present?
-        file_handler.find_file(site.compile_404_file_path, accept_encoding: accept_encoding)
+        found = file_handler.find_file(site.compile_404_file_path, accept_encoding: req.accept_encoding)
+        serve_file(file_handler, found, req, 404)
+      end
+    end
+
+    def serve_file(file_handler, file, req, status_override = nil)
+      return unless file
+      file_handler.serve(req, *file).tap do |result|
+        result[0] = status_override unless status_override.nil?
       end
     end
   end

data/lib/static-rails/version.rb

@@ -1,3 +1,3 @@
 module StaticRails
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/script/setup

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "--> Installing static-rails' Ruby deps"
+bundle install --path vendor/bundle
+
+echo "--> Installing example app's Ruby deps"
+cd example
+bundle install --path vendor/bundle
+cd ..
+
+echo "--> Installing example app's JS deps"
+cd example
+yarn install
+cd ..
+
+echo "--> Installing example app's Jekyll site's Ruby deps"
+cd example/static/docs
+bundle install --path vendor/bundle
+cd ../../..
+
+echo "--> Installing example app's Eleventy site's JS deps"
+cd example/static/blog-docs
+npm install
+cd ../../..
+
+

data/script/test

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "--> Running standard:fix"
+bundle exec rake standard:fix
+
+echo "--> Running example app's tests"
+cd example
+./script/test
+cd ..

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: static-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Justin Searls
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-description: 
+description:
 email:
 - searls@gmail.com
 executables: []
@@ -81,13 +81,15 @@ files:
 - lib/static-rails/version.rb
 - lib/static-rails/waits_for_connection.rb
 - lib/tasks/static-rails.rake
+- script/setup
+- script/test
 - static-rails.gemspec
 homepage: https://github.com/testdouble/static-rails
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/testdouble/static-rails
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Build & serve static sites (e.g. Jekyll, Hugo) from your Rails app
 test_files: []