flame 4.11.3.2 → 4.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b56a12a13e9cda2bdb36285b8f7051597d773875
-  data.tar.gz: 8edf353e69d9254ad11ad1cff5cf8eca14519096
+  metadata.gz: 3b3c22d674ae570e3f8f2fd8874ec54f87dfb39b
+  data.tar.gz: a8ab56284dc70eb6babcf86a2dd80281757278dd
 SHA512:
-  metadata.gz: eae397ed310ea64aaf0a07989655b0820734bffe9a9c1b62fda06ce75d6495f78496f9bc61e16ef7fe2f3de1207d76ff2f7c4c419e5c2b51ed6280e925305040
-  data.tar.gz: 61723f2b18787782051b94bef9d4be923f93a3755d6b822576309e02f5e1b68b232025addbb9c127eae8717304c179e55eab879f06ea02b622ef847d60b265fe
+  metadata.gz: affe6a9c49a9eb2bd31ea0ed63540451e66a9986a35ed5a2d65cfd66363b13e0452eef7f8f194a00552203dfabfde31cd06550ac033256d04421b14d9398fe72
+  data.tar.gz: c40433fa6ef393e1d3630ea4817aeb490639cdb2c16934849947c88705b063c18ca452db88d5b5ee8091ab5acd3e7dee37c3e2bae946e6d74b0dc82914a95e37

data/bin/flame

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'thor'
 require 'fileutils'

data/lib/flame.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack'
 
 require_relative 'flame/application'

data/lib/flame/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'router'
 require_relative 'dispatcher'
 
@@ -56,7 +58,7 @@ module Flame
 		##     defaults
 		##   end
 		def self.mount(ctrl, path = nil, &block)
-			router.add_controller(ctrl, path, block)
+			router.add_controller(ctrl, path, &block)
 		end
 
 		## Router for routing
@@ -71,7 +73,7 @@ module Flame
 		## Initialize default for config directories
 		def self.default_config_dirs(root_dir:)
 			result = { root_dir: File.realpath(root_dir) }
-			%i(public views config tmp).each do |key|
+			%i[public views config tmp].each do |key|
 				result[:"#{key}_dir"] = proc { File.join(config[:root_dir], key.to_s) }
 			end
 			result

data/lib/flame/controller.rb

@@ -17,7 +17,7 @@ module Flame
 		def_delegators(
 			:@dispatcher,
 			:config, :request, :params, :halt, :session, :response, :status, :body,
-			:default_body, :content_type
+			:default_body
 		)
 
 		## Initialize the controller for request execution
@@ -58,12 +58,12 @@ module Flame
 		# Set the Content-Disposition to "attachment" with the specified filename,
 		# instructing the user agents to prompt to save.
 		def attachment(filename = nil, disposition = :attachment)
-			content_dis = 'Content-Disposition'.freeze
+			content_dis = 'Content-Disposition'
 			response[content_dis] = disposition.to_s
 			return unless filename
 			response[content_dis] << "; filename=\"#{File.basename(filename)}\""
 			ext = File.extname(filename)
-			content_type(ext) unless ext.empty?
+			response.content_type = ext unless ext.empty?
 		end
 
 		## Render a template with `Flame::Render` (based on Tilt-engine)
@@ -88,7 +88,7 @@ module Flame
 		## @param method [Symbol] name of the controller method
 		def execute(method)
 			# send method
-			body send(method, *select_args(method))
+			body send(method, *select_args(method).values)
 		end
 
 		## Default method for Internal Server Error, can be inherited
@@ -98,14 +98,13 @@ module Flame
 
 		private
 
-		def select_args(method)
-			parameters = self.class.instance_method(method).parameters
-			params_select = proc do |type|
-				params.values_at(
-					*parameters.select { |par| par.first == type }.map(&:last)
-				)
+		def select_args(action)
+			# p action, params, parameters
+			method(action).parameters.each_with_object({}) do |parameter, result|
+				key = parameter.last
+				next if params[key].nil?
+				result[key] = params[key]
 			end
-			params_select.call(:req) + params_select.call(:opt).compact
 		end
 
 		def add_controller_class(args)
@@ -119,7 +118,7 @@ module Flame
 			## Default root path of the controller for requests
 			def default_path
 				modules = name.underscore.split('/')
-				parts = modules[-1].split('_') - %w(index controller ctrl)
+				parts = modules[-1].split('_') - %w[index controller ctrl]
 				return modules[-2] if parts.empty?
 				parts.join('_')
 			end

