flame 5.0.0.rc3 → 5.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85eb7af6c0680bae7f00910a6e7ba21746509241
-  data.tar.gz: 38b4a71563308b2bde1e3456858eb6c6c6077bcb
+  metadata.gz: 259cf7c25a2317589f783f23035eacedceb74b99
+  data.tar.gz: 3dbf704b496815c17b9fa91abccf994de48d98f1
 SHA512:
-  metadata.gz: 6cdb664fcf2109d1b38a34f7d70019c4118bb4489b1e2a6a5c1d45fab4806c1f972c5f6cd1a5f3597cdea2a589fa36a9cb07fc0ebccb8ad3af156dd946ab159f
-  data.tar.gz: b3e61c07ab4ab996c2f5964b0ddc0380df3898e56c5b7c39e7372426db709524bfb0381da4bc52f01f94a1f998e98c373392d7bac8b3d1232d8e1726d85350ff
+  metadata.gz: acc9200dcfafcbf1619fb10c64c8785ab2de5008887b1f095d1ba2fc9957fdb130606b5d374e629389b1cc5951b9f4532285e87d0be17e8198b296939b2dc66d
+  data.tar.gz: f0e522ab711b0235623846a4e99559b8bcb06ce8c6ae78936da29fcab4c61a832c8748f420b081873492d589a9cb8b064ad6c235aed9c76170c84e85eda3200a

data/lib/flame/application.rb

@@ -28,7 +28,7 @@ module Flame
 			def require_dirs(dirs)
 				caller_dir = File.dirname caller_file
 				dirs.each do |dir|
-					Dir[File.join(caller_dir, dir, '**', '*.rb')]
+					Dir[File.join(caller_dir, dir, '**/*.rb')]
 						.reject { |file| File.executable?(file) }
 						.sort_by { |s| [File.basename(s)[0], s] }
 						.each { |file| require File.expand_path(file) }
@@ -82,8 +82,6 @@ module Flame
 				caller(2..2).first.split(':')[0]
 			end
 
-			using GorillaPatch::DeepMerge
-
 			## Mount controller in application class
 			## @param controller [Symbol] the snake-cased name of mounted controller
 			##   (without `Controller` or `::IndexController` for namespaces)
@@ -105,13 +103,9 @@ module Flame
 			##   end
 			def mount(controller_name, path = nil, &block)
 				## Add routes from controller to glob array
-
-				routes_refine = Router::RoutesRefine.new(
+				router.add Router::RoutesRefine.new(
 					router, namespace, controller_name, path, &block
 				)
-
-				router.routes.deep_merge! routes_refine.routes
-				router.reverse_routes.merge! routes_refine.reverse_routes
 			end
 
 			using GorillaPatch::Namespace

data/lib/flame/controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'forwardable'
-require 'gorilla-patch/namespace'
+require 'gorilla_patch/namespace'
 
 require_relative 'controller/path_to'
 require_relative 'render'
@@ -40,6 +40,28 @@ module Flame
 			end
 		end
 
+		## Re-define public instance method from module
+		## @example Define actions from module in controller
+		##   class MyController < BaseController
+		##     include with_actions Module1
+		##     include with_actions Module2
+		##     ....
+		##   end
+		def self.with_actions(mod, exclude: [])
+			Module.new do
+				@mod = mod
+				@exclude = exclude
+
+				def self.included(ctrl)
+					ctrl.include @mod
+
+					(@mod.public_instance_methods - @exclude).each do |meth|
+						ctrl.send :define_method, meth, @mod.public_instance_method(meth)
+					end
+				end
+			end
+		end
+
 		def_delegators(
 			:@dispatcher,
 			:config, :request, :params, :halt, :session, :response, :status, :body,
@@ -194,6 +216,17 @@ module Flame
 				parts = [modules.last] if parts.empty?
 				Flame::Path.merge nil, parts.join('_')
 			end
+
+			def refined_http_methods
+				@refined_http_methods ||= []
+			end
+
+			Flame::Router::HTTP_METHODS.each do |http_method|
+				downcased_http_method = http_method.downcase
+				define_method(downcased_http_method) do |action_path, action = nil|
+					refined_http_methods << [downcased_http_method, action_path, action]
+				end
+			end
 		end
 	end
 end

data/lib/flame/dispatcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gorilla-patch/symbolize'
+require 'gorilla_patch/symbolize'
 
 require_relative 'dispatcher/request'
 require_relative 'dispatcher/response'
@@ -14,10 +14,10 @@ require_relative 'errors/route_not_found_error'
 module Flame
 	## Helpers for dispatch Flame::Application#call
 	class Dispatcher
-		GEM_STATIC_FILES = File.join __dir__, '..', '..', 'public'
+		GEM_STATIC_FILES = File.join(__dir__, '../../public').freeze
 
 		extend Forwardable
-		def_delegators :@app_class, :path_to
+		def_delegators :@app_class, :router, :path_to
 
 		attr_reader :request, :response
 
@@ -37,13 +37,15 @@ module Flame
 		## Start of execution the request
 		def run!
 			catch :halt do
+				validate_request
+
 				try_options ||
 					try_static ||
 					try_static(dir: GEM_STATIC_FILES) ||
 					try_route ||
 					halt(404)
 			end
-			response.write body unless request.http_method == :HEAD
+			response.write body unless request.head?
 			response.finish
 		end
 
@@ -71,7 +73,13 @@ module Flame
 
 		## Parameters of the request
 		def params
-			@params ||= request.params.symbolize_keys(deep: true)
+			@params ||=
+				begin
+					request.params.symbolize_keys(deep: true)
+				rescue ArgumentError => e
+					raise unless e.message.include?('invalid %-encoding')
+					{}
+				end
 		end
 
 		## Session object as Hash
@@ -92,8 +100,7 @@ module Flame
 		## Available routes endpoint
 		def available_endpoint
 			return @available_endpoint if defined? @available_endpoint
-			@available_endpoint =
-				@app_class.router.routes.navigate(*request.path.parts)
+			@available_endpoint = router.navigate(*request.path.parts)
 		end
 
 		## Interrupt the execution of route, and set new optional data
@@ -141,6 +148,14 @@ module Flame
 
 		private
 
+		def validate_request
+			## https://github.com/rack/rack/issues/337#issuecomment-48555831
+			request.params
+		rescue ArgumentError => e
+			raise unless e.message.include?('invalid %-encoding')
+			halt 400
+		end
+
 		## Return response if HTTP-method is OPTIONS
 		def try_options
 			return unless request.http_method == :OPTIONS

data/lib/flame/dispatcher/request.rb

@@ -11,7 +11,17 @@ module Flame
 
 			## Override HTTP-method of the request if the param '_method' found
 			def http_method
-				@http_method ||= (params['_method'] || request_method).upcase.to_sym
+				return @http_method if defined?(@http_method)
+
+				method_from_method =
+					begin
+						params['_method']
+					rescue ArgumentError => e
+						## https://github.com/rack/rack/issues/337#issuecomment-48555831
+						raise unless e.message.include?('invalid %-encoding')
+					end
+
+				@http_method = (method_from_method || request_method).upcase.to_sym
 			end
 		end
 	end

data/lib/flame/dispatcher/routes.rb

@@ -23,7 +23,7 @@ module Flame
 			## @param route [Flame::Route] route that must be executed
 			def execute_route(route, action = route.action)
 				params.merge!(
-					@app_class.router.path_of(route).extract_arguments(request.path)
+					router.path_of(route).extract_arguments(request.path)
 				)
 				# route.execute(self)
 				controller = route.controller.new(self)
@@ -42,7 +42,7 @@ module Flame
 				## Return nil if must be no body for current HTTP status
 				return if Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status)
 				## Find the nearest route by the parts of requested path
-				route = @app_class.router.find_nearest_route(request.path)
+				route = router.find_nearest_route(request.path)
 				## Return standard `default_body` if the route not found
 				return default_body unless route
 				controller = route.controller.new(self)

data/lib/flame/dispatcher/static.rb

@@ -34,7 +34,7 @@ module Flame
 			class StaticFile
 				def initialize(filename, dir)
 					@filename = filename.to_s
-					@file_path = File.join dir, URI.decode_www_form_component(@filename)
+					@file_path = File.join dir, CGI.unescape(@filename)
 				end
 
 				def exist?

data/lib/flame/path.rb

@@ -86,14 +86,7 @@ module Flame
 		## @param other_path [Flame::Path] other path with values at arguments
 		## @return [Hash{Symbol => String}] hash of arguments from two paths
 		def extract_arguments(other_path)
-			parts.each_with_index.with_object({}) do |(part, i), args|
-				other_part = other_path.parts[i].to_s
-				next args unless part.arg?
-				break args if part.opt_arg? && other_part.empty?
-				args[
-					part[(part.opt_arg? ? 2 : 1)..-1].to_sym
-				] = URI.decode_www_form_component(other_part)
-			end
+			Extractor.new(parts, other_path.parts).run
 		end
 
 		## Assign arguments to path for `Controller#path_to`
@@ -137,11 +130,55 @@ module Flame
 			param
 		end
 
+		## Class for extracting arguments from other path
+		class Extractor
+			def initialize(parts, other_parts)
+				@parts = parts
+				@other_parts = other_parts
+
+				@index = 0
+				@other_index = 0
+
+				@args = {}
+			end
+
+			def run
+				@parts.each do |part|
+					next static_part_found unless part.arg?
+
+					break if part.opt_arg? && @other_parts.count <= @other_index
+
+					@args[part.clean.to_sym] = extract
+					@index += 1
+				end
+
+				@args
+			end
+
+			private
+
+			def static_part_found
+				@index += 1
+				@other_index += 1
+			end
+
+			def extract
+				other_part = @other_parts[@other_index]
+
+				return if @parts[@index.next] == other_part
+
+				@other_index += 1
+				URI.decode_www_form_component(other_part)
+			end
+		end
+
+		private_constant :Extractor
+
 		## Class for one part of Path
 		class Part
 			extend Forwardable
 
-			def_delegators :@part, :[], :hash
+			def_delegators :@part, :[], :hash, :empty?, :b
 
 			ARG_CHAR = ':'
 			ARG_CHAR_OPT = '?'
@@ -174,6 +211,7 @@ module Flame
 			def to_s
 				@part
 			end
+			alias to_str to_s
 
 			## Is the path part an argument
 			## @return [true, false] an argument or not

data/lib/flame/render.rb

@@ -6,7 +6,7 @@ require 'tilt'
 require 'tilt/plain'
 require 'tilt/erb'
 
-require 'gorilla-patch/inflections'
+require 'gorilla_patch/inflections'
 
 require_relative 'errors/template_not_found_error'
 
@@ -89,7 +89,17 @@ module Flame
 
 		## Find template-file by path
 		def find_file(path)
-			find_files(path, controller_dirs).find { |file| Tilt[file] }
+			caller_path = caller_locations(4..4).first.path
+
+			caller_dir =
+				begin
+					File.dirname(caller_path).sub(views_dir, '') if Tilt[caller_path]
+				rescue LoadError
+					nil
+				end
+
+			find_files(path, controller_dirs | Array(caller_dir))
+				.find { |file| Tilt[file] }
 		end
 
 		## Find layout-files by path

data/lib/flame/router.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'gorilla-patch/deep_merge'
-require 'gorilla-patch/inflections'
-require 'gorilla-patch/namespace'
-require 'gorilla-patch/transform'
+require 'gorilla_patch/deep_merge'
+require 'gorilla_patch/inflections'
+require 'gorilla_patch/namespace'
+require 'gorilla_patch/transform'
 
 require_relative 'router/routes'
 require_relative 'router/route'
@@ -11,6 +11,11 @@ require_relative 'router/route'
 module Flame
 	## Router class for routing
 	class Router
+		HTTP_METHODS = %i[GET POST PUT PATCH DELETE].freeze
+
+		extend Forwardable
+		def_delegators :routes, :navigate
+
 		attr_reader :app, :routes, :reverse_routes
 
 		## @param app [Flame::Application] host application
@@ -20,6 +25,15 @@ module Flame
 			@reverse_routes = {}
 		end
 
+		using GorillaPatch::DeepMerge
+
+		## Add RoutesRefine to Router
+		## @param routes_refine [Flame::Router::RoutesRefine] refined routes
+		def add(routes_refine)
+			routes.deep_merge! routes_refine.routes
+			reverse_routes.merge! routes_refine.reverse_routes
+		end
+
 		## Find the nearest route by path
 		## @param path [Flame::Path] path for route finding
 		## @return [Flame::Route, nil] return the found nearest route or `nil`
@@ -88,7 +102,7 @@ module Flame
 				end
 			end
 
-			%i[GET POST PUT PATCH DELETE].each do |http_method|
+			HTTP_METHODS.each do |http_method|
 				## Define refine methods for all HTTP methods
 				## @overload post(path, action)
 				##   Execute action on requested path and HTTP method
@@ -168,6 +182,10 @@ module Flame
 
 			## Execute block of refinings end sorting routes
 			def execute(&block)
+				@controller.refined_http_methods
+					.each do |http_method, action_path, action|
+						send(http_method, action_path, action)
+					end
 				instance_exec(&block) if block
 				defaults
 			end

data/lib/flame/version.rb

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

data/template/Gemfile

@@ -6,7 +6,7 @@ source 'https://rubygems.org'
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
 ## system
-# gem 'gorilla-patch'
+# gem 'gorilla_patch'
 
 ## server
 gem 'flame', github: 'AlexWayfer/flame'

data/template/Rakefile

@@ -70,7 +70,7 @@ class Question
 	end
 end
 
-DB_CONFIG_FILE = File.join(__dir__, 'config', 'database.yml')
+DB_CONFIG_FILE = File.join(__dir__, 'config/database.yml').freeze
 
 if File.exist? DB_CONFIG_FILE
 	namespace :db do
@@ -97,7 +97,7 @@ if File.exist? DB_CONFIG_FILE
 
 		DB_EXTENSIONS = %w[citext pgcrypto].freeze
 
-		PGPASS_FILE = File.expand_path File.join('~', '.pgpass')
+		PGPASS_FILE = File.expand_path('~/.pgpass').freeze
 
 		PGPASS_LINE =
 			DB_CONFIG
@@ -556,7 +556,7 @@ if File.exist? DB_CONFIG_FILE
 end
 
 namespace :locales do
-	CROWDIN_CONFIG_FILE = File.join('config', 'crowdin.yml')
+	CROWDIN_CONFIG_FILE = 'config/crowdin.yml'
 
 	desc 'Upload files for translation'
 	task :upload do
@@ -668,7 +668,7 @@ end
 namespace :static do
 	desc 'Check static files'
 	task :check do
-		Dir[File.join(__dir__, 'public', '**', '*')].each do |file|
+		Dir[File.join(__dir__, 'public/**/*')].each do |file|
 			basename = File.basename(file)
 			grep_options = '--exclude-dir={\.git,log} --color=always'
 			found = `grep -ir '#{basename}' ./ #{grep_options}`
@@ -689,7 +689,7 @@ namespace :config do
 	task :check do
 		example_suffix = '.example'
 		Dir[
-			File.join(__dir__, 'config', '**', "*#{example_suffix}*")
+			File.join(__dir__, "config/**/*#{example_suffix}*")
 		].each do |example_filename|
 			regular_filename = example_filename.sub(example_suffix, '')
 			if File.exist? regular_filename
@@ -770,7 +770,7 @@ end
 ##  Update from git without migrations and restart (for static files update)
 desc 'Deploy to production server'
 task :deploy, :without_restart do |_t, args|
-	servers = YAML.load_file File.join(__dir__, 'config', 'deploy.yml')
+	servers = YAML.load_file File.join(__dir__, 'config/deploy.yml')
 	rake_command = "rake update[master#{',true' if args.without_restart}]"
 	servers.each do |server|
 		update_command = "cd #{server[:path]} && #{rake_command}"

data/template/config/puma.rb

@@ -47,7 +47,7 @@ worker_timeout env_config[:daemonize] ? 15 : 1_000_000
 threads 0, env_config[:threads_count] || 4
 daemonize env_config[:daemonize]
 
-# bind 'unix://' + File.join(%w[tmp sockets puma.sock])
+# bind 'unix://tmp/sockets/puma.sock'
 env_config[:binds].each do |type, value|
 	value = "#{value[:host]}:#{value[:port]}" if type == :tcp
 	FileUtils.mkdir_p File.join(root_dir, File.dirname(value)) if type == :unix

data/template/server

@@ -111,11 +111,11 @@ def delete_filewatcher_pids_file
 end
 
 def server_config
-	@server_config ||= YAML.load_file(File.join(__dir__, 'config', 'server.yml'))
+	@server_config ||= YAML.load_file(File.join(__dir__, 'config/server.yml'))
 end
 
 def puma_config_file
-	@puma_config_file ||= File.join(__dir__, 'config', 'puma.rb')
+	@puma_config_file ||= File.join(__dir__, 'config/puma.rb')
 end
 
 def puma_pid_file
@@ -137,11 +137,11 @@ def environment
 end
 
 def log_files
-	File.join(__dir__, %w[log {stdout,stderr}])
+	File.join(__dir__, 'log/{stdout,stderr}')
 end
 
 def waiting_mailing_lock
-	while Dir[File.join(__dir__, 'tmp', 'mailing_*')].any?
+	while Dir[File.join(__dir__, 'tmp/mailing_*')].any?
 		puts "\e[31m\e[1mMails sending in progress!\e[22m\e[0m\nWaiting..."
 		sleep 1
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc3
+  version: 5.0.0.rc4
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: gorilla-patch
+  name: gorilla_patch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rack-utf8_sanitizer
   requirement: !ruby/object:Gem::Requirement
@@ -230,16 +230,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.54'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.54'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -320,7 +320,12 @@ files:
 homepage: https://github.com/AlexWayfer/flame
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/AlexWayfer/flame/issues
+  documentation_uri: http://www.rubydoc.info/gems/flame/5.0.0.rc4
+  homepage_uri: https://github.com/AlexWayfer/flame
+  source_code_uri: https://github.com/AlexWayfer/flame
+  wiki_uri: https://github.com/AlexWayfer/flame/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -329,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -337,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Web-framework, based on MVC-pattern