static-rails 0.0.8 → 0.0.13

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 760a85803ecdc64592ce6f0f29e948fe744ff7e0d5d893f62f713f11aa7de9cb
4
- data.tar.gz: 235ed594c1bf01dba53e028e3419ce1f5919e14de31441c5fb3f6a0b3b3de382
3
+ metadata.gz: 03ce2ba0869984457f2559cbb246e1c5c4e7335ff2050fcde5d40b8bb7206d8d
4
+ data.tar.gz: d77d6cc728e3b107d142ec2f8c72532a1d34e6bd26d44e1b7d6fbf6f4cde525d
5
5
  SHA512:
6
- metadata.gz: fd446ac15d01e261594e66388afada570c203046d0dcaa52437c43aca8cc8f5a09c19ce1e87aa699b7b9407a3f9993328e285aa1a4aaf53035493fd2cde7a28d
7
- data.tar.gz: 592a87c638a0f861c673566746b591700e256de4eae4d3b28218d6faa6e994e5c3cccf589f3a2d16d850275d8d5db079661ac03aee17e6bc62ecf62b28cdc538
6
+ metadata.gz: 8edb6f4136b02e64b01e9ca46fb5322eb963a7ec3769b98aa93c71d8c22adb6f6232ef4660c16c049eb8f1ee58d702368918e6aeb5956202ff84605c3c690eb9
7
+ data.tar.gz: 0452ae2dd5985d8cd7f741a637888262da0d08126edaafa0bafafd0de2bfcbf27b79d033ee41e017a65753a1556df20d37ff25faccbad8e94b71bc60b16f0ace
@@ -13,31 +13,17 @@ jobs:
13
13
  # One of the apps needs hugo
14
14
  - run: sudo apt-get update && sudo apt-get install -y --no-install-recommends hugo
15
15
 
16
+ # Make sure we use the right Bundler
17
+ - run: gem install bundler --version `tail -1 Gemfile.lock`
18
+
16
19
  # Bundle install dependencies
17
20
  - type: cache-restore
18
21
  key: v1-main-{{ checksum "Gemfile.lock" }}
19
22
 
20
- - run: gem install bundler --version `tail -1 Gemfile.lock`
21
- - run: bundle install --path vendor/bundle
22
-
23
- - type: cache-save
24
- key: v1-main-{{ checksum "Gemfile.lock" }}
25
- paths:
26
- - vendor/bundle
27
-
28
23
  # Bundle install dependencies for example app
29
24
  - type: cache-restore
30
25
  key: v1-example-{{ checksum "example/Gemfile.lock" }}
31
26
 
32
- - run: |
33
- cd example
34
- bundle install --path vendor/bundle
35
-
36
- - type: cache-save
37
- key: v1-example-{{ checksum "example/Gemfile.lock" }}
38
- paths:
39
- - example/vendor/bundle
40
-
41
27
  # Yarn dependencies
42
28
  - restore_cache:
43
29
  keys:
@@ -45,29 +31,10 @@ jobs:
45
31
  # fallback to using the latest cache if no exact match is found
46
32
  - v2-yarn-
47
33
 
48
- - run: |
49
- cd example
50
- yarn install
51
-
52
- - save_cache:
53
- paths:
54
- - example/node_modules
55
- - ~/.cache
56
- key: v2-yarn-{{ checksum "example/yarn.lock" }}
57
-
58
34
  # Bundle install dependencies for jekyll app
59
35
  - type: cache-restore
60
36
  key: v1-jekyll-{{ checksum "example/static/docs/Gemfile.lock" }}
61
37
 
62
- - run: |
63
- cd example/static/docs
64
- bundle install --path vendor/bundle
65
-
66
- - type: cache-save
67
- key: v1-jekyll-{{ checksum "example/static/docs/Gemfile.lock" }}
68
- paths:
69
- - example/static/docs/vendor/bundle
70
-
71
38
  # Npm install for Eleventy app
72
39
  - restore_cache:
73
40
  keys:
@@ -75,16 +42,32 @@ jobs:
75
42
  # fallback to using the latest cache if no exact match is found
76
43
  - v1-eleventy-
77
44
 
78
- - run: |
79
- cd example/static/blog-docs
80
- npm install
45
+ - run: ./script/setup
46
+
47
+ - type: cache-save
48
+ key: v1-main-{{ checksum "Gemfile.lock" }}
49
+ paths:
50
+ - vendor/bundle
51
+
52
+ - type: cache-save
53
+ key: v1-example-{{ checksum "example/Gemfile.lock" }}
54
+ paths:
55
+ - example/vendor/bundle
56
+
57
+ - save_cache:
58
+ paths:
59
+ - example/node_modules
60
+ - ~/.cache
61
+ key: v2-yarn-{{ checksum "example/yarn.lock" }}
62
+
63
+ - type: cache-save
64
+ key: v1-jekyll-{{ checksum "example/static/docs/Gemfile.lock" }}
65
+ paths:
66
+ - example/static/docs/vendor/bundle
81
67
 
82
68
  - save_cache:
83
69
  paths:
84
70
  - example/static/blog-docs/node_modules
85
71
  key: v1-eleventy-{{ checksum "example/static/blog-docs/package-lock.json" }}
86
72
 
87
- - run: bundle exec rake standard:fix
88
- - run: |
89
- cd example
90
- ./script/test
73
+ - run: ./script/test
data/.gitignore CHANGED
@@ -6,3 +6,5 @@
6
6
  /pkg/
7
7
  /spec/reports/
8
8
  /tmp/
9
+ /vendor/bundle
10
+ /example/vendor/bundle
@@ -1,3 +1,34 @@
1
+ ## 0.0.13
2
+
3
+ * 404 pages served in production via a site's `compile_404_file_path` setting
4
+ will now also send the HTTP status code of 404 instead of 200
5
+
6
+ ## 0.0.12
7
+
8
+ * Fix an issue in which enabling force_ssl would result in redirects to the
9
+ obfuscated `/_static_rails/` path. Resolved this by placing the static-rails
10
+ middleware after `ActionDispatch::SSL`. Note that this will break if you
11
+ remove `Rack::SendFile` from your app's middleware stack
12
+
13
+ ## 0.0.11
14
+
15
+ * Inline the `ActionDispatch::FileHandler` from Rails master so that we can
16
+ target a single stable version of its API and control what MIME types it
17
+ considers to be compressible (bonus is that it effectively backports brotli
18
+ compression to pre-6.1 rails apps)
19
+
20
+ ## 0.0.10
21
+
22
+ * Change default `cache-control` header for static assets being served from disk
23
+ from `no-cache` to `"public; max-age=31536000"`
24
+
25
+ ## 0.0.9
26
+
27
+ * When using CSRF protection, the artificial path info will now be
28
+ "__static_rails__" instead of a random string, to make logs appear cleaner
29
+ * Attempt to guard against future internal changes to Rails' request forgery
30
+ protection by adding `method_missing` that calls through
31
+
1
32
  ## 0.0.8
2
33
 