data/lib/flame/cookies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Flame
 	class Dispatcher
 		## Helper class for cookies

data/lib/flame/dispatcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gorilla-patch/symbolize'
 
 require_relative 'cookies'
@@ -25,9 +27,9 @@ module Flame
 		## Start of execution the request
 		def run!
 			catch :halt do
-				try_route ||
-					try_static ||
+				try_static ||
 					try_static(File.join(__dir__, '..', '..', 'public')) ||
+					try_route ||
 					halt(404)
 			end
 			response.write body
@@ -76,12 +78,6 @@ module Flame
 			@app.config
 		end
 
-		## Access to Content-Type header of response
-		def content_type(ext = nil)
-			return response[Rack::CONTENT_TYPE] unless ext
-			response[Rack::CONTENT_TYPE] = Rack::Mime.mime_type(ext)
-		end
-
 		## Build a path to the given controller and action, with any expected params
 		##
 		## @param ctrl [Flame::Controller] class of controller
@@ -96,32 +92,30 @@ module Flame
 		def path_to(ctrl, action = :index, args = {})
 			route = @app.class.router.find_route(controller: ctrl, action: action)
 			raise Errors::RouteNotFoundError.new(ctrl, action) unless route
-			params = Rack::Utils.build_nested_query args.delete(:params)
+			query = Rack::Utils.build_nested_query args.delete(:params)
+			query = nil if query&.empty?
 			path = route.assign_arguments(args)
 			path = '/' if path.empty?
-			path << ("?#{params}" if params).to_s
+			URI::Generic.build(path: path, query: query).to_s
 		end
 
 		## Interrupt the execution of route, and set new optional data
 		##   (otherwise using existing)
-		## @param new_status_or_body [Integer, String]
-		##   set new HTTP status code or new body
-		## @param new_body [String] set new body
-		## @param new_headers [String] merge new headers
+		## @param new_status [Integer, nil]
+		##   set new HTTP status code
+		## @param new_body [String, nil] set new body
+		## @param new_headers [Hash, nil] merge new headers
+		## @example Halt, no change status or body
+		##   halt
 		## @example Halt with 500, no change body
 		##   halt 500
 		## @example Halt with 404, render template
 		##   halt 404, render('errors/404')
 		## @example Halt with 200, set new headers
 		##   halt 200, 'Cats!', 'Content-Type' => 'animal/cat'
-		def halt(new_status_or_body = nil, new_body = nil, new_headers = {})
-			case new_status_or_body
-			when String then new_body = new_status_or_body
-			when Integer then status new_status_or_body
-			end
-			# new_status.is_a?(String) ? () : (status new_status)
-			body new_body if new_body
-			default_body_of_nearest_route if body.empty?
+		def halt(new_status = nil, new_body = nil, new_headers = {})
+			status new_status if new_status
+			body new_body || (default_body_of_nearest_route if body.empty?)
 			response.headers.merge!(new_headers)
 			throw :halt
 		end
@@ -134,7 +128,7 @@ module Flame
 				"#{error.class} - #{error.message}:",
 				*error.backtrace
 			].join("\n\t")
-			@env['rack.errors'].puts(error_message)
+			@env[Rack::RACK_ERRORS].puts(error_message)
 		end
 
 		## Generate default body of error page
@@ -152,17 +146,17 @@ module Flame
 				path_parts: request.path_parts
 			)
 			return nil unless route
+			status 200
 			execute_route(route)
 		end
 
 		## Execute route
 		## @param route [Flame::Route] route that must be executed
-		def execute_route(route)
-			status 200
+		def execute_route(route, action = route.action)
 			params.merge!(route.arguments(request.path_parts))
 			# route.execute(self)
 			controller = route.controller.new(self)
-			controller.send(:execute, route.action)
+			controller.send(:execute, action)
 		rescue => exception
 			# p 'rescue from dispatcher'
 			dump_error(exception)
@@ -182,8 +176,8 @@ module Flame
 			##   or it's `default_body` method not defined
 			return default_body unless route
 			## Execute `default_body` method for the founded route
-			route.controller.new(self).send(:execute, :default_body)
-			body default_body if body.empty?
+			execute_route(route, :default_body)
+			default_body if body.empty?
 		end
 	end
 end

data/lib/flame/errors.rb

@@ -1,60 +1,35 @@
+# frozen_string_literal: true
+
 module Flame
 	module Errors
