Refactor method to reduce ABC Metric size (#6529)
Merge pull request 6529
This commit is contained in:
		
							parent
							
								
									efd9864df6
								
							
						
					
					
						commit
						758ee7ed87
					
				|  | @ -205,27 +205,22 @@ module Jekyll | ||||||
|         # forget to add one of the certificates. |         # forget to add one of the certificates. | ||||||
| 
 | 
 | ||||||
|         private |         private | ||||||
|         # rubocop:disable Metrics/AbcSize |  | ||||||
|         def enable_ssl(opts) |         def enable_ssl(opts) | ||||||
|           return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"] |           cert, key, src = | ||||||
|           if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"] |             opts[:JekyllOptions].values_at("ssl_cert", "ssl_key", "source") | ||||||
|             # rubocop:disable Style/RedundantException | 
 | ||||||
|             raise RuntimeError, "--ssl-cert or --ssl-key missing." |           return if cert.nil? && key.nil? | ||||||
|           end |           raise "Missing --ssl_cert or --ssl_key. Both are required." unless cert && key | ||||||
|  | 
 | ||||||
|           require "openssl" |           require "openssl" | ||||||
|           require "webrick/https" |           require "webrick/https" | ||||||
|           source_key = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], \ | 
 | ||||||
|                     opts[:JekyllOptions]["ssl_key" ]) |           opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(read_file(src, cert)) | ||||||
|           source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], \ |           opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(read_file(src, key)) | ||||||
|                     opts[:JekyllOptions]["ssl_cert"]) |  | ||||||
|           opts[:SSLCertificate] = |  | ||||||
|             OpenSSL::X509::Certificate.new(File.read(source_certificate)) |  | ||||||
|           opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key)) |  | ||||||
|           opts[:SSLEnable] = true |           opts[:SSLEnable] = true | ||||||
|         end |         end | ||||||
| 
 | 
 | ||||||
|         private |         private | ||||||
| 
 |  | ||||||
|         def start_callback(detached) |         def start_callback(detached) | ||||||
|           unless detached |           unless detached | ||||||
|             proc do |             proc do | ||||||
|  | @ -239,6 +234,11 @@ module Jekyll | ||||||
|           file = File.expand_path("../mime.types", __dir__) |           file = File.expand_path("../mime.types", __dir__) | ||||||
|           WEBrick::HTTPUtils.load_mime_types(file) |           WEBrick::HTTPUtils.load_mime_types(file) | ||||||
|         end |         end | ||||||
|  | 
 | ||||||
|  |         private | ||||||
|  |         def read_file(source_dir, file_path) | ||||||
|  |           File.read(Jekyll.sanitized_path(source_dir, file_path)) | ||||||
|  |         end | ||||||
|       end |       end | ||||||
|     end |     end | ||||||
|   end |   end | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue