flame 4.10.0 → 4.11.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8395ff4675716dc3fb9aa3aa58b997624ca10d57
-  data.tar.gz: c612ae674eeb4571b71f42fcb39e60ccc8fc4f1f
+  metadata.gz: 3091319c3472e5cbf2fd06a7f771df6b2728e9fb
+  data.tar.gz: 1f379f843e562ff2c734b8260e60e8c9aaf44132
 SHA512:
-  metadata.gz: 639a69107187f6e64953d34c99abf822058c35ec320db0f0f54d84692f0810070825eec83bfeec11276e84e5f506277fa517d6f3a93a5e04bcfe08b684ecdd51
-  data.tar.gz: eed88fd30af185d4590519ad5e817744287082e7bedbb23de02c33662f3cc0b075d71b48a0d5c59300e81495036ba544b62eb6d1191a7f3755b44e7d592dac39
+  metadata.gz: 878cd581f5f128f2152e71e379cf2beff8cc162da4d5b9e3b26d6cf5022d6ece235e4076f211818b8e112f0d62fea683b5eab6aa83910c8ed60cf8adae6c1135
+  data.tar.gz: 0fefbfc57c4ef14a2899e700c9bfef0429ee500ace9d2bf28455cbb2df20f68fc302d77818b907ff5eb94e8b1e04291163d8e5355926862f224fb0d0017362e7

data/lib/flame/controller.rb

@@ -1,16 +1,25 @@
 # frozen_string_literal: true
 
+require 'forwardable'
 require_relative 'render'
 
 module Flame
 	## Class initialize when Dispatcher found route with it
 	## For new request and response
 	class Controller
+		extend Forwardable
+
 		## Shortcut for not-inherited public methods: actions
 		def self.actions
 			public_instance_methods(false)
 		end
 
+		def_delegators(
+			:@dispatcher,
+			:config, :request, :params, :halt, :session, :response, :status, :body,
+			:default_body, :content_type
+		)
+
 		## Initialize the controller for request execution
 		## @param dispatcher [Flame::Dispatcher] dispatcher object
 		def initialize(dispatcher)
@@ -54,7 +63,7 @@ module Flame
 			return unless filename
 			response[content_dis] << "; filename=\"#{File.basename(filename)}\""
 			ext = File.extname(filename)
-			content_type(ext) unless response[Rack::CONTENT_TYPE] || ext.empty?
+			content_type(ext) unless ext.empty?
 		end
 
 		## Render a template with `Flame::Render` (based on Tilt-engine)
@@ -73,38 +82,32 @@ module Flame
 		end
 		alias render view
 
+		protected
+
 		## Execute the method of the controller with hooks (may be overloaded)
 		## @param method [Symbol] name of the controller method
 		def execute(method)
 			# send method
-			body send(
-				method,
-				*params.values_at(
-					*self.class.instance_method(method).parameters.map { |par| par[1] }
-				)
-			)
-		rescue => exception
-			# p 'rescue from controller'
-			status 500
-			dump_error(exception)
-
-			## Re-raise exception for inherited controllers or `Flame::Dispatcher`
-			raise exception
+			body send(method, *select_args(method))
 		end
 
-		## Call helpers methods from `Flame::Dispatcher`
-		def method_missing(m, *args, &block)
-			return super unless @dispatcher.respond_to?(m)
-			@dispatcher.send(m, *args, &block)
-		end
-
-		## Respond to Dispatcher methods
-		def respond_to_missing?(m, *)
-			@dispatcher.respond_to?(m) || super
+		## Default method for Internal Server Error, can be inherited
+		def server_error(_exception)
+			body default_body
 		end
 
 		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)
+				)
+			end
+			params_select.call(:req) + params_select.call(:opt).compact
+		end
+
 		def add_controller_class(args)
 			args.unshift(self.class) if args[0].is_a?(Symbol)
 			args.insert(1, :index) if args[0].is_a?(Class) && !args[1].is_a?(Symbol)

data/lib/flame/dispatcher.rb

@@ -25,7 +25,7 @@ module Flame
 		## Start of execution the request
 		def run!
 			catch :halt do
-				try_fix_slashes ||
+				# try_fix_slashes ||
 					try_route ||
 					try_static ||
 					try_static(File.join(__dir__, '..', '..', 'public')) ||
@@ -130,12 +130,12 @@ module Flame
 		## Add error's backtrace to @env['rack.errors'] (terminal or file)
 		## @param error [Exception] exception for class, message and backtrace
 		def dump_error(error)
-			@error_message = [
+			error_message = [
 				"#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} - " \
 				"#{error.class} - #{error.message}:",
 				*error.backtrace
 			].join("\n\t")
-			@env['rack.errors'].puts(@error_message)
+			@env['rack.errors'].puts(error_message)
 		end
 
 		## Generate default body of error page
@@ -168,12 +168,13 @@ module Flame
 			status 200
 			params.merge!(route.arguments(request.path_parts))
 			# route.execute(self)
-			route_exec(route)
+			controller = route.controller.new(self)
+			controller.send(:execute, route.action)
 		rescue => exception
 			# p 'rescue from dispatcher'
-			dump_error(exception) unless @error_message
-			halt 500
-
+			dump_error(exception)
+			status 500
+			controller.send(:server_error, exception)
 			# p 're raise exception from dispatcher'
 			# raise exception
 		end
@@ -188,13 +189,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_exec(route, :default_body)
+			route.controller.new(self).send(:execute, :default_body)
 			body default_body if body.empty?
 		end
-
-		## Create controller object and execute method with arguments
-		def route_exec(route, method = route.action)
-			route.controller.new(self).send(:execute, method)
-		end
 	end
 end

data/lib/flame/render.rb

@@ -67,9 +67,14 @@ module Flame
 			paths = [path]
 			paths.push(dirs.last) if path.to_sym == :index
 			dirs.push(nil)
-			Dir[
+			files = Dir[
 				File.join(views_dir, "{#{dirs.join(',')}}", "{#{paths.join(',')}}.*")
-			].uniq
+			]
+			clean_paths files
+		end
+
+		def clean_paths(paths)
+			paths.map! { |path| Pathname.new(path).cleanpath.to_s }.uniq
 		end
 
 		## Find template-file by path

data/lib/flame/static.rb

@@ -2,6 +2,8 @@ module Flame
 	class Dispatcher
 		## Module for working with static files
 		module Static
+			private
+
 			## Find static files and try return it
 			def try_static(dir = config[:public_dir])
 				file = File.join(dir, URI.decode(request.path_info))
@@ -18,11 +20,9 @@ module Flame
 				file_time = File.mtime(file)
 				halt 304 if static_cached?(file_time)
 				content_type File.extname(file)
+				response[Rack::CACHE_CONTROL] = 'no-cache'
 				response['Last-Modified'] = file_time.httpdate
-				# 'Content-Disposition' => 'attachment;' \
-				# 	"filename=\"#{File.basename(static_file)}\"",
-				# 'Content-Length' => File.size?(static_file).to_s
-				halt 200, File.read(file)
+				body File.read(file)
 			end
 		end
 	end

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.3.1
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Web-framework, based on MVC-pattern