rage-rb 1.23.0 → 1.25.0

data/lib/rage/params_parser.rb

@@ -14,9 +14,9 @@ class Rage::ParamsParser
     end
 
     request_params = if content_type.start_with?("application/json")
-      json_parse(env["rack.input"].read)
+      json_parse(env["rack.input"].tap { |io| io.rewind }.read)
     elsif content_type.start_with?("application/x-www-form-urlencoded")
-      Iodine::Rack::Utils.parse_urlencoded_nested_query(env["rack.input"].read)
+      Iodine::Rack::Utils.parse_urlencoded_nested_query(env["rack.input"].tap { |io| io.rewind }.read)
     elsif content_type.start_with?("multipart/form-data")
       Iodine::Rack::Utils.parse_multipart(env["rack.input"], content_type)
     end

data/lib/rage/pubsub/adapters/redis.rb

@@ -40,7 +40,7 @@ class Rage::PubSub::Adapters::Redis
 
     @trimming_strategy = redis_version < Gem::Version.create("6.2.0") ? :maxlen : :minid
 
-    Rage::Internal.pick_a_worker do
+    Rage::Internal.pick_a_worker(purpose: "redis-pubsub") do
       puts("INFO: #{Process.pid} is managing Redis subscriptions.") if Rage.logger.info?
       poll
     end
@@ -136,6 +136,7 @@ class Rage::PubSub::Adapters::Redis
 
       rescue RedisClient::Error => e
         Rage.logger.error("Subscriber error: #{e.message} (#{e.class})")
+        Rage::Errors.report(e)
         sleep error_backoff_intervals.next
       rescue SystemCallError => e
         @stopping ? break : raise(e)

data/lib/rage/router/constrainer.rb

@@ -69,7 +69,7 @@ class Rage::Router::Constrainer
       # Optimization: inline the derivation for the common built in constraints
       if !strategy.custom?
         if key == :host
-          lines << "   host: env['HTTP_HOST'.freeze],"
+          lines << "   host: env['HTTP_HOST'.freeze]&.sub(/:\\d+\\z/, ''.freeze),"
         else
           raise ArgumentError, "unknown non-custom strategy for compiling constraint derivation function"
         end

data/lib/rage/router/dsl.rb

@@ -62,6 +62,8 @@ class Rage::Router::DSL
       @router = router
 
       @default_actions = %i(index create show update destroy)
+      @default_actions += %i(new edit) if Rage.config.router.form_actions
+
       @default_match_methods = %i(get post put patch delete head)
       @scope_opts = %i(module path controller)
 
@@ -359,6 +361,8 @@ class Rage::Router::DSL
         get("/:#{_param}", to: "#{resource}#show") if actions.include?(:show)
         patch("/:#{_param}", to: "#{resource}#update") if actions.include?(:update)
         put("/:#{_param}", to: "#{resource}#update") if actions.include?(:update)
+        get("/new", to: "#{resource}#new") if actions.include?(:new)
+        get("/:#{_param}/edit", to: "#{resource}#edit") if actions.include?(:edit)
         delete("/:#{_param}", to: "#{resource}#destroy") if actions.include?(:destroy)
 
         scope(path: ":#{to_singular(resource)}_#{_param}", controller: resource, &block) if block
@@ -379,7 +383,6 @@ class Rage::Router::DSL
     #   # PATCH  /photo => photos#update
     #   # PUT    /photo => photos#update
     #   # DELETE /photo => photos#destroy
-    # @note This helper doesn't generate the `new` and `edit` routes.
     # @note :param is not supported for singular resources.
     def resource(*_resources, **opts, &block)
       if _resources.length > 1
@@ -389,7 +392,7 @@ class Rage::Router::DSL
 
       _module, _path, _only, _except = opts.values_at(:module, :path, :only, :except)
 
-      actions = __filter_actions(%i(create show update destroy), _only, _except)
+      actions = __filter_actions(@default_actions - [:index], _only, _except)
 
       resource_name = _resources[0].to_s
       controller_name = to_plural(resource_name)
@@ -398,6 +401,8 @@ class Rage::Router::DSL
         get("/", to: "#{controller_name}#show") if actions.include?(:show)
         patch("/", to: "#{controller_name}#update") if actions.include?(:update)
         put("/", to: "#{controller_name}#update") if actions.include?(:update)
+        get("/new", to: "#{controller_name}#new") if actions.include?(:new)
+        get("/edit", to: "#{controller_name}#edit") if actions.include?(:edit)
         delete("/", to: "#{controller_name}#destroy") if actions.include?(:destroy)
 
         scope(controller: controller_name, &block) if block

data/lib/rage/sse/application.rb

@@ -63,6 +63,7 @@ class Rage::SSE::Application
       end
     rescue => e
       Rage.logger.error("SSE stream failed with exception: #{e.class} (#{e.message}):\n#{e.backtrace.join("\n")}")
+      Rage::Errors.report(e)
     ensure
       Iodine.task_dec!
     end

data/lib/rage/telemetry/tracer.rb

@@ -74,6 +74,7 @@ class Rage::Telemetry::Tracer
           #{calls_chain}
         rescue Exception => e
           Rage.logger.error("Telemetry handler failed with error \#{e}:\\n\#{e.backtrace.join("\\n")}")
+          Rage::Errors.report(e)
         end
 
         unless yield_called

data/lib/rage/version.rb

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

data/lib/rage-rb.rb

@@ -40,6 +40,12 @@ module Rage
     Rage::Events
   end
 
+  # Shorthand to access {Rage::Errors Rage::Errors}.
+  # @return [Rage::Errors]
+  def self.errors
+    Rage::Errors
+  end
+
   # Shorthand to access {Rage::SSE Rage::SSE}.
   # @return [Rage::SSE]
   def self.sse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rage-rb
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Roman Samoilov
@@ -134,6 +134,7 @@ files:
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -143,8 +144,6 @@ files:
 - lib/rage.rb
 - lib/rage/all.rb
 - lib/rage/application.rb
-- lib/rage/cable/adapters/base.rb
-- lib/rage/cable/adapters/redis.rb
 - lib/rage/cable/cable.rb
 - lib/rage/cable/channel.rb
 - lib/rage/cable/connection.rb
@@ -167,6 +166,7 @@ files:
 - lib/rage/deferred/middleware_chain.rb
 - lib/rage/deferred/proxy.rb
 - lib/rage/deferred/queue.rb
+- lib/rage/deferred/scheduler.rb
 - lib/rage/deferred/task.rb
 - lib/rage/env.rb
 - lib/rage/errors.rb
@@ -199,6 +199,7 @@ files:
 - lib/rage/openapi/parser.rb
 - lib/rage/openapi/parsers/ext/active_record.rb
 - lib/rage/openapi/parsers/ext/alba.rb
+- lib/rage/openapi/parsers/ext/blueprinter.rb
 - lib/rage/openapi/parsers/request.rb
 - lib/rage/openapi/parsers/response.rb
 - lib/rage/openapi/parsers/shared_reference.rb
@@ -293,5 +294,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: A modern Ruby framework designed for non-blocking I/O and simpler infrastructure
+summary: Fiber-based Ruby web framework combining Rails ergonomics with a unified
+  runtime
 test_files: []

data/lib/rage/cable/adapters/base.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class Rage::Cable::Adapters::Base
-  def pick_a_worker(&block)
-    _lock, lock_path = Tempfile.new.yield_self { |file| [file, file.path] }
-
-    Iodine.on_state(:on_start) do
-      if File.new(lock_path).flock(File::LOCK_EX | File::LOCK_NB)
-        if Rage.logger.debug?
-          puts "INFO: #{Process.pid} is managing #{self.class.name.split("::").last} subscriptions."
-        end
-        block.call
-      end
-    end
-  end
-end

data/lib/rage/cable/adapters/redis.rb

@@ -1,128 +0,0 @@
-# frozen_string_literal: true
-
-require "securerandom"
-
-if !defined?(RedisClient)
-  fail <<~ERR
-
-    Redis adapter depends on the `redis-client` gem. Add the following line to your Gemfile:
-    gem "redis-client"
-
-  ERR
-end
-
-class Rage::Cable::Adapters::Redis < Rage::Cable::Adapters::Base
-  REDIS_STREAM_NAME = "rage:cable:messages"
-  DEFAULT_REDIS_OPTIONS = { reconnect_attempts: [0.05, 0.1, 0.5] }
-  REDIS_MIN_VERSION_SUPPORTED = Gem::Version.create(6)
-
-  def initialize(config)
-    @redis_stream = if (prefix = config.delete(:channel_prefix))
-      "#{prefix}:#{REDIS_STREAM_NAME}"
-    else
-      REDIS_STREAM_NAME
-    end
-
-    @redis_config = RedisClient.config(**DEFAULT_REDIS_OPTIONS.merge(config))
-    @server_uuid = SecureRandom.uuid
-
-    redis_version = get_redis_version
-    if redis_version < REDIS_MIN_VERSION_SUPPORTED
-      raise "Redis adapter only supports Redis 6+. Detected Redis version: #{redis_version}."
-    end
-
-    @trimming_strategy = redis_version < Gem::Version.create("6.2.0") ? :maxlen : :minid
-
-    pick_a_worker { poll }
-  end
-
-  def publish(stream_name, data)
-    message_uuid = SecureRandom.uuid
-
-    publish_redis.call(
-      "XADD",
-      @redis_stream,
-      trimming_method, "~", trimming_value,
-      "*",
-      "1", stream_name,
-      "2", data.to_json,
-      "3", @server_uuid,
-      "4", message_uuid
-    )
-  end
-
-  private
-
-  def publish_redis
-    @publish_redis ||= @redis_config.new_client
-  end
-
-  def trimming_method
-    @trimming_strategy == :maxlen ? "MAXLEN" : "MINID"
-  end
-
-  def trimming_value
-    @trimming_strategy == :maxlen ? "10000" : ((Time.now.to_f - 5 * 60) * 1000).to_i
-  end
-
-  def get_redis_version
-    service_redis = @redis_config.new_client
-    version = service_redis.call("INFO").match(/redis_version:([[:graph:]]+)/)[1]
-
-    Gem::Version.create(version)
-
-  rescue RedisClient::Error => e
-    puts "FATAL: Couldn't connect to Redis - all broadcasts will be limited to the current server."
-    puts e.backtrace.join("\n")
-    REDIS_MIN_VERSION_SUPPORTED
-
-  ensure
-    service_redis.close
-  end
-
-  def error_backoff_intervals
-    @error_backoff_intervals ||= Enumerator.new do |y|
-      y << 0.2 << 0.5 << 1 << 2 << 5
-      loop { y << 10 }
-    end
-  end
-
-  def poll
-    unless Fiber.scheduler
-      Fiber.set_scheduler(Rage::FiberScheduler.new)
-    end
-
-    Iodine.on_state(:start_shutdown) do
-      @stopping = true
-    end
-
-    Fiber.schedule do
-      read_redis = @redis_config.new_client
-      last_id = (Time.now.to_f * 1000).to_i
-      last_message_uuid = nil
-
-      loop do
-        data = read_redis.blocking_call(5, "XREAD", "COUNT", "100", "BLOCK", "5000", "STREAMS", @redis_stream, last_id)
-
-        if data
-          data[@redis_stream].each do |id, (_, stream_name, _, serialized_data, _, broadcaster_uuid, _, message_uuid)|
-            if broadcaster_uuid != @server_uuid && message_uuid != last_message_uuid
-              Rage.cable.__protocol.broadcast(stream_name, JSON.parse(serialized_data))
-            end
-
-            last_id = id
-            last_message_uuid = message_uuid
-          end
-        end
-
-      rescue RedisClient::Error => e
-        Rage.logger.error("Subscriber error: #{e.message} (#{e.class})")
-        sleep error_backoff_intervals.next
-      rescue => e
-        @stopping ? break : raise(e)
-      else
-        error_backoff_intervals.rewind
-      end
-    end
-  end
-end