-		module RouterError
-			## Error for Flame::Router.compare_actions
-			class ActionsError < StandardError
-				def initialize(ctrl, extra_actions)
-					@ctrl = ctrl
-					@extra_actions = extra_actions
-				end
-			end
-
-			## Error if routes have more actions, than controller
-			class ExtraRoutesActionsError < ActionsError
-				def message
-					"Controller '#{@ctrl}' has no methods" \
-					" '#{@extra_actions.join(', ')}' from routes"
-				end
-			end
-
-			## Error if controller has not assigned in routes actions
-			class ExtraControllerActionsError < ActionsError
-				def message
-					"Routes for '#{@ctrl}' has no methods" \
-					" '#{@extra_actions.join(', ')}'"
-				end
-			end
-
-			## Error for Flame::Router::RouteRefine.arguments_valid?
-			class ArgumentsError < StandardError
-				def initialize(ctrl, action, path, extra_args)
-					@ctrl = ctrl
-					@action = action
-					@path = path
-					@extra_args = extra_args
-				end
-			end
-
-			## Error if path has more arguments, than controller's method
-			class ExtraPathArgumentsError < ArgumentsError
-				def message
-					"Method '#{@action}' from controller '#{@ctrl}'" \
-					" does not know arguments '#{@extra_args.join(', ')}'" \
-					" from path '#{@path}'"
-				end
+		## Error for Route initialization
+		class RouteArgumentsError < StandardError
+			def initialize(ctrl, action, path, extra)
+				@ctrl = ctrl
+				@action = action
+				@path = path
+				@extra = extra
+				@extra[:type_name] = {
+					req: 'required',
+					opt: 'optional'
+				}[@extra[:type]]
 			end
 
-			## Error if path has no arguments, that controller's method required
-			class ExtraActionArgumentsError < ArgumentsError
-				def message
-					"Path '#{@path}' does not contain required arguments" \
-					" '#{@extra_args.join(', ')}' of method '#{@action}'" \
-					" from controller '#{@ctrl}'"
+			def message
+				case @extra[:place]
+				when :ctrl
+					## Error if path has no arguments, that controller's method has
+					"Path '#{@path}' has no #{@extra[:type_name]}" \
+						" arguments #{@extra[:args].inspect}"
+				when :path
+					## Error if path has more arguments, than controller's method
+					"Action '#{@ctrl}##{@action}' has no #{@extra[:type_name]}" \
+						" arguments #{@extra[:args].inspect}"
 				end
 			end
 		end
 
-		## Error for Flame::Router.find_path
+		## Error for Flame::Dispatcher.path_to
 		class RouteNotFoundError < StandardError
 			def initialize(ctrl, method)
 				@ctrl = ctrl
@@ -63,32 +38,19 @@ module Flame
 
 			def message
 				"Route with controller '#{@ctrl}' and method '#{@method}'" \
-				' not found in application routes'
+					' not found in application routes'
 			end
 		end
 
-		## Error for Flame::Controller.path_to
+		## Error for Flame::Dispatcher.path_to
 		class ArgumentNotAssignedError < StandardError
-			def initialize(path, path_part)
+			def initialize(path, argument)
 				@path = path
-				@path_part = path_part
-			end
-
-			def message
-				"Argument '#{@path_part}' for path '#{@path}' is not assigned"
-			end
-		end
-
-		## Error for Flame::Router.find_path
-		class UnexpectedTypeOfHookError < StandardError
-			def initialize(hook, route)
-				@hook = hook
-				@route = route
+				@argument = argument
 			end
 
 			def message
-				"Unexpected hook-block class '#{@hook.class}'" \
-				" in route '#{@route}'"
+				"Argument '#{@argument}' for path '#{@path}' is not assigned"
 			end
 		end
 	end

data/lib/flame/render.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 require 'tilt'
@@ -94,7 +96,7 @@ module Flame
 		## Find possible directories for the controller
 		def controller_dirs
 			parts = @ctrl.class.underscore.split('/').map do |part|
-				(part.split('_') - %w(controller controllers ctrl)).join('_')
+				(part.split('_') - %w[controller controllers ctrl]).join('_')
 			end
 			combine_parts(parts).map! { |path| path.join('/') }
 		end

data/lib/flame/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Flame
 	## Class for requests
 	class Request < Rack::Request

data/lib/flame/response.rb

@@ -1,5 +1,18 @@
+# frozen_string_literal: true
+
 module Flame
 	## Class for responses
 	class Response < Rack::Response
+		## Set Content-Type header directly or by extension
+		## @param value [String] value for header or extension of file
+		## @return [String] setted value
+		## @example Set value directly
+		##   content_type = 'text/css'
+		## @example Set value by file extension
+		##   content_type = '.css'
+		def content_type=(value)
+			value = Rack::Mime.mime_type(value) if value.start_with? '.'
+			set_header Rack::CONTENT_TYPE, value
+		end
 	end
 end

data/lib/flame/route.rb

@@ -1,21 +1,27 @@
 # frozen_string_literal: true
 
+require_relative 'validators'
+
 module Flame
 	class Router
-		ARG_CHAR = ':'.freeze
-		ARG_CHAR_OPT = '?'.freeze
+		ARG_CHAR = ':'
+		ARG_CHAR_OPT = '?'
 
 		## Class for Route in Router.routes
 		class Route
 			attr_reader :method, :controller, :action, :path, :path_parts
 
-			def initialize(controller, action, method, path)
+			def initialize(controller, action, method, ctrl_path, action_path)
+				## Merge action path with controller path
+				path = self.class.path_merge(ctrl_path, action_path)
 				@controller = controller
 				@action = action
 				@method = method.to_sym.upcase
 				## MAKE PATH
 				@path = path
-				Validators::ArgumentsValidator.new(@controller, @path, @action).valid?
+				Validators::RouteArgumentsValidator.new(
+					@controller, action_path, @action
+				).valid?
 				@path_parts = @path.to_s.split('/').reject(&:empty?)
 				freeze
 			end
@@ -38,24 +44,38 @@ module Flame
 			## Assign arguments to path for `Controller.path_to`
 			## @param args [Hash] arguments for assigning
 			def assign_arguments(args = {})
-				parts = @path_parts.map { |part| assign_argument(part, args) }
-				self.class.path_merge(parts.unshift(''))
+				parts = @path_parts.map { |part| assign_argument(part, args) }.compact
+				self.class.path_merge(parts.unshift(nil))
 			end
 
 			## Extract arguments from request_parts for `execute`
 			## @param request_parts [Array] parts of the request (Array of String)
 			def arguments(request_parts)
 				@path_parts.each_with_index.with_object({}) do |(path_part, i), args|
-					request_part = request_parts[i]
+					request_part = request_parts[i].to_s
 					path_part_opt = path_part[1] == ARG_CHAR_OPT
 					next args unless path_part[0] == ARG_CHAR
-					break args if path_part_opt && request_part.nil?
+					break args if path_part_opt && request_part.empty?
 					args[
 						path_part[(path_part_opt ? 2 : 1)..-1].to_sym
 					] = URI.decode(request_part)
 				end
 			end
 
+			## Method for Routes comparison
+			def ==(other)
+				%i[controller action method path_parts].reduce(true) do |result, method|
+					result && (
+						public_send(method) == other.public_send(method)
+					)
+				end
+			end
+
+			## Compare by path parts count (more is matter)
+			def <=>(other)
+				other.path_parts.size <=> path_parts.size
+			end
+
 			def self.path_merge(*parts)
 				parts.join('/').gsub(%r{\/{2,}}, '/')
 			end
@@ -79,19 +99,28 @@ module Flame
 			end
 
 			def compare_path_parts(request_parts)
-				# p route_path
-				req_path_parts = @path_parts.select { |part| part[1] != ARG_CHAR_OPT }
-				return false if request_parts.count < req_path_parts.count
-				# compare_parts(request_parts, self[:path_parts])
-				request_parts.each_with_index do |request_part, i|
-					path_part = @path_parts[i]
-					# p request_part, path_part
-					break false unless path_part
-					next if path_part[0] == ARG_CHAR
-					break false unless request_part == path_part
+				return false unless request_contain_required_path_parts?(request_parts)
+				[request_parts.size, @path_parts.size].max.times do |i|
+					break false unless compare_parts request_parts[i], @path_parts[i]
 				end
 			end
 
