rage-rb 1.6.0 → 1.8.0

data/lib/rage/router/dsl.rb

@@ -17,7 +17,7 @@ class Rage::Router::DSL
   end
 
   ##
-  # This class implements routing logic for your application, providing API similar to Rails.
+  # This class implements routing logic for your application, providing an API similar to Rails.
   #
   # Compared to the Rails router, the most notable difference is that a wildcard segment can only be in the last section of the path and cannot be named.
   # Example:
@@ -213,7 +213,7 @@ class Rage::Router::DSL
       @path_prefixes << path_prefix
       @module_prefixes << module_prefix
 
-      instance_eval &block
+      instance_eval(&block)
 
       @path_prefixes.pop
       @module_prefixes.pop
@@ -253,7 +253,7 @@ class Rage::Router::DSL
       @module_prefixes << opts[:module] if opts[:module]
       @controllers << opts[:controller] if opts[:controller]
 
-      instance_eval &block
+      instance_eval(&block)
 
       @path_prefixes.pop if opts[:path]
       @module_prefixes.pop if opts[:module]
@@ -269,7 +269,7 @@ class Rage::Router::DSL
     #   end
     def defaults(defaults, &block)
       @defaults << defaults
-      instance_eval &block
+      instance_eval(&block)
       @defaults.pop
     end
 
@@ -282,7 +282,7 @@ class Rage::Router::DSL
     #   end
     def controller(controller, &block)
       @controllers << controller
-      instance_eval &block
+      instance_eval(&block)
       @controllers.pop
     end
 
@@ -297,7 +297,7 @@ class Rage::Router::DSL
     def collection(&block)
       orig_path_prefixes = @path_prefixes
       @path_prefixes = @path_prefixes[0...-1] if @path_prefixes.last&.start_with?(":")
-      instance_eval &block
+      instance_eval(&block)
       @path_prefixes = orig_path_prefixes
     end
 
@@ -317,7 +317,7 @@ class Rage::Router::DSL
         @path_prefixes = [*@path_prefixes[0...-1], ":#{member_prefix}"]
       end
 
-      instance_eval &block
+      instance_eval(&block)
 
       @path_prefixes = orig_path_prefixes
     end

data/lib/rage/router/dsl_plugins/legacy_hash_notation.rb

@@ -40,7 +40,7 @@ module Rage::Router::DSLPlugins::LegacyHashNotation
       options = kwargs.except(app).merge(at: at)
       super(app, **options)
     else
-      super(*args, **kwargs)
+      super
     end
   end
 end

data/lib/rage/router/dsl_plugins/legacy_root_notation.rb

@@ -8,7 +8,7 @@ module Rage::Router::DSLPlugins::LegacyRootNotation
     if args.length == 1 && args[0].is_a?(String) && kwargs.empty?
       super(to: args[0])
     else
-      super(*args, **kwargs)
+      super
     end
   end
 end

data/lib/rage/router/handler_storage.rb

@@ -64,7 +64,7 @@ class Rage::Router::HandlerStorage
       end
     end
 
-    eval "->(param_values) { { #{lines.join(',')} } }"
+    eval "->(param_values) { { #{lines.join(",")} } }"
   end
 
   def get_handler_matching_constraints(_derived_constraints)

data/lib/rage/session.rb

@@ -7,8 +7,8 @@ class Rage::Session
   KEY = Rack::RACK_SESSION.to_sym
 
   # @private
-  def initialize(controller)
-    @cookies = controller.cookies.encrypted
+  def initialize(cookies)
+    @cookies = cookies.encrypted
   end
 
   # Writes the value to the session.

data/lib/rage/setup.rb

@@ -1,6 +1,10 @@
 Iodine.patch_rack
 
-require_relative "#{Rage.root}/config/environments/#{Rage.env}"
+begin
+  require_relative "#{Rage.root}/config/environments/#{Rage.env}"
+rescue LoadError
+  raise LoadError, "The <#{Rage.env}> environment could not be found. Please check the environment name."
+end
 
 # Run application initializers
 Dir["#{Rage.root}/config/initializers/**/*.rb"].each { |initializer| load(initializer) }

data/lib/rage/sidekiq_session.rb

@@ -13,7 +13,7 @@ class Rage::SidekiqSession
   SESSION_KEY = "rage.sidekiq.session"
 
   def self.with_session(env)
-    env["rack.session"] = session = self.new(env)
+    env["rack.session"] = session = new(env)
     response = yield
 
     if session.changed

data/lib/rage/version.rb

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

data/lib/rage-rb.rb

@@ -7,27 +7,17 @@ require "pathname"
 
 module Rage
   def self.application
-    app = Application.new(__router)
-
-    config.middleware.middlewares.reverse.inject(app) do |next_in_chain, (middleware, args, block)|
-      # in Rails compatibility mode we first check if the middleware is a part of the Rails middleware stack;
-      # if it is - it is expected to be built using `ActionDispatch::MiddlewareStack::Middleware#build`
-      if Rage.config.internal.rails_mode
-        rails_middleware = Rails.application.config.middleware.middlewares.find { |m| m.name == middleware.name }
-      end
-
-      if rails_middleware
-        rails_middleware.build(next_in_chain)
-      else
-        middleware.new(next_in_chain, *args, &block)
-      end
-    end
+    with_middlewares(Application.new(__router), config.middleware.middlewares)
   end
 
   def self.multi_application
     Rage::Router::Util::Cascade.new(application, Rails.application)
   end
 
+  def self.cable
+    Rage::Cable
+  end
+
   def self.routes
     Rage::Router::DSL.new(__router)
   end
@@ -90,6 +80,23 @@ module Rage
     end
   end
 
+  # @private
+  def self.with_middlewares(app, middlewares)
+    middlewares.reverse.inject(app) do |next_in_chain, (middleware, args, block)|
+      # in Rails compatibility mode we first check if the middleware is a part of the Rails middleware stack;
+      # if it is - it is expected to be built using `ActionDispatch::MiddlewareStack::Middleware#build`
+      if Rage.config.internal.rails_mode
+        rails_middleware = Rails.application.config.middleware.middlewares.find { |m| m.name == middleware.name }
+      end
+
+      if rails_middleware
+        rails_middleware.build(next_in_chain)
+      else
+        middleware.new(next_in_chain, *args, &block)
+      end
+    end
+  end
+
   module Router
     module Strategies
     end
@@ -106,6 +113,7 @@ module Rage
 
   autoload :Cookies, "rage/cookies"
   autoload :Session, "rage/session"
+  autoload :Cable, "rage/cable/cable"
 end
 
 module RageController

data/rage.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
+      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor .rubocop])
     end
   end
   spec.bindir = "exe"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rage-rb
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Roman Samoilov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,6 +102,11 @@ files:
 - lib/rage.rb
 - lib/rage/all.rb
 - lib/rage/application.rb
+- lib/rage/cable/cable.rb
+- lib/rage/cable/channel.rb
+- lib/rage/cable/connection.rb
+- lib/rage/cable/protocol/actioncable_v1_json.rb
+- lib/rage/cable/router.rb
 - lib/rage/cli.rb
 - lib/rage/code_loader.rb
 - lib/rage/configuration.rb
@@ -118,6 +123,7 @@ files:
 - lib/rage/logger/text_formatter.rb
 - lib/rage/middleware/cors.rb
 - lib/rage/middleware/fiber_wrapper.rb
+- lib/rage/middleware/origin_validator.rb
 - lib/rage/middleware/reloader.rb
 - lib/rage/params_parser.rb
 - lib/rage/rails.rb