flame 1.1.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d769cfd063c4c30f57f93caf9bcea00762ee88b
-  data.tar.gz: cf5f851acfee41d52b948842bf05c490bda8874a
+  metadata.gz: 7a8a6e9ec49e13ce6525784b5d0d7edf48611c8e
+  data.tar.gz: 0d8f202fcba084fa9ea5f6a345261988eaa243cc
 SHA512:
-  metadata.gz: 9aed5f8f99ca2673c6a33082b3480e7dba6e6cd4ea96ac5d5b83199bfdb10f870e2b95982c8da2974fed7fed9a4d6f950201155d48318ac64cf51d972f8fb77a
-  data.tar.gz: 52f450070696fcc94174d9dfdc03dc3a92d265adecd7c6de414b2e9d4182ff58232bd1b261b2a63740335484fdd25dcb8ae7f106051997dce6a3d861d6cc0426
+  metadata.gz: 57d3bfaedc2df1e95e51f3c7945a51eb9e967a557fbe9107fcab8dcd66c5d3e93b67509b550c330f226fc4b4302707cdc97d9a171aa13114506cef487950c290
+  data.tar.gz: 9d1158d78e084299b29eaf9ccede5ccc29ea9587cd141531c94d151063af8545a8b535e9ea93fc29e6e25cebd66113b5f759a9193eff55dbd8bd1785a582c7a6

data/lib/flame.rb

@@ -1,4 +1,3 @@
 require 'gorilla-patch/string'
 
 require_relative 'flame/application'
-require_relative 'flame/controller'

data/lib/flame/application.rb

@@ -22,15 +22,36 @@ module Flame
 			)
 		end
 
+		def initialize
+			app = self
+			@builder = Rack::Builder.new do
+				app.class.middlewares.each { |m| use m[:class], *m[:args], &m[:block] }
+				run app
+			end
+		end
+
 		## Init function
 		def call(env)
-			Dispatcher.new(self, env).run!
+			if env[:FLAME_CALL]
+				Dispatcher.new(self, env).run!
+			else
+				env[:FLAME_CALL] = true
+				@builder.call env
+			end
 		end
 
 		def self.mount(ctrl, path = nil, &block)
 			router.add_controller(ctrl, path, block)
 		end
 
+		def self.use(middleware, *args, &block)
+			middlewares << { class: middleware, args: args, block: block }
+		end
+
+		def self.middlewares
+			@middlewares ||= []
+		end
+
 		## Router for routing
 		def self.router
 			@router ||= Flame::Router.new

data/lib/flame/dispatcher.rb

@@ -1,10 +1,13 @@
 require 'rack'
 require_relative 'request'
+require_relative 'render'
 
 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
@@ -59,7 +62,7 @@ module Flame
 		end
 
 		def path_to(ctrl, action, args = {})
-			route = @app.router.find_route(controller: ctrl, action: action)
+			route = router.find_route(controller: ctrl, action: action)
 			fail RouteNotFoundError.new(ctrl, action) unless route
 			path = route.assign_arguments(args)
 			path.empty? ? '/' : path
@@ -79,18 +82,31 @@ module Flame
 			@cookies ||= Cookies.new(request.cookies, response)
 		end
 
+		def view(path, options = {})
+			Flame::Render.new(self, path, options).render
+		end
+		alias_method :render, :view
+
 		private
 
 		def try_route