+			def compare_parts(request_part, path_part)
+				# p request_part, path_part
+				return unless path_part
+				return if request_part.nil? && path_part[1] != ARG_CHAR_OPT
+				# p request_part, path_part
+				return true if path_part[0] == ARG_CHAR
+				return true if request_part == path_part
+			end
+
+			def request_contain_required_path_parts?(request_parts)
+				req_path_parts = @path_parts.reject { |part| part[1] == ARG_CHAR_OPT }
+				fixed_path_parts = @path_parts.reject { |part| part[0] == ARG_CHAR }
+				(request_parts & fixed_path_parts) == fixed_path_parts &&
+					request_parts.count >= req_path_parts.count
+			end
+
 			## Helpers for `assign_arguments`
 			def assign_argument(path_part, args = {})
 				## Not argument

data/lib/flame/router.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require_relative 'route'
-require_relative 'validators'
 
 module Flame
 	## Router class for routing
@@ -13,14 +14,13 @@ module Flame
 
 		## Add the controller with it's methods to routes
 		## @param ctrl [Flame::Controller] class of the controller which will be added
-		## @param path [String] root path for controller's methods
-		## @param block [Proc, nil] block for routes refine
-		def add_controller(ctrl, path, block = nil)
+		## @param path [String, nil] root path for controller's methods
+		## @yield block for routes refine
+		def add_controller(ctrl, path = nil, &block)
 			## @todo Add Regexp paths
 
 			## Add routes from controller to glob array
 			route_refine = RouteRefine.new(self, ctrl, path, block)
-			return unless Validators::ActionsValidator.new(route_refine).valid?
 			concat_routes(route_refine)
 		end
 
@@ -76,7 +76,7 @@ module Flame
 				execute(&block)
 			end
 
-			%i(GET POST PUT PATCH DELETE).each do |request_method|
+			%i[GET POST PUT PATCH DELETE].each do |request_method|
 				## Define refine methods for all HTTP methods
 				## @overload post(path, action)
 				##   Execute action on requested path and HTTP method
@@ -98,10 +98,11 @@ module Flame
 					end
 					## Make path by controller method with parameners
 					path = default_action_path(action, path) if prefix || path.nil?
-					## Merge action path with controller path
-					path = Route.path_merge(@path, path)
-					route = Route.new(@ctrl, action, method, path)
+					## Init new Route
+					route = Route.new(@ctrl, action, method, @path, path)
+					## Try to find route with the same action
 					index = find_route_index(action: action)
+					## Overwrite route if needed
 					index ? @routes[index] = route : @routes.push(route)
 				end
 			end
@@ -132,7 +133,7 @@ module Flame
 			## @yield Block of code for routes refine
 			def mount(ctrl, path = nil, &block)
 				path = Route.path_merge(@path, path || ctrl.default_path)
-				@router.add_controller(ctrl, path, block)
+				@router.add_controller(ctrl, path, &block)
 			end
 
 			private
@@ -141,7 +142,7 @@ module Flame
 			def execute(&block)
 				instance_exec(&block) if block
 				defaults
-				@routes.sort! { |a, b| b.path <=> a.path }
+				@routes.sort!
 			end
 
 			def find_route_index(attrs)

data/lib/flame/static.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Flame
 	class Dispatcher
 		## Module for working with static files
@@ -19,7 +21,7 @@ module Flame
 			def return_static(file)
 				file_time = File.mtime(file)
 				halt 304 if static_cached?(file_time)
-				content_type File.extname(file)
+				response.content_type = File.extname(file)
 				response[Rack::CACHE_CONTROL] = 'no-cache'
 				response['Last-Modified'] = file_time.httpdate
 				body File.read(file)

data/lib/flame/validators.rb

@@ -1,10 +1,11 @@
-require_relative 'route'
+# frozen_string_literal: true
+
 require_relative 'errors'
 
 module Flame
 	module Validators
 		## Compare arguments from path and from controller's action
-		class ArgumentsValidator
+		class RouteArgumentsValidator
 			def initialize(ctrl, path, action)
 				@ctrl = ctrl
 				@path = path
@@ -12,81 +13,54 @@ module Flame
 			end
 
 			def valid?
-				## Break path for ':arg' arguments
-				@path_args = path_arguments(@path)
-				## Take all and required arguments from Controller#action
-				@action_args = action_arguments(@action)
-				## Compare arguments from path and arguments from method
-				no_extra_path_arguments? && no_extra_action_arguments?
+				## Get hash of any extra arguments
+				extra = %i[req opt].find do |type|
+					found = extra_arguments(type).find do |place, args|
+						break { place: place, type: type, args: args } if args.any?
+					end
+					break found if found
+				end
+				## Return true if no any extra argument
+				return true unless extra
+				## Raise error with extra arguments
+				raise Errors::RouteArgumentsError.new(@ctrl, @action, @path, extra)
 			end
 
 			private
 
 			## Split path to args array
-			def path_arguments(path)
-				args = path.split('/').select { |part| part[0] == Router::ARG_CHAR }
-				args.map do |arg|
-					opt_arg = arg[1] == Router::ARG_CHAR_OPT
-					arg[(opt_arg ? 2 : 1)..-1].to_sym
-				end
+			def path_arguments
+				@path_arguments ||= @path.split('/')
+					.each_with_object(req: [], opt: []) do |part, hash|
+						## Take only argument parts
+						next if part[0] != Router::ARG_CHAR
+						## Clean argument from special chars
+						clean_part = part.delete(
+							Router::ARG_CHAR + Router::ARG_CHAR_OPT
+						).to_sym
+						## Memorize arguments
+						hash[part[1] != Router::ARG_CHAR_OPT ? :req : :opt] << clean_part
+					end
 			end
 
 			## Take args from controller's action
-			def action_arguments(action)
-				parameters = @ctrl.instance_method(action).parameters
-				req_parameters = parameters.select { |par| par[0] == :req }
-				{
-					all: parameters.map { |par| par[1] },
-					req: req_parameters.map { |par| par[1] }
-				}
+			def action_arguments
+				return @action_arguments if @action_arguments
+				## Get all parameters (arguments) from method
+				## Than collect and sort parameters into hash
+				@ctrl.instance_method(@action).parameters
+					.each_with_object(req: [], opt: []) do |param, hash|
+						## Only required parameters must be in `:req`
+						hash[param[0]] << param[1]
+					end
 			end
 
-			def no_extra_path_arguments?
-				## Subtraction action args from path args
-				extra_path_args = @path_args - @action_args[:all]
-				return true if extra_path_args.empty?
-				raise Errors::RouterError::ExtraPathArgumentsError.new(
-					@ctrl, @action, @path, extra_path_args
-				)
-			end
-
-			def no_extra_action_arguments?
-				## Subtraction path args from action required args
-				extra_action_args = @action_args[:req] - @path_args
-				return true if extra_action_args.empty?
-				raise Errors::RouterError::ExtraActionArgumentsError.new(
-					@ctrl, @action, @path, extra_action_args
-				)
-			end
-		end
-
-		## Compare actions from routes and from controller
-		class ActionsValidator
-			def initialize(route_refine)
-				@routes_actions = route_refine.routes.map(&:action)
-				@ctrl = route_refine.ctrl
-			end
-
-			def valid?
-				no_extra_routes_actions? && no_extra_controller_actions?
-			end
-
-			private
-
-			def no_extra_routes_actions?
-				extra_routes_actions = @routes_actions - @ctrl.actions
-				return true if extra_routes_actions.empty?
-				raise Errors::RouterError::ExtraRoutesActionsError.new(
-					@ctrl, extra_routes_actions
-				)
-			end
-
-			def no_extra_controller_actions?
-				extra_ctrl_actions = @ctrl.actions - @routes_actions
-				return true if extra_ctrl_actions.empty?
-				raise Errors::RouterError::ExtraControllerActionsError.new(
-					@ctrl, extra_ctrl_actions
-				)
+			## Calculate path and action extra arguments
+			def extra_arguments(type)
+				{
+					ctrl: action_arguments[type] - path_arguments[type],
+					path: path_arguments[type] - action_arguments[type]
+				}
 			end
 		end
 	end

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '4.11.3.2'.freeze
+	VERSION = '4.12.2'
 end

data/template/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 ## Framework

data/template/Rakefile.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :db do
 	## Require libs and config
 	require 'sequel'

data/template/app.rb.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module <%= @module_name %>
 	## Class for application (mounting controllers)
 	class Application

data/template/config.ru.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## Require gems
 require 'bundler'
 Bundler.require

data/template/config/sequel.rb.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 ## Database initialize for Sequel

data/template/controllers/_base_controller.rb.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module <%= @module_name %>
 	## Base controller for any others controllers
 	class Controller < Flame::Controller

data/template/server

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 ## Functons
 def show_usage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.11.3.2
+  version: 4.12.2
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,6 +80,104 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.48'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.48'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: bacon-colored_output
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -92,6 +190,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Use controller's classes with instance methods as routing actions, mounting
   its in application class.
 email:
@@ -155,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Web-framework, based on MVC-pattern