ruby-nginx 1.0.0.pre.beta.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ed81e982f332b222ea6f29a2e223ad1e114e5fb57953277defad3a164ca383
-  data.tar.gz: b68c5854801f99463f05401990c434d6dbe8de74f401c03a6b2edd5a6fb13019
+  metadata.gz: 7e053789e61b0bf22afb92ea549a0ecb68bc4615761ae7342ff246e095100932
+  data.tar.gz: de3c4bd02f4745cca14cbf15f034a5187c10d3cddd083b1948ab63d9d958a6d2
 SHA512:
-  metadata.gz: 7446042ae6a1a49eb49f034a455497d3a7eb4032800e124520db8ba74ef0a937a394de8b24cd58bb7cc12340b1d569574e5ef4e9fae0d25eeb3131d499979833
-  data.tar.gz: d3b9bc26b024f25b1925f7f18a51bd0a13f0753434458b6fc6ce4d9c59cfed661b534522b84851220bc16327f5654ad7dd00d85878b5dd3c3088ed2c21a452a1
+  metadata.gz: 154b601c107623263d962fdcb5832d8143a579e2725dfe8788f7f764aa6fed22d7bf955ed248227385e484e9183008fb5231eae078c39febe7491f4e309a9bfa
+  data.tar.gz: 128c4ff6ae5b29351872953e7597ed900219178855ea4f53f9953ce3b31973b71dfb4e429710fac82339072811d4c8b9286994ae575d67d6eba1d4571865c8a2

data/README.md

@@ -156,6 +156,7 @@ Options:
   -r,          [--root-path=ROOT_PATH]                                # default: $PWD
   -s,          [--ssl], [--no-ssl], [--skip-ssl]                      # default: false
   -l,          [--log], [--no-log], [--skip-log]                      # default: false
+  -t,          [--template-path=TEMPLATE_PATH]                        # default: [GEM_PATH]/nginx/templates/nginx.conf
   -cert-file,  [--ssl-certificate-path=SSL_CERTIFICATE_PATH]          # default: ~/.ruby-nginx/certs/_[DOMAIN].pem
   -key-file,   [--ssl-certificate-key-path=SSL_CERTIFICATE_KEY_PATH]  # default: ~/.ruby-nginx/certs/_[DOMAIN]-key.pem
   -access-log, [--access-log-path=ACCESS_LOG_PATH]                    # default: ~/.ruby-nginx/logs/[DOMAIN].access.log

data/lib/ruby/nginx/cli.rb

@@ -25,6 +25,7 @@ module Ruby
       method_option :root_path, aliases: "-r", type: :string, desc: "default: $PWD"
       method_option :ssl, aliases: "-s", type: :boolean, desc: defaults(:ssl)
       method_option :log, aliases: "-l", type: :boolean, desc: defaults(:log)
+      method_option :template_path, aliases: "-t", type: :string, desc: "default: [GEM_PATH]/nginx/templates/nginx.conf"
       method_option :ssl_certificate_path, aliases: "-cert-file", type: :string, desc: default_paths(:ssl_certificate_path)
       method_option :ssl_certificate_key_path, aliases: "-key-file", type: :string, desc: default_paths(:ssl_certificate_key_path)
       method_option :access_log_path, aliases: "-access-log", type: :string, desc: default_paths(:access_log_path)
@@ -35,6 +36,7 @@ module Ruby
           port: options.port,
           host: options.host,
           root_path: options.root_path,
+          template_path: options.template_path,
           ssl: options.ssl,
           log: options.log,
           ssl_certificate_path: options.ssl_certificate_path,

data/lib/ruby/nginx/configuration.rb

@@ -33,10 +33,11 @@ module Ruby
         validate!
         apply_dynamic_defaults!
 
+        create_temp_path!
         create_ssl_certs! if options[:ssl]
         create_log_files! if options[:log]
 
-        ERB.new(File.read(options[:template_path])).result(binding)
+        ERB.new(load_template).result(binding)
       end
 
       def defaults
@@ -51,6 +52,7 @@ module Ruby
 
       def default_paths
         {
+          temp_path: default_path("tmp"),
           ssl_certificate_path: default_path("certs/_#{options[:domain]}.pem"),
           ssl_certificate_key_path: default_path("certs/_#{options[:domain]}-key.pem"),
           access_log_path: default_path("logs/#{options[:domain]}.access.log"),
@@ -82,6 +84,20 @@ module Ruby
         self.options = default_paths.merge(options)
       end
 
+      def load_template
+        File.read(options[:template_path])
+      rescue Errno::EISDIR
+        raise Ruby::Nginx::AbortError, "Template is a directory: #{options[:template_path]}"
+      rescue Errno::ENOENT
+        raise Ruby::Nginx::AbortError, "Template does not exist at: #{options[:template_path]}"
+      rescue => e
+        raise Ruby::Nginx::AbortError, "Failed to read template.", cause: e
+      end
+
+      def create_temp_path!
+        options[:temp_path] = System::SafeFile.mkdir(options[:temp_path])
+      end
+
       def create_ssl_certs!
         System::Mkcert.create!(
           options[:domain],

data/lib/ruby/nginx/system/safe_file.rb

@@ -7,6 +7,14 @@ module Ruby
     module System
       class SafeFile
         class << self
+          def mkdir(dir_path)
+            safe_path = File.expand_path(dir_path)
+
+            FileUtils.mkdir_p(dir_path)
+
+            safe_path
+          end
+
           def touch(file_path)
             safe_path = File.expand_path(file_path)
 

data/lib/ruby/nginx/templates/nginx.conf.erb

@@ -54,11 +54,15 @@ server {
   error_log                   <%= options[:error_log_path] %> warn;
   <% end %>
 
+  # Do not use the default proxy_temp_path, this is to avoid directory permissions issues.
+  proxy_temp_path <%= options[:temp_path] %> 1 2;
+
   # reverse proxy
   location @<%= name %> {
     proxy_pass                         http://<%= name %>;
     proxy_http_version                 1.1;
-    proxy_cache_bypass                 $http_upgrade;
+    proxy_no_cache                     1;
+    proxy_cache_bypass                 1;
 
     <% if options[:ssl] %>
     # proxy SSL

data/lib/ruby/nginx/version.rb

@@ -2,7 +2,7 @@
 
 module Ruby
   module Nginx
-    VERSION = "1.0.0-beta.3"
+    VERSION = "1.0.0"
 
     Version = Gem::Version
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-nginx
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Bert McCutchen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb