flame 5.0.0.rc6 → 5.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 944d28e5edaf52ca1e890e95213993137cbe1f8dbce55037034da7f4563aa982
-  data.tar.gz: 4ffebec0a643722ed7fa1a093fa998879d17c6b8202478abf3fac09869ba7ed0
+  metadata.gz: 7315121f3053afad8cf444fba552c484d15d7bf0ab66268c72e7945693430e1a
+  data.tar.gz: 19d9c0362c1c9082c323eae5838c661bf830218fc44a9b6f4cd5961ff27282e6
 SHA512:
-  metadata.gz: 770935368f96ca01e869be4b3aae7b92876a9f97cfed969e1a72a2f535c5dd90afe479565210e758f6306a42289e8c7604af8b0d9af6e681341de86ba7c58920
-  data.tar.gz: 79a879f862861ed89a19446b00380d70b7d57b37ca3c8e8fe64b3a20d8e00ccbb38ddafba0b87cfea1382444d66941fe5b0637d1ba689cad4e98f4f00b722c93
+  metadata.gz: 7bcdb7cec68a9d29ef1beada369bca88ee69bee503c8b61476d2d5b7884d243f11443b0b924946480cefa62c12408d92bde60e251fead449d615287efc3ff4aa
+  data.tar.gz: b4f2c55a038b4228f132c396babebfac92ad35bf9ebe120ec88bba20bcb6d6ea4d080b622e87eb1d043f920882eb53368afabd05f004c0659709c9e99e832b04

data/CHANGELOG.md

@@ -4,18 +4,21 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
-## 5.0.0.rc6 (2021-02-10)
-
 ### Added
 
+*   Add ability for controllers auto-mounting \
+    Good bye giant application `mount` blocks! \
+    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
 *   Add support of `OPTIONS` HTTP-method
-*   Add specs for application generator, including application start
 *   Add `Application.require_dirs` method
 *   Add `Controller#path_to_back` method
-*   Receive options for Tilt in `Controller#(render|view)` method
-    via `:tilt` argument
+*   Add `:log_dir` for default config
+*   Add `:require` option for `Config#load_yaml`
+*   Receive options for Tilt in `Controller#(render|view)` method via `:tilt` argument
 *   Add support of block for `Controller#render` method
-*   Add support for Ruby 2.5
 *   Add metadata to Gem specification with links
 *   Add required Ruby version into Gem specification
 *   Add `Controller.with_actions` method for modules
@@ -23,30 +26,33 @@ All notable changes to this project will be documented in this file.
 *   Allow to render view by relative path from current view
 *   Add ability for refining HTTP-methods of actions inside controllers \
     Now you can not use `post`, `patch` and others inside `mount` blocks, yay!
-*   Add `:ignore` parameter for `Application.require_dirs`
 *   Catch `SyntaxError` for custom Internal Server Error page
 *   Add `:only` option to `#with_actions` method
 *   Add cache for `Controller#url_to` in production via `memery` gem
 *   Add ability to refine actions in modules \
     Just `extend Flame::Controller::Actions` in module now,
     and than `include with_actions ThatModule`, as before.
-*   Add ability for controllers auto-mounting \
-    Good bye giant application `mount` blocks! \
-    But you can disable it with `nested: false` option for `mount`,
-    for example, for conditional umbrella application.
 *   Add `Flame::Router::Routes#to_s`, for routes printing
     ```ruby
     puts MyApplication.router.routes
     ```
 *   Add `Request#headers` method (with Camel-Cased Hash)
-*   Allow to mount anonymous controllers
+*   Accept options for cookies setting
+*   Add `Flame::Path#include?` method, forwarding to `#to_s`
+*   Allow integration with `better_errors` gem \
+    More info [here](https://github.com/BetterErrors/better_errors/issues/454).
+*   Add RuboCop plugins, resolve offenses by them
+*   Add `remark` Markdown linter
 
 
 ### Changed
 
 *   Replace Array-based routes system with Hash-based
-*   Refactor `flame new` command of executable file
-*   Update template for application generator
+*   Move `flame` executable and `template/` to separated gem
+    `flame-cli`, not required by default.
+*   Take out `Config` from `Flame::Application` to `Flame` \
+    Now it's possible to load config before routes (and models). \
+    Also add `ConfigFileNotFoundError`.
 *   Replace `URI` building with `Addressable::URI` from external gem
 *   Replace `no-cache` with `public` and `max-age` (one year)
     for `Cache-Control` header for static files
@@ -68,35 +74,37 @@ All notable changes to this project will be documented in this file.
     I think it's unnecessary for API-like usage.
 *   Slightly optimize `StaticFile`
 *   Build query in `#path_to` from root-Hash \
-    Now building a path with merged query parameters is easier,
-    no more `params: {}`.
+    Now building a path with merged query parameters is easier, no more `params: {}`.
 *   Run `Controller#not_found` through `execute` \
     For found nearest routes. \
     Now we can write before-hooks in `execute` also for nonexistent pages.
 *   Don't assign results of `execute` (after-hooks) as `body`
 *   Require directories starting with `_` first
 *   Allow to redefine controller path with `PATH` constant inside
-*   Update RuboCop to version 0.65.0, resolve some new offenses \
-    Also lock at the patch version instead of minor, cause it's still in alpha.
-*   Move `flame` executable and `template/` to separated gem
-    `flame-cli`, not required by default.
+*   Update RuboCop to a new version, resolve new offenses.
 *   Improve version locks for dependencies
+*   Use Depfu instead of closed Gemnasium
 
 ### Removed
 
 *   Remove `Application#config` and `Application#router` methods
-*   Remove Ruby 2.3 support
+*   Remove Ruby < 2.6 support
+*   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).
 
 ### Fixed
 
 *   Fix issue with `nil` in after-hook which returned 404 status
 *   Fix routing to path without an optional argument at the beginning
+*   Fix routing for multiple routes starting with arguments \
+    Example: parent controller with `show(id)` and nested controller at `/:parent_id/nested`.
+*   Avoid new controller creation in `halt`
 
 ### Security
 
 *   Fix exploit with static files \
-    You could get the content of any file
-    from the outside of public directory. \
+    You could get the content of any file from the outside of public directory. \
     It did not work with `nginx`, Cloudflare or something else.
 
 

data/README.md

@@ -1,6 +1,6 @@
 <p align="center">
     <img
-        src="https://raw.githubusercontent.com/AlexWayfer/flame/master/public/favicon.ico"
+        src="https://raw.githubusercontent.com/AlexWayfer/flame/main/public/favicon.ico"
         height="150"
         alt="Flame Logo"
         title="Logo from open-source Elusive-Iconfont (https://github.com/reduxframework/elusive-iconfont)"
@@ -10,8 +10,8 @@
 <h1 align="center">Flame</h1>
 
 <p align="center">
-    <a href="https://cirrus-ci.com/github/AlexWayfer/flame/master"><img
-        src="https://api.cirrus-ci.com/github/AlexWayfer/flame.svg?branch=master"
+    <a href="https://cirrus-ci.com/github/AlexWayfer/flame/main"><img
+        src="https://api.cirrus-ci.com/github/AlexWayfer/flame.svg?branch=main"
         alt="Cirrus CI"
     /></a>
     <a href="https://codecov.io/gh/AlexWayfer/flame"><img
@@ -27,14 +27,14 @@
         alt="Depfu"
     /></a>
     <a href="http://inch-ci.org/github/AlexWayfer/flame"><img
-        src="http://inch-ci.org/github/AlexWayfer/flame.svg?branch=master&style=flat-square"
+        src="http://inch-ci.org/github/AlexWayfer/flame.svg?branch=main&style=flat-square"
         alt="Docs"
     /></a>
     <a href="https://rubygems.org/gems/flame"><img
-        src="https://img.shields.io/gem/v/flame.svg?style=flat-square"
-        alt="Gem"
+        src="https://img.shields.io/gem/v/flame.svg?include_prereleases&style=flat-square"
+        alt="Gem (including prereleases)"
     /></a>
-    <a href="https://github.com/AlexWayfer/flame/blob/master/LICENSE.txt"><img
+    <a href="https://github.com/AlexWayfer/flame/blob/main/LICENSE.txt"><img
         src="https://img.shields.io/github/license/AlexWayfer/flame.svg?style=flat-square"
         alt="MIT license"
     /></a>

data/lib/flame/config.rb

@@ -17,7 +17,7 @@ module Flame
 			super()
 			replace DEFAULT_DIRS.merge(
 				root_dir: File.realpath(root_dir),
-				environment: ENV['RACK_ENV'] || 'development'
+				environment: ENV.fetch('RACK_ENV', 'development')
 			)
 		end
 
@@ -53,7 +53,7 @@ module Flame
 			file_path = find_config_file file, required: required
 			return unless file_path
 
-			yaml = YAML.load_file(file_path)
+			yaml = YAML.load_file(file_path, aliases: true)
 			key ||= File.basename(file, '.*')
 			self[key.to_sym] = yaml if set
 			yaml

data/lib/flame/dispatcher/request.rb

@@ -33,11 +33,8 @@ module Flame
 				env.each_with_object({}) do |(key, value), result|
 					next unless key.start_with?(HEADER_PREFIX)
 
-					## TODO: Replace `String#[]` with `#delete_prefix`
-					## after Ruby < 2.5 dropping
 					camelized_key =
-						key[HEADER_PREFIX.size..-1].downcase.tr('_', '/')
-							.camelize.gsub('::', '-')
+						key.delete_prefix(HEADER_PREFIX).downcase.tr('_', '/').camelize.gsub('::', '-')
 
 					result[camelized_key] = value
 				end

data/lib/flame/dispatcher.rb

@@ -124,7 +124,7 @@ module Flame
 		def dump_error(error)
 			error_message = [
 				"#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} - " \
-				"#{error.class} - #{error.message}:",
+					"#{error.class} - #{error.message}:",
 				*error.backtrace
 			].join("\n\t")
 			@env[Rack::RACK_ERRORS].puts(error_message)

data/lib/flame/errors/route_arguments_order_error.rb

@@ -9,11 +9,9 @@ module Flame
 			## @param wrong_ordered_arguments [Array<Symbol>]
 			##   two wrong ordered arguments
 			def initialize(path, wrong_ordered_arguments)
-				super(
-					"Path '#{path}' should have" \
-						" '#{wrong_ordered_arguments.first}' argument before" \
-						" '#{wrong_ordered_arguments.last}'"
-				)
+				super(<<~MESSAGE.chomp)
+					Path '#{path}' should have '#{wrong_ordered_arguments.first}' argument before '#{wrong_ordered_arguments.last}'
+				MESSAGE
 			end
 		end
 	end

data/lib/flame/errors/route_extra_arguments_error.rb

@@ -23,10 +23,7 @@ module Flame
 					path: "Action '#{ctrl}##{action}'"
 				}[extra[:place]]
 
-				super(
-					"#{entity} has no " \
-						"#{extra[:type_name]} arguments #{extra[:args].inspect}"
-				)
+				super "#{entity} has no #{extra[:type_name]} arguments #{extra[:args].inspect}"
 			end
 		end
 	end

data/lib/flame/errors/route_not_found_error.rb

@@ -10,8 +10,8 @@ module Flame
 			## @param action [Symbol] action with which route not found
 			def initialize(controller, action)
 				super(
-					"Route with controller '#{controller}' and action '#{action}'" \
-					' not found in application routes'
+					"Route with controller '#{controller}' and action '#{action}' " \
+						'not found in application routes'
 				)
 			end
 		end

data/lib/flame/path.rb

@@ -122,10 +122,10 @@ module Flame
 			## Not argument
 			return part unless part.arg?
 			## Not required argument
-			return args.delete(part[2..-1].to_sym) if part.opt_arg?
+			return args.delete(part[2..].to_sym) if part.opt_arg?
 
 			## Required argument
-			param = args.delete(part[1..-1].to_sym)
+			param = args.delete(part[1..].to_sym)
 			## Required argument is nil
 			error = Errors::ArgumentNotAssignedError.new(@path, part)
 			raise error if param.nil?

data/lib/flame/router/routes.rb

@@ -17,7 +17,7 @@ module Flame
 				path = Flame::Path.new(*path_parts)
 				return if path.parts.empty?
 
-				nested_routes = self.class.new Flame::Path.new(*path.parts[1..-1])
+				nested_routes = self.class.new Flame::Path.new(*path.parts[1..])
 				# path.parts.reduce(result) do |hash, part|
 				# 	hash[part] ||= self.class.new
 				# end
@@ -63,8 +63,8 @@ module Flame
 				endpoint =
 					self[path_parts.first] || dig(first_opt_arg_key, path_parts.first)
 
-				endpoint&.navigate(*path_parts[1..-1]) ||
-					find_among_arg_keys(path_parts[1..-1])
+				endpoint&.navigate(*path_parts[1..]) ||
+					find_among_arg_keys(path_parts[1..])
 			end
 
 			## Dig through optional arguments as keys
@@ -106,10 +106,7 @@ module Flame
 			def sort
 				sort_by do |key, _value|
 					[
-						if key.is_a?(Symbol)
-						then Router::HTTP_METHODS.index(key)
-						else Float::INFINITY
-						end,
+						key.is_a?(Symbol) ? Router::HTTP_METHODS.index(key) : Float::INFINITY,
 						key.to_s
 					]
 				end

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc6
+  version: 5.0.0.rc7
 platform: ruby
 authors:
 - Alexander Popov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,6 +58,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -120,42 +134,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: gem_toys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: toys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: better_errors
   requirement: !ruby/object:Gem::Requirement
@@ -176,28 +190,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -232,14 +246,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.35.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.35.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -314,11 +328,13 @@ homepage: https://github.com/AlexWayfer/flame
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   bug_tracker_uri: https://github.com/AlexWayfer/flame/issues
-  documentation_uri: http://www.rubydoc.info/gems/flame/5.0.0.rc6
+  changelog_uri: https://github.com/AlexWayfer/flame/blob/v5.0.0.rc7/CHANGELOG.md
+  documentation_uri: http://www.rubydoc.info/gems/flame/5.0.0.rc7
+  homepage_uri: https://github.com/AlexWayfer/flame
   source_code_uri: https://github.com/AlexWayfer/flame
   wiki_uri: https://github.com/AlexWayfer/flame/wiki
-  homepage_uri: https://github.com/AlexWayfer/flame
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -327,14 +343,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Web-framework, based on MVC-pattern