-			method = params['_method'] || request.request_method
-			route = @app.router.find_route(
-				method: method,
+			route = router.find_route(
+				method: request.http_method,
 				path_parts: request.path_parts
 			)
 			# p route
 			return nil unless route
 			status 200
-			route.execute(self)
+			params.merge!(route.arguments(request.path_parts))
+			# route.execute(self)
+			execute_route(route)
+		end
+
+		def execute_route(route)
+			@controller = route[:controller]
+			singleton_class.include @controller
+			router.find_befores(route).each { |before| send(before) }
+			send(route[:action], *route.arranged_params(params))
 		end
 
 		def try_static(dir = config[:public_dir])

data/lib/flame/render.rb

@@ -52,7 +52,7 @@ module Flame
 		def controller_dirs
 			## Build controller_dirs
 			controller_dir = (
-				@ctrl.class.name.underscore.split('_') - %w(controller ctrl)
+				@ctrl.controller.name.underscore.split('_') - %w(controller ctrl)
 			).join('_')
 			[controller_dir, controller_dir.split('/').last]
 		end

data/lib/flame/request.rb

@@ -4,5 +4,9 @@ module Flame
 		def path_parts
 			@path_parts ||= path_info.to_s.split('/').reject(&:empty?)
 		end
+
+		def http_method
+			params['_method'] || request_method
+		end
 	end
 end

data/lib/flame/route.rb

@@ -28,38 +28,29 @@ module Flame
 			  .unshift('').join('/').gsub(%r{\/{2,}}, '/')
 		end
 
-		## Execute by Application.call
-		def execute(dispatcher)
-			ctrl = self[:controller].new(dispatcher)
-			dispatcher.params.merge!(arguments(dispatcher.request.path_parts))
-			dispatcher.router.find_befores(self).each { |before| ctrl.send(before) }
-			ctrl.send(self[:action], *arranged_arguments)
-		end
-
-		private
-
 		## Extract arguments from request_parts for `execute`
-		def arguments(request_parts = nil)
-			unless request_parts.nil?
-				@args = {}
-				self[:path_parts].each_with_index do |path_part, i|
-					next unless path_part[0] == ':'
-					@args[
-					  path_part[(path_part[1] == '?' ? 2 : 1)..-1].to_sym
-					] = URI.decode(request_parts[i])
-				end
+		def arguments(request_parts)
+			self[:path_parts].each_with_index.with_object({}) do |(path_part, i), args|
+				request_part = request_parts[i]
+				path_part_opt = path_part[1] == '?'
+				next args unless path_part[0] == ':'
+				break args if path_part_opt && request_part.nil?
+				args[
+				  path_part[(path_part_opt ? 2 : 1)..-1].to_sym
+				] = URI.decode(request_part)
 			end
-			@args
 		end
 
 		## Arguments in order as parameters of method of controller
-		def arranged_arguments
+		def arranged_params(params)
 			self[:controller].instance_method(self[:action]).parameters
 			  .each_with_object([]) do |par, arr|
-				  arr << @args[par[1]] if par[0] == :req || @args[par[1]]
+				  arr << params[par[1]] if par[0] == :req || params[par[1]]
 			  end
 		end
 
+		private
+
 		## Helpers for `compare_attributes`
 		def compare_attribute(name, value)
 			case name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -74,7 +74,6 @@ extra_rdoc_files: []
 files:
 - lib/flame.rb
 - lib/flame/application.rb
-- lib/flame/controller.rb
 - lib/flame/dispatcher.rb
 - lib/flame/errors.rb
 - lib/flame/render.rb

data/lib/flame/controller.rb

@@ -1,53 +0,0 @@
-require_relative 'render'
-
-module Flame
-	## Class for controllers helpers, like Framework::Controller
-	class Controller
-		def initialize(dispatcher)
-			@dispatcher = dispatcher
-		end
-
-		def config
-			@dispatcher.config
-		end
-
-		def request
-			@dispatcher.request
-		end
-
-		def response
-			@dispatcher.response
-		end
-
-		def params
-			@dispatcher.params
-		end
-
-		def view(path, options = {})
-			Flame::Render.new(self, path, options).render
-		end
-		alias_method :render, :view
-
-		def halt(*params)
-			@dispatcher.halt(*params)
-		end
-
-		def path_to(*params)
-			@dispatcher.path_to(*params)
-		end
-
-		def redirect(*params)
-			@dispatcher.redirect(*params)
-		end
-
-		def session
-			@dispatcher.session
-		end
-
-		def cookies
-			@dispatcher.cookies
-		end
-
-		## TODO: Add more helpers
-	end
-end