3
34
  * Add support for the [CSRF
@@ -1,27 +1,27 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- static-rails (0.0.8)
4
+ static-rails (0.0.13)
5
5
  rack-proxy (~> 0.6)
6
6
  railties (>= 5.0.0)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actionpack (6.0.3.1)
12
- actionview (= 6.0.3.1)
13
- activesupport (= 6.0.3.1)
11
+ actionpack (6.0.3.2)
12
+ actionview (= 6.0.3.2)
13
+ activesupport (= 6.0.3.2)
14
14
  rack (~> 2.0, >= 2.0.8)
15
15
  rack-test (>= 0.6.3)
16
16
  rails-dom-testing (~> 2.0)
17
17
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
18
- actionview (6.0.3.1)
19
- activesupport (= 6.0.3.1)
18
+ actionview (6.0.3.2)
19
+ activesupport (= 6.0.3.2)
20
20
  builder (~> 3.1)
21
21
  erubi (~> 1.4)
22
22
  rails-dom-testing (~> 2.0)
23
23
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
24
- activesupport (6.0.3.1)
24
+ activesupport (6.0.3.2)
25
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
26
26
  i18n (>= 0.7, < 2)
27
27
  minitest (~> 5.1)
@@ -34,18 +34,18 @@ GEM
34
34
  erubi (1.9.0)
35
35
  i18n (1.8.3)
36
36
  concurrent-ruby (~> 1.0)
37
- loofah (2.5.0)
37
+ loofah (2.6.0)
38
38
  crass (~> 1.0.2)
39
39
  nokogiri (>= 1.5.9)
40
40
  method_source (1.0.0)
41
41
  mini_portile2 (2.4.0)
42
42
  minitest (5.14.1)
43
- nokogiri (1.10.9)
43
+ nokogiri (1.10.10)
44
44
  mini_portile2 (~> 2.4.0)
45
45
  parallel (1.19.1)
46
46
  parser (2.7.1.3)
47
47
  ast (~> 2.4.0)
48
- rack (2.2.2)
48
+ rack (2.2.3)
49
49
  rack-proxy (0.6.5)
50
50
  rack
51
51
  rack-test (1.1.0)
@@ -55,9 +55,9 @@ GEM
55
55
  nokogiri (>= 1.6)
56
56
  rails-html-sanitizer (1.3.0)
57
57
  loofah (~> 2.3)
58
- railties (6.0.3.1)
59
- actionpack (= 6.0.3.1)
60
- activesupport (= 6.0.3.1)
58
+ railties (6.0.3.2)
59
+ actionpack (= 6.0.3.2)
60
+ activesupport (= 6.0.3.2)
61
61
  method_source
62
62
  rake (>= 0.8.7)
63
63
  thor (>= 0.20.3, < 2.0)
@@ -87,7 +87,7 @@ GEM
87
87
  tzinfo (1.2.7)
88
88
  thread_safe (~> 0.1)
89
89
  unicode-display_width (1.7.0)
90
- zeitwerk (2.3.0)
90
+ zeitwerk (2.4.0)
91
91
 
92
92
  PLATFORMS
93
93
  ruby
@@ -34,14 +34,14 @@ StaticRails.config do |config|
34
34
  # url_root_path: "/",
35
35
  #
36
36
  # # Don't serve/redirect routes whose paths start with these strings
37
- # url_skip_paths_starting_with: ["/api"]
37
+ # url_skip_paths_starting_with: ["/api"],
38
38
  #
39
39
  # # Whether to run the local development/test server or not
40
40
  # start_server: !Rails.env.production?,
41
41
  #
42
42
  # # If start_server is true, wait to proxy requests to the server until it
43
43
  # # can connect to server_host over TCP on server_port
44
- # ping_server: true
44
+ # ping_server: true,
45
45
  #
46
46
  # # Any environment variables you need to pass to the server & compile
47
47
  # # commands as a hash (e.g. `env: {"BUNDLE_PATH" => "vendor/bundle"}`)
@@ -65,7 +65,7 @@ StaticRails.config do |config|
65
65
  # compile_command: "hugo",
66
66
  #
67
67
  # # The destination of production-compiled assets, relative to Rails root
68
- # compile_dir: "static/blog/dist"
68
+ # compile_dir: "static/blog/dist",
69
69
  #
70
70
  # # A 404 page to be sent when serving compiled assets and no file matches
71
71
  # compile_404_file_path: "404.html"
@@ -36,7 +36,7 @@ module StaticRails
36
36
  attr_reader :sites
37
37
  def sites=(sites)
38
38
  @sites = Array.wrap(sites).map { |site|
39
- Site.new(site)
39
+ Site.new(**site)
40
40
  }
41
41
  end
42
42
  end
@@ -0,0 +1,173 @@
1
+ module StaticRails
2
+ # This class was extracted from Ruby on Rails:
3
+ #
4
+ # - actionpack/lib/action_dispatch/middleware/static.rb
5
+ #
6
+ # Copyright (c) 2005-2020 David Heinemeier Hansson, Ryan Edward Hall, Jeremy Daer
7
+ #
8
+ # License here: https://github.com/rails/rails/blob/master/MIT-LICENSE
9
+ #
10
+ # This endpoint serves static files from disk using Rack::File.
11
+ #
12
+ # URL paths are matched with static files according to expected
13
+ # conventions: +path+, +path+.html, +path+/index.html.
14
+ #
15
+ # Precompressed versions of these files are checked first. Brotli (.br)
16
+ # and gzip (.gz) files are supported. If +path+.br exists, this
17
+ # endpoint returns that file with a +Content-Encoding: br+ header.
18
+ #
19
+ # If no matching file is found, this endpoint responds 404 Not Found.
20
+ #
21
+ # Pass the +root+ directory to search for matching files, an optional
22
+ # +index: "index"+ to change the default +path+/index.html, and optional
23
+ # additional response headers.
24
+ class FileHandler
25
+ # Accept-Encoding value -> file extension
26
+ PRECOMPRESSED = {
27
+ "br" => ".br",
28
+ "gzip" => ".gz",
29
+ "identity" => nil
30
+ }
31
+
32
+ def initialize(root, index: "index", headers: {}, precompressed: %i[br gzip], compressible_content_types: /\A(?:text\/|application\/javascript)/)
33
+ @root = root.chomp("/").b
34
+ @index = index
35
+
36
+ @precompressed = Array(precompressed).map(&:to_s) | %w[identity]
37
+ @compressible_content_types = compressible_content_types
38
+
39
+ @file_server = ::Rack::File.new(@root, headers)
40
+ end
41
+
42
+ def call(env)
43
+ attempt(env) || @file_server.call(env)
44
+ end
45
+
46
+ def attempt(env)
47
+ request = Rack::Request.new env
48
+
49
+ if request.get? || request.head?
50
+ if (found = find_file(request.path_info, accept_encoding: request.accept_encoding))
51
+ serve request, *found
52
+ end
53
+ end
54
+ end
55
+
56
+ def serve(request, filepath, content_headers)
57
+ original, request.path_info =
58
+ request.path_info, ::Rack::Utils.escape_path(filepath).b
59
+
60
+ @file_server.call(request.env).tap do |status, headers, body|
61
+ # Omit Content-Encoding/Type/etc headers for 304 Not Modified
62
+ if status != 304
63
+ headers.update(content_headers)
64
+ end
65
+ end
66
+ ensure
67
+ request.path_info = original
68
+ end
69
+
70
+ # Match a URI path to a static file to be served.
71
+ #
72
+ # Used by the +Static+ class to negotiate a servable file in the
73
+ # +public/+ directory (see Static#call).
74
+ #
75
+ # Checks for +path+, +path+.html, and +path+/index.html files,
76
+ # in that order, including .br and .gzip compressed extensions.
77
+ #
78
+ # If a matching file is found, the path and necessary response headers
79
+ # (Content-Type, Content-Encoding) are returned.
80
+ def find_file(path_info, accept_encoding:)
81
+ each_candidate_filepath(path_info) do |filepath, content_type|
82
+ if (response = try_files(filepath, content_type, accept_encoding: accept_encoding))
83
+ return response
84
+ end
85
+ end
86
+ end
87
+
88
+ private
89
+
90
+ def try_files(filepath, content_type, accept_encoding:)
91
+ headers = {"Content-Type" => content_type}
92
+
93
+ if compressible? content_type
94
+ try_precompressed_files filepath, headers, accept_encoding: accept_encoding
95
+ elsif file_readable? filepath
96
+ [filepath, headers]
97
+ end
98
+ end
99
+
100
+ def try_precompressed_files(filepath, headers, accept_encoding:)
101
+ each_precompressed_filepath(filepath) do |content_encoding, precompressed_filepath|
102
+ if file_readable? precompressed_filepath
103
+ # Identity encoding is default, so we skip Accept-Encoding
104
+ # negotiation and needn't set Content-Encoding.
105
+ #
106
+ # Vary header is expected when we've found other available
107
+ # encodings that Accept-Encoding ruled out.
108
+ if content_encoding == "identity"
109
+ return precompressed_filepath, headers
110
+ else
111
+ headers["Vary"] = "Accept-Encoding"
112
+
113
+ if accept_encoding.any? { |enc, _| /\b#{content_encoding}\b/i.match?(enc) }
114
+ headers["Content-Encoding"] = content_encoding
115
+ return precompressed_filepath, headers
116
+ end
117
+ end
118
+ end
119
+ end
120
+ end
121
+
122
+ def file_readable?(path)
123
+ file_stat = File.stat(File.join(@root, path.b))
124
+ rescue SystemCallError
125
+ false
126
+ else
127
+ file_stat.file? && file_stat.readable?
128
+ end
129
+
130
+ def compressible?(content_type)
131
+ @compressible_content_types.match?(content_type)
132
+ end
133
+
134
+ def each_precompressed_filepath(filepath)
135
+ @precompressed.each do |content_encoding|
136
+ precompressed_ext = PRECOMPRESSED.fetch(content_encoding)
137
+ yield content_encoding, "#{filepath}#{precompressed_ext}"
138
+ end
139
+
140
+ nil
141
+ end
142
+
143
+ def each_candidate_filepath(path_info)
144
+ return unless (path = clean_path(path_info))
145
+
146
+ ext = ::File.extname(path)
147
+ content_type = ::Rack::Mime.mime_type(ext, nil)
148
+ yield path, content_type || "text/plain"
149
+
150
+ # Tack on .html and /index.html only for paths that don't have
151
+ # an explicit, resolvable file extension. No need to check
152
+ # for foo.js.html and foo.js/index.html.
153
+ unless content_type
154
+ default_ext = ::ActionController::Base.default_static_extension
155
+ if ext != default_ext
156
+ default_content_type = ::Rack::Mime.mime_type(default_ext, "text/plain")
157
+
158
+ yield "#{path}#{default_ext}", default_content_type
159
+ yield "#{path}/#{@index}#{default_ext}", default_content_type
160
+ end
161
+ end
162
+
163
+ nil
164
+ end
165
+
166
+ def clean_path(path_info)
167
+ path = ::Rack::Utils.unescape_path path_info.chomp("/")
168
+ if ::Rack::Utils.valid_path? path
169
+ ::Rack::Utils.clean_path_info path
170
+ end
171
+ end
172
+ end
173
+ end
@@ -1,21 +1,27 @@
1
+ require_relative "request_forgery_protection_fallback"
2
+
1
3
  module StaticRails
2
4
  class GetsCsrfToken
5
+ include RequestForgeryProtectionFallback
6
+
3
7
  def call(req)
4
8
  masked_authenticity_token(req.session)
5
9
  end
6
10
 
7
11
  private
8
12
 
9
- def csrf_token_hmac(session, identifier)
10
- ActionController::RequestForgeryProtection.instance_method(:csrf_token_hmac).bind(self).call(session, identifier)
11
- end
12
-
13
- def mask_token(raw_token)
14
- ActionController::RequestForgeryProtection.instance_method(:mask_token).bind(self).call(raw_token)
13
+ [
14
+ :csrf_token_hmac,
15
+ :mask_token,
16
+ :xor_byte_strings
17
+ ].each do |method|
18
+ define_method method do |*args, **kwargs, &blk|
19
+ ActionController::RequestForgeryProtection.instance_method(method).bind(self).call(*args, **kwargs, &blk)
20
+ end
15
21
  end
16
22
 
17
23
  def masked_authenticity_token(session, form_options: {})
18
- ActionController::RequestForgeryProtection.instance_method(:masked_authenticity_token).bind(self).call(session, form_options)
24
+ ActionController::RequestForgeryProtection.instance_method(:masked_authenticity_token).bind(self).call(session, form_options: form_options)
19
25
  end
20
26
 
21
27
  def global_csrf_token(session)
@@ -26,10 +32,6 @@ module StaticRails
26
32
  ActionController::RequestForgeryProtection.instance_method(:real_csrf_token).bind(self).call(session)
27
33
  end
28
34
 
29
- def xor_byte_strings(s1, s2)
30
- ActionController::RequestForgeryProtection.instance_method(:xor_byte_strings).bind(self).call(s1, s2)
31
- end
32
-
33
35
  def per_form_csrf_tokens
34
36
  false
35
37
  end
@@ -17,7 +17,6 @@ module StaticRails
17
17
 
18
18
  server_store = ServerStore.instance
19
19
  server_store.ensure_all_servers_are_started
20
- server_store.ensure_servers_are_up
21
20
 
22
21
  req = Rack::Request.new(env)
23
22
  if (req.get? || req.head?) && (site = @matches_request_to_static_site.call(req))
@@ -10,7 +10,7 @@ module StaticRails
10
10
  end
11
11
 
12
12
  initializer "static_rails.middleware" do
13
- config.app_middleware.insert_before 0, SiteMiddleware
13
+ config.app_middleware.insert_after Rack::Sendfile, SiteMiddleware
14
14
  config.app_middleware.use SitePlusCsrfMiddleware
15
15
  end
16
16
 
@@ -0,0 +1,19 @@
1
+ module StaticRails
2
+ module RequestForgeryProtectionFallback
3
+ def method_missing(method_name, *args, **kwargs, &blk)
4
+ if respond_to?(method_name)
5
+ ActionController::RequestForgeryProtection.instance_method(method_name).bind(self).call(*args, **kwargs, &blk)
6
+ else
7
+ super
8
+ end
9
+ end
10
+
11
+ def respond_to?(method_name, *args)
12
+ ActionController::RequestForgeryProtection.instance_method(method_name) || super
13
+ end
14
+
15
+ def respond_to_missing?(method_name, *args)
16
+ ActionController::RequestForgeryProtection.instance_method(method_name) || super
17
+ end
18
+ end
19
+ end
@@ -16,10 +16,6 @@ module StaticRails
16
16
  @servers[site] ||= Server.new(site)
17
17
  end
18
18
 
19
- def ensure_servers_are_up
20
- @servers.values.each(&:start)
21
- end
22
-
23
19
  private
24
20
 
25
21
  def initialize
@@ -4,7 +4,7 @@ require_relative "determines_whether_to_handle_request"
4
4
 
5
5
  module StaticRails
6
6
  class SiteMiddleware
7
- PATH_INFO_OBFUSCATION = "JujJVj31M3SpzTjIGBJ2-3iE0lKXOIOlbLuk9Lxwe-Ll2uLuwH5KD8dmt1MqyZ"
7
+ PATH_INFO_OBFUSCATION = "__static-rails__"
8
8
 
9
9
  def initialize(app)
10
10
  @app = app
@@ -40,7 +40,7 @@ module StaticRails
40
40
  #
41
41
  # (By the way, this was all Matthew Draper's bright idea. You can
42
42
  # compliment him here: https://github.com/matthewd )
43
- @app.call(env.merge("PATH_INFO" => PATH_INFO_OBFUSCATION + env["PATH_INFO"]))
43
+ @app.call(env.merge("PATH_INFO" => "/" + PATH_INFO_OBFUSCATION + env["PATH_INFO"]))
44
44
  elsif StaticRails.config.proxy_requests
45
45
  @proxy_middleware.call(env)
46
46
  elsif StaticRails.config.serve_compiled_assets
@@ -13,10 +13,10 @@ module StaticRails
13
13
  end
14
14
 
15
15
  def call(env)
16
- return @app.call(env) unless env["PATH_INFO"]&.start_with?(PATH_INFO_OBFUSCATION) || @determines_whether_to_handle_request.call(env)
16
+ return @app.call(env) unless env["PATH_INFO"]&.start_with?(/\/?#{PATH_INFO_OBFUSCATION}/) || @determines_whether_to_handle_request.call(env)
17
17
 
18
18
  env = env.merge(
19
- "PATH_INFO" => env["PATH_INFO"].gsub(/^#{PATH_INFO_OBFUSCATION}/, "")
19
+ "PATH_INFO" => env["PATH_INFO"].gsub(/^\/?#{PATH_INFO_OBFUSCATION}/, "")
20
20
  )
21
21
  status, headers, body = super(env)
22
22
 
@@ -1,6 +1,6 @@
1
1
  require "rack-proxy"
2
- require "action_dispatch/middleware/static"
3
2
 
3
+ require_relative "file_handler"
4
4
  require_relative "matches_request_to_static_site"
5
5
 
6
6
  module StaticRails
@@ -18,9 +18,8 @@ module StaticRails
18
18
  if (req.get? || req.head?) && (site = @matches_request_to_static_site.call(req))
19
19
  file_handler = file_handler_for(site)
20
20
  path = req.path_info.gsub(/^#{site.url_root_path}/, "").chomp("/")
21
- if (match = matching_file_for(file_handler, site, path))
22
- req.path_info = match
23
- return file_handler.serve(req)
21
+ if (result = serve_file_for(file_handler, site, path, req))
22
+ return result
24
23
  end
25
24
  end
26
25
 
@@ -32,16 +31,28 @@ module StaticRails
32
31
  # The same file handler used by Rails when serving up files from /public
33
32
  # See: actionpack/lib/action_dispatch/middleware/static.rb
34
33
  def file_handler_for(site)
35
- @file_handlers[site] ||= ActionDispatch::FileHandler.new(
36
- StaticRails.config.app.root.join(site.compile_dir).to_s
34
+ @file_handlers[site] ||= FileHandler.new(
35
+ StaticRails.config.app.root.join(site.compile_dir).to_s,
36
+ headers: {
37
+ "cache-control" => "public; max-age=31536000"
38
+ },
39
+ compressible_content_types: /^text\/|[\/+](javascript|json|text|xml|css|yaml)$/i
37
40
  )
38
41
  end
39
42
 
40
- def matching_file_for(file_handler, site, path)
41
- if (match = file_handler.match?(path))
42
- match
43
+ def serve_file_for(file_handler, site, path, req)
44
+ if (found = file_handler.find_file(path, accept_encoding: req.accept_encoding))
45
+ serve_file(file_handler, found, req)
43
46
  elsif site.compile_404_file_path.present?
44
- file_handler.match?(site.compile_404_file_path)
47
+ found = file_handler.find_file(site.compile_404_file_path, accept_encoding: req.accept_encoding)
48
+ serve_file(file_handler, found, req, 404)
49
+ end
50
+ end
51
+
52
+ def serve_file(file_handler, file, req, status_override = nil)
53
+ return unless file
54
+ file_handler.serve(req, *file).tap do |result|
55
+ result[0] = status_override unless status_override.nil?
45
56
  end
46
57
  end
47
58
  end
@@ -1,5 +1,9 @@
1
+ require_relative "request_forgery_protection_fallback"
2
+
1
3
  module StaticRails
2
4
  class ValidatesCsrfToken
5
+ include RequestForgeryProtectionFallback
6
+
3
7
  def call(req)
4
8
  valid_authenticity_token?(req.session, req.cookies["_csrf_token"])
5
9
  end
@@ -1,3 +1,3 @@
1
1
  module StaticRails
2
- VERSION = "0.0.8"
2
+ VERSION = "0.0.13"
3
3
  end
@@ -0,0 +1,28 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ echo "--> Installing static-rails' Ruby deps"
6
+ bundle install --path vendor/bundle
7
+
8
+ echo "--> Installing example app's Ruby deps"
9
+ cd example
10
+ bundle install --path vendor/bundle
11
+ cd ..
12
+
13
+ echo "--> Installing example app's JS deps"
14
+ cd example
15
+ yarn install
16
+ cd ..
17
+
18
+ echo "--> Installing example app's Jekyll site's Ruby deps"
19
+ cd example/static/docs
20
+ bundle install --path vendor/bundle
21
+ cd ../../..
22
+
23
+ echo "--> Installing example app's Eleventy site's JS deps"
24
+ cd example/static/blog-docs
25
+ npm install
26
+ cd ../../..
27
+
28
+
@@ -0,0 +1,11 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -e
4
+
5
+ echo "--> Running standard:fix"
6
+ bundle exec rake standard:fix
7
+
8
+ echo "--> Running example app's tests"
9
+ cd example
10
+ ./script/test
11
+ cd ..
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: static-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Searls
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-06-08 00:00:00.000000000 Z
11
+ date: 2020-07-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -38,7 +38,7 @@ dependencies:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0.6'
41
- description:
41
+ description:
42
42
  email:
43
43
  - searls@gmail.com
44
44
  executables: []
@@ -64,11 +64,13 @@ files:
64
64
  - lib/static-rails/configuration.rb
65
65
  - lib/static-rails/determines_whether_to_handle_request.rb
66
66
  - lib/static-rails/error.rb
67
+ - lib/static-rails/file_handler.rb
67
68
  - lib/static-rails/gets_csrf_token.rb
68
69
  - lib/static-rails/matches_request_to_static_site.rb
69
70
  - lib/static-rails/proxy_middleware.rb
70
71
  - lib/static-rails/rack_server_check.rb
71
72
  - lib/static-rails/railtie.rb
73
+ - lib/static-rails/request_forgery_protection_fallback.rb
72
74
  - lib/static-rails/server.rb
73
75
  - lib/static-rails/server_store.rb
74
76
  - lib/static-rails/site.rb
@@ -79,13 +81,15 @@ files:
79
81
  - lib/static-rails/version.rb
80
82
  - lib/static-rails/waits_for_connection.rb
81
83
  - lib/tasks/static-rails.rake
84
+ - script/setup
85
+ - script/test
82
86
  - static-rails.gemspec
83
87
  homepage: https://github.com/testdouble/static-rails
84
88
  licenses:
85
89
  - MIT
86
90
  metadata:
87
91
  homepage_uri: https://github.com/testdouble/static-rails
88
- post_install_message:
92
+ post_install_message:
89
93
  rdoc_options: []
90
94
  require_paths:
91
95
  - lib
@@ -101,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
101
105
  version: '0'
102
106
  requirements: []
103
107
  rubygems_version: 3.1.2
104
- signing_key:
108
+ signing_key:
105
109
  specification_version: 4
106
110
  summary: Build & serve static sites (e.g. Jekyll, Hugo) from your Rails app
107
111
  test_files: []