rage-rb 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4adc4048bfa84558a6b86b15cbcab8e6153858878425bde66db78a975fa46f46
-  data.tar.gz: 46bef9f42fdd681bdf593f037a73ca8ae2d435acad9eed5ddf4b3740bf61b601
+  metadata.gz: d8b2423a2cb780fd3f8ffc4e76a6690fff37162836e3d2d64791c7f058b3d63f
+  data.tar.gz: 86c2ee3464e5668e78409d7eae2e987c4e6a5aa54bea024c7cca694dd142019e
 SHA512:
-  metadata.gz: 754b954d46d065020e0c2184c04f1a13d0c0a64ddf11d1b034062df4cc669460c259032a8bf40a61c876579f1774e50e9b57181d4d3e1301c4610577e11c6734
-  data.tar.gz: 4207556922f8fd2c82d07ba8664f53847dc1e5afb6bb5d38260ac0ccd428dd011fd8c6bf34f69aa75af97044a838df23c6c36b5baae1ae7cd3d4c08455fc699b
+  metadata.gz: cc810e46ff275e4595c2631f3cb5cbd19d38dd42885b393bb240ffb8b96ff6cb6f0f93015a461c469cbb88e13cbcc53288f385db590bd2562dc604a4d38b423e
+  data.tar.gz: 6be5256d0c92fd495f6afa2ba3d9f6a08cfe6058429040f10d035594ad9a54d050241fa443029836042e7435681563f36bfee89b04eecaeb31055206adff41ef

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [1.9.0] - 2024-08-24
+
+### Added
+
+- Static file server (#100).
+- Rails 7.2 compatibility (#101).
+
+### Fixed
+
+- Correctly set Rails env (#102).
+
 ## [1.8.0] - 2024-08-06
 
 ### Added

data/lib/rage/cli.rb

@@ -29,12 +29,15 @@ module Rage
       app = ::Rack::Builder.parse_file(options[:config] || "config.ru")
       app = app[0] if app.is_a?(Array)
 
-      port = options[:port] || Rage.config.server.port
-      address = options[:binding] || (Rage.env.production? ? "0.0.0.0" : "localhost")
-      timeout = Rage.config.server.timeout
-      max_clients = Rage.config.server.max_clients
+      server_options = { service: :http, handler: app }
 
-      ::Iodine.listen service: :http, handler: app, port: port, address: address, timeout: timeout, max_clients: max_clients
+      server_options[:port] = options[:port] || Rage.config.server.port
+      server_options[:address] = options[:binding] || (Rage.env.production? ? "0.0.0.0" : "localhost")
+      server_options[:timeout] = Rage.config.server.timeout
+      server_options[:max_clients] = Rage.config.server.max_clients
+      server_options[:public] = Rage.config.public_file_server.enabled ? Rage.root.join("public").to_s : nil
+
+      ::Iodine.listen(**server_options)
       ::Iodine.threads = Rage.config.server.threads_count
       ::Iodine.workers = Rage.config.server.workers_count
 
@@ -124,6 +127,10 @@ module Rage
 
     def set_env(options)
       ENV["RAGE_ENV"] = options[:environment] if options[:environment]
+
+      # at this point we don't know whether the app is running in standalone or Rails mode;
+      # we set both variables to make sure applications are running in the same environment;
+      ENV["RAILS_ENV"] = ENV["RAGE_ENV"] if ENV["RAGE_ENV"] && ENV["RAILS_ENV"] != ENV["RAGE_ENV"]
     end
   end
 

data/lib/rage/configuration.rb

@@ -102,6 +102,12 @@
 #
 # > Specifies connection timeout.
 #
+# # Static file server
+#
+# • _config.public_file_server.enabled_
+#
+# > Configures whether Rage should serve static files from the public directory. Defaults to `false`.
+#
 # # Cable Configuration
 #
 # • _config.cable.protocol_
@@ -165,6 +171,10 @@ class Rage::Configuration
     @cable ||= Cable.new
   end
 
+  def public_file_server
+    @public_file_server ||= PublicFileServer.new
+  end
+
   def internal
     @internal ||= Internal.new
   end
@@ -246,6 +256,10 @@ class Rage::Configuration
     end
   end
 
+  class PublicFileServer
+    attr_accessor :enabled
+  end
+
   # @private
   class Internal
     attr_accessor :rails_mode

data/lib/rage/ext/active_record/connection_pool.rb

@@ -148,10 +148,14 @@ module Rage::Ext::ActiveRecord::ConnectionPool
   end
 
   # Yields a connection from the connection pool to the block.
-  def with_connection
-    yield connection
+  def with_connection(_ = nil)
+    unless (conn = @__in_use[Fiber.current])
+      conn = connection
+      fresh_connection = true
+    end
+    yield conn
   ensure
-    release_connection
+    release_connection if fresh_connection
   end
 
   # Returns an array containing the connections currently in the pool.
@@ -230,6 +234,10 @@ module Rage::Ext::ActiveRecord::ConnectionPool
     connection
   end
 
+  def lease_connection
+    connection
+  end
+
   # Check in a database connection back into the pool, indicating that you no longer need this connection.
   def checkin(conn)
     fiber = @__in_use.key(conn)

data/lib/rage/ext/setup.rb

@@ -31,6 +31,6 @@ if defined?(ActiveRecord::ConnectionAdapters::ConnectionPool)
 end
 
 # patch `ActiveRecord::ConnectionPool`
-if defined?(ActiveRecord) && ENV["RAGE_PATCH_AR_POOL"]
+if defined?(ActiveRecord) && ENV["RAGE_PATCH_AR_POOL"] && !Rage.env.test?
   Rage.patch_active_record_connection_pool
 end

data/lib/rage/rails.rb

@@ -44,7 +44,10 @@ end
 # clone Rails logger
 Rails.configuration.after_initialize do
   if Rails.logger && !Rage.logger
-    rails_logdev = Rails.logger.instance_variable_get(:@logdev)
+    rails_logdev = Rails.logger.yield_self { |logger|
+      logger.respond_to?(:broadcasts) ? logger.broadcasts.last : logger
+    }.instance_variable_get(:@logdev)
+
     Rage.configure do
       config.logger = Rage::Logger.new(rails_logdev.dev) if rails_logdev.is_a?(Logger::LogDevice)
     end

data/lib/rage/request.rb

@@ -37,6 +37,45 @@ class Rage::Request
     )
   end
 
+  # Returns the full URL of the request.
+  # @example
+  #   request.url # => "https://example.com/users?show_archived=true"
+  def url
+    scheme = @env["rack.url_scheme"]
+    host = @env["SERVER_NAME"]
+    port = @env["SERVER_PORT"]
+    path = @env["PATH_INFO"]
+    query_string = @env["QUERY_STRING"]
+
+    port_part = (scheme == "http" && port == "80") || (scheme == "https" && port == "443") ? "" : ":#{port}"
+    query_part = query_string.empty? ? "" : "?#{query_string}"
+
+    "#{scheme}://#{host}#{port_part}#{path}#{query_part}"
+  end
+
+  # Returns the path of the request.
+  # @example
+  #   request.path # => "/users"
+  def path
+    @env["PATH_INFO"]
+  end
+
+  # Returns the full path including the query string.
+  # @example
+  #   request.fullpath # => "/users?show_archived=true"
+  def fullpath
+    path = @env["PATH_INFO"]
+    query_string = @env["QUERY_STRING"]
+    query_string.empty? ? path : "#{path}?#{query_string}"
+  end
+
+  # Returns the user agent of the request.
+  # @example
+  #  request.user_agent # => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36"
+  def user_agent
+    @env["HTTP_USER_AGENT"]
+  end
+
   private
 
   def if_none_match

data/lib/rage/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rage
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rage-rb
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Roman Samoilov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor