flame 5.0.0.rc10 → 5.0.0.rc11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f5ed6826ce10190699edca72f191a08887d3acf0bf4f8b563457d6c13c3287
-  data.tar.gz: e6f1cb17ebfe5edefad9c7f692e07f1394e94cf869219872201068703177a970
+  metadata.gz: 89e36471cb9755dd5cec82cd27a11a38dad419ad731fed6764534b996175117b
+  data.tar.gz: 0bbfd34f7b9424d3c519825a0302255980859d9591f97d1a466f0ec4f217321b
 SHA512:
-  metadata.gz: caeabdc659c818aab2ad4b9e50f204ef4eae3e6ef398e4a1c38ef4b0e0d7c632dcc2956e490e68c2fd6ddd9c7521ce6f2ed9dd5bf5b524c44a37c1a4b53e9968
-  data.tar.gz: d06cecef3a6a12e154e9f8b24ecff2eeda41f0fe9ee48a2eddbc4e051ea6da6faa4a50dd2ff11618792ceab4edb208b283c8c2ba22938e76c378f25dae484775
+  metadata.gz: 4152b8a1cf18f168aee8af8e839da19f579bd6a25cf63739c3ecbef15af83b21f37ecdfa96b0c94c007efbe8968052d53c51d1fe7cb7fd6b5cf1b2e49830c01c
+  data.tar.gz: de60d571c4f6fba4f89462c8895365615d730142bb94baf2f052e7f4a735b6afbe949972535cd1b79f2987eaa05c5974c3a02b56f9fbd9b6cf2b60a4512d73ad

data/CHANGELOG.md

@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file.
     But you can disable it with `nested: false` option for `mount`,
     for example, for conditional umbrella application.
 *   Allow to mount anonymous controllers
-*   Add support for Ruby 3.0 ­– 3.4
+*   Add support for Ruby 3.0 ­– 4.0
 *   Add support of `OPTIONS` HTTP-method
 *   Add `Application.require_dirs` method
 *   Add `Controller#path_to_back` method
@@ -81,18 +81,22 @@ All notable changes to this project will be documented in this file.
 *   Don't assign results of `execute` (after-hooks) as `body`
 *   Require directories starting with `_` first
 *   Allow to redefine controller path with `PATH` constant inside
+*   Resolve Ruby warnings
 *   Update Rack and GorillaPatch
 *   Update RuboCop to a new version, resolve new offenses
 *   Improve version locks for dependencies
 *   Use Depfu instead of closed Gemnasium
+*   Improve CI config
 
 ### Removed
 
 *   Remove `Application#config` and `Application#router` methods
 *   Remove Ruby < 2.7 support
+*   Remove integration with `better_errors`.
 *   Remove HTML tags (`<h1>`) from default body \
     There is no `Content-Type` HTTP header, also there is no reason to return exactly HTML content \
     (Flame can be used only for API or something else).
+*   Remove `bundler` as development dependency.
 
 ### Fixed
 

data/lib/flame/application.rb

@@ -111,10 +111,10 @@ module Flame
 			##   mount :cabinet do # Cabinet::IndexController
 			##     mount :articles # Cabinet::ArticlesController
 			##   end
-			def mount(controller, path = nil, nested: true, &block)
+			def mount(controller, path = nil, nested: true, &)
 				## Add routes from controller to glob array
 				router.add Router::RoutesRefine.new(
-					namespace_name, controller, path, nested: nested, &block
+					namespace_name, controller, path, nested: nested, &
 				)
 			end
 

data/lib/flame/config.rb

@@ -25,7 +25,7 @@ module Flame
 		## @param key [Symbol] config key
 		## @return [Object] config value
 		def [](key)
-			result = super(key)
+			result = super
 			result = instance_exec(&result) if result.class <= Proc && result.parameters.empty?
 			result
 		end

data/lib/flame/controller/actions.rb

@@ -7,6 +7,7 @@ module Flame
 		## Module for work with actions
 		module Actions
 			include Memery
+
 			using GorillaPatch::Slice
 
 			## Shortcut for not-inherited public methods: actions

data/lib/flame/controller/path_to.rb

@@ -14,8 +14,8 @@ module Flame
 			end
 
 			## Build a URI to the given controller and action, or path
-			def url_to(*args, **options)
-				path = build_path_for_url(*args, **options)
+			def url_to(*, **)
+				path = build_path_for_url(*, **)
 				Addressable::URI.join(request.base_url, path).to_s
 			end
 

data/lib/flame/controller.rb

@@ -16,9 +16,18 @@ module Flame
 	## Class initialize when Dispatcher found route with it
 	## For new request and response
 	class Controller
-		extend Actions
 		include Memery
 
+		extend Forwardable
+
+		extend Actions
+
+		def_delegators(
+			:@dispatcher,
+			:config, :request, :params, :halt, :session, :response, :status, :body,
+			:default_body, :cached_tilts, :find_static
+		)
+
 		class << self
 			attr_accessor :path_arguments
 
@@ -43,14 +52,6 @@ module Flame
 			end
 		end
 
-		extend Forwardable
-
-		def_delegators(
-			:@dispatcher,
-			:config, :request, :params, :halt, :session, :response, :status, :body,
-			:default_body, :cached_tilts, :find_static
-		)
-
 		## Initialize the controller for request execution
 		## @param dispatcher [Flame::Dispatcher] host dispatcher
 		def initialize(dispatcher)
@@ -116,7 +117,7 @@ module Flame
 			response[content_dis] = disposition.to_s
 			return unless filename
 
-			response[content_dis] << "; filename=\"#{File.basename(filename)}\""
+			response[content_dis] += "; filename=\"#{File.basename(filename)}\""
 			ext = File.extname(filename)
 			response.content_type = ext unless ext.empty?
 		end
@@ -125,15 +126,15 @@ module Flame
 		## @param path [Symbol, nil] path to the template file
 		## @param options [Hash] options for the `Flame::Render` rendering
 		## @return [String] rendered template
-		def view(path = nil, options = {}, &block)
+		def view(path = nil, options = {}, &)
 			cache = options.delete(:cache)
 			cache = config[:environment] == 'production' if cache.nil?
 			template = Flame::Render.new(
 				self,
-				(path || caller_locations(1, 1)[0].base_label.to_sym),
+				path || caller_locations(1, 1)[0].base_label.to_sym,
 				options
 			)
-			template.render(cache: cache, &block)
+			template.render(cache: cache, &)
 		end
 		alias render view
 

data/lib/flame/dispatcher/static.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require 'cgi/escape'
 
 module Flame
 	class Dispatcher
@@ -18,8 +18,8 @@ module Flame
 			private
 
 			## Find static files and try return it
-			def try_static(*args, **kwargs)
-				file = find_static(*args, **kwargs)
+			def try_static(*, **)
+				file = find_static(*, **)
 				return nil unless file.exist?
 
 				halt 400 unless file.within_directory

data/lib/flame/dispatcher.rb

@@ -16,16 +16,17 @@ module Flame
 	class Dispatcher
 		include Memery
 
-		GEM_STATIC_FILES = File.join(__dir__, '../../public').freeze
-
 		extend Forwardable
-		def_delegators :@app_class, :router, :path_to
-
-		attr_reader :request, :response
 
 		include Flame::Dispatcher::Static
 		include Flame::Dispatcher::Routes
 
+		GEM_STATIC_FILES = File.join(__dir__, '../../public').freeze
+
+		attr_reader :request, :response
+
+		def_delegators :@app_class, :router, :path_to
+
 		## Initialize Dispatcher from Application#call
 		## @param app_class [Class] application class
 		## @param env Rack-environment object

data/lib/flame/path.rb

@@ -11,6 +11,7 @@ module Flame
 		include Memery
 
 		extend Forwardable
+
 		def_delegators :to_s, :include?
 
 		## Merge parts of path to one path
@@ -196,11 +197,11 @@ module Flame
 		class Part
 			extend Forwardable
 
-			def_delegators :to_s, :[], :hash, :size, :empty?, :b, :inspect
-
 			ARG_CHAR = ':'
 			ARG_CHAR_OPT = '?'
 
+			def_delegators :to_s, :[], :hash, :size, :empty?, :b, :inspect
+
 			## Create new instance from String
 			## @param part [String] path part as String
 			## @param arg [Boolean] is this part an argument

data/lib/flame/render.rb

@@ -46,14 +46,14 @@ module Flame
 		## Render template with layout
 		## @param cache [Boolean] cache compiles or not
 		## @return [String] compiled template
-		def render(cache: true, &block)
+		def render(cache: true, &)
 			@cache = cache
 			## Compile Tilt to instance hash
 			return unless @filename
 
 			tilt = compile_file
 			## Render Tilt from instance hash with new options
-			layout_render tilt.render(@scope, @locals, &block)
+			layout_render tilt.render(@scope, @locals, &)
 		end
 
 		private
@@ -93,7 +93,7 @@ module Flame
 
 		## Find template-file by path
 		def find_file(path)
-			caller_path = caller_locations(4..4).first.path
+			caller_path = find_caller_path
 
 			## It now never causes `LoadError`, but returning `nil`, as I want
 			## https://github.com/jeremyevans/tilt/issues/2
@@ -103,6 +103,11 @@ module Flame
 				.find { |file| Tilt[file] }
 		end
 
+		## Find caller path
+		def find_caller_path
+			caller_locations.find { |location| !location.path.include?(__dir__) }.path
+		end
+
 		## Find layout-files by path
 		def find_layouts(path)
 			find_files(path, layout_dirs)

data/lib/flame/router/controller_finder.rb

@@ -39,6 +39,8 @@ module Flame
 
 			TRASNFORMATION_METHODS = %i[camelize upcase].freeze
 
+			private_constant :TRASNFORMATION_METHODS
+
 			def controller_name_variations
 				TRASNFORMATION_METHODS.each_with_object([]) do |method, result|
 					transformed = @controller_name.to_s.send(method)

data/lib/flame/router/route.rb

@@ -9,10 +9,10 @@ module Flame
 		class Route
 			extend Forwardable
 
-			def_delegators :to_s, :inspect
-
 			attr_reader :controller, :action
 
+			def_delegators :to_s, :inspect
+
 			## Create a new instance
 			## @param controller [Flame::Controller] controller
 			## @param action [Symbol] action

data/lib/flame/router/routes_refine/mounting.rb

@@ -13,9 +13,9 @@ module Flame
 				## @param controller [Flame::Controller] class of mounting controller
 				## @param path [String, nil] root path for mounting controller
 				## @yield Block of code for routes refine
-				def mount(controller_name, path = nil, &block)
+				def mount(controller_name, path = nil, &)
 					routes_refine = self.class.new(
-						@namespace_name, controller_name, path, &block
+						@namespace_name, controller_name, path, &
 					)
 
 					@endpoint.deep_merge! routes_refine.routes

data/lib/flame/router/routes_refine.rb

@@ -25,18 +25,15 @@ module Flame
 
 			using GorillaPatch::Namespace
 
-			def initialize(
-				namespace_name, controller_or_name, path, nested: true, &block
-			)
-				@controller =
-					ControllerFinder.new(namespace_name, controller_or_name).controller
+			def initialize(namespace_name, controller_or_name, path, nested: true, &)
+				@controller = ControllerFinder.new(namespace_name, controller_or_name).controller
 				@namespace_name = @controller.deconstantize
 				@path = Flame::Path.new(path || @controller.path)
 				@controller.path_arguments = @path.parts.select(&:arg?).map(&:to_sym)
 				@routes, @endpoint = @path.to_routes_with_endpoint
 				@reverse_routes = {}
 				@mount_nested = nested
-				execute(&block)
+				execute(&)
 			end
 
 			private
@@ -85,10 +82,11 @@ module Flame
 					get action unless find_reverse_route(action)
 				end
 
-				mount_nested_controllers if @mount_nested && (
-					@controller.demodulize == 'IndexController' &&
-					!@namespace_name.empty?
-				)
+				if @mount_nested &&
+						@controller.demodulize == 'IndexController' &&
+						!@namespace_name.empty?
+					mount_nested_controllers
+				end
 			end
 
 			## Assign methods of the controller to REST architecture
@@ -120,7 +118,7 @@ module Flame
 			def validate_action_path(action, action_path)
 				Validators::RouteArgumentsValidator
 					.new(@controller, action_path, action)
-					.valid?
+					.validate!
 			end
 
 			def remove_old_routes(action, new_route)

data/lib/flame/router.rb

@@ -10,17 +10,18 @@ require_relative 'errors/controller_not_found_error'
 module Flame
 	## Router class for routing
 	class Router
+		extend Forwardable
+
 		HTTP_METHODS = %i[GET POST PUT PATCH DELETE].freeze
 
 		require_relative 'router/route'
 		require_relative 'router/routes'
 		require_relative 'router/routes_refine'
 
-		extend Forwardable
-		def_delegators :routes, :navigate
-
 		attr_reader :app, :routes, :reverse_routes
 
+		def_delegators :routes, :navigate
+
 		## @param app [Flame::Application] host application
 		def initialize(app)
 			@app = app

data/lib/flame/validators.rb

@@ -20,14 +20,14 @@ module Flame
 			end
 
 			## Validate
-			## @return [true, false] valid or not
-			def valid?
-				extra_valid? && order_valid?
+			## @return [true, false] valid or raise an error
+			def validate!
+				extra_validate! && order_validate!
 			end
 
 			private
 
-			def extra_valid?
+			def extra_validate!
 				extra_arguments = first_extra_arguments
 				## Raise error if extra arguments
 				return true unless extra_arguments
@@ -37,7 +37,7 @@ module Flame
 				)
 			end
 
-			def order_valid?
+			def order_validate!
 				wrong_ordered_arguments = first_wrong_ordered_arguments
 				return true unless wrong_ordered_arguments
 

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '5.0.0.rc10'
+	VERSION = '5.0.0.rc11'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc10
+  version: 5.0.0.rc11
 platform: ruby
 authors:
 - Alexander Popov
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: gorilla_patch
   requirement: !ruby/object:Gem::Requirement
@@ -46,7 +46,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -147,8 +147,8 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/AlexWayfer/flame/issues
-  changelog_uri: https://github.com/AlexWayfer/flame/blob/v5.0.0.rc10/CHANGELOG.md
-  documentation_uri: http://www.rubydoc.info/gems/flame/5.0.0.rc10
+  changelog_uri: https://github.com/AlexWayfer/flame/blob/v5.0.0.rc11/CHANGELOG.md
+  documentation_uri: http://www.rubydoc.info/gems/flame/5.0.0.rc11
   homepage_uri: https://github.com/AlexWayfer/flame
   source_code_uri: https://github.com/AlexWayfer/flame
   wiki_uri: https://github.com/AlexWayfer/flame/wiki
@@ -159,17 +159,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.5'
+      version: '5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Web-framework, based on MVC-pattern
 test_files: []