flame 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a8a6e9ec49e13ce6525784b5d0d7edf48611c8e
-  data.tar.gz: 0d8f202fcba084fa9ea5f6a345261988eaa243cc
+  metadata.gz: 132a976db3536271fcd021dea1158925d8d61db6
+  data.tar.gz: 413e4476ce2a9d76b52894d03088945a389eb299
 SHA512:
-  metadata.gz: 57d3bfaedc2df1e95e51f3c7945a51eb9e967a557fbe9107fcab8dcd66c5d3e93b67509b550c330f226fc4b4302707cdc97d9a171aa13114506cef487950c290
-  data.tar.gz: 9d1158d78e084299b29eaf9ccede5ccc29ea9587cd141531c94d151063af8545a8b535e9ea93fc29e6e25cebd66113b5f759a9193eff55dbd8bd1785a582c7a6
+  metadata.gz: e71747e2c149f2e06a8e3760e8dcef947e4c34ca4a26105a572fcaf2bd9651229264f08d05a5d7dfc2d4b813a2d69cf049fa56706d495ee5a03f33b1a2c6806f
+  data.tar.gz: ebeac2eb2732bcac1530a3b8c0d6994060696de7d82679c4073a23611460f047688c7f2146711a0b1b10082ee84468e01059f3da0609fdd9c2e0b5093a29c3fc

data/lib/flame/application.rb

@@ -20,6 +20,7 @@ module Flame
 				public_dir: File.join(root_dir, 'public'),
 				views_dir: File.join(root_dir, 'views')
 			)
+			app.use Rack::Session::Pool
 		end
 
 		def initialize

data/lib/flame/dispatcher.rb

@@ -6,8 +6,6 @@ module Flame
 	## Class initialize when Application.call(env) invoked
 	## For new request and response
 	class Dispatcher
-		attr_reader :controller
-
 		def initialize(app, env)
 			@app = app
 			@env = env
@@ -103,10 +101,13 @@ module Flame
 		end
 
 		def execute_route(route)
-			@controller = route[:controller]
-			singleton_class.include @controller
+			singleton_class.include route[:controller]
 			router.find_befores(route).each { |before| send(before) }
-			send(route[:action], *route.arranged_params(params))
+			result = send(route[:action], *route.arranged_params(params))
+			router.find_afters(route).each do |after|
+				result = send(after, result)
+			end
+			result
 		end
 
 		def try_static(dir = config[:public_dir])

data/lib/flame/router.rb

@@ -4,11 +4,11 @@ require_relative 'validators'
 module Flame
 	## Router class for routing
 	class Router
-		attr_accessor :routes, :befores
+		attr_accessor :routes, :befores, :afters
 
 		def initialize
 			@routes = []
-			@befores = {}
+			@befores, @afters = Array.new(2) { {} }
 		end
 
 		def add_controller(ctrl, path, block = nil)
@@ -20,6 +20,7 @@ module Flame
 			ActionsValidator.new(ctrl_routes.routes, ctrl).valid?
 			routes.concat(ctrl_routes.routes)
 			befores[ctrl] = ctrl_routes.befores
+			afters[ctrl] = ctrl_routes.afters
 		end
 
 		## Find route by any attributes
@@ -33,12 +34,18 @@ module Flame
 			  (befores[route[:controller]][route[:action]] || [])
 		end
 
+		## Find after hook by Route
+		def find_afters(route)
+			(afters[route[:controller]][:*] || []) +
+			  (afters[route[:controller]][route[:action]] || [])
+		end
+
 		private
 
 		## Helper module for routing refine
 		class RouteRefine
 			attr_accessor :rest_routes
-			attr_reader :routes, :befores
+			attr_reader :routes, :befores, :afters
 
 			def self.http_methods
 				[:GET, :POST, :PUT, :DELETE]
@@ -58,7 +65,7 @@ module Flame
 				@ctrl = ctrl
 				@path = path || default_controller_path
 				@routes = []
-				@befores = {}
+				@befores, @afters = Array.new(2) { {} }
 				block.nil? ? defaults : instance_exec(&block)
 				# p @routes
 				@routes.sort! { |a, b| b[:path] <=> a[:path] }
@@ -76,6 +83,11 @@ module Flame
 				actions.each { |a| (@befores[a] ||= []).push(action) }
 			end
 
+			def after(actions, action)
+				actions = [actions] unless actions.is_a?(Array)
+				actions.each { |a| (@afters[a] ||= []).push(action) }
+			end
+
 			def defaults
 				rest
 				@ctrl.public_instance_methods(false).each do |action|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack