flame 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384b92d10d4900497a38949a18f91ac6ac823132
-  data.tar.gz: c0fc2d6ce00fc8d604e3e0a80e87561e7f16c98b
+  metadata.gz: 9af50356cd5318c1e13712a1acb95b4ac713a5df
+  data.tar.gz: b6fc7c64f4e3f381448e9b4dff1079e8519ad79c
 SHA512:
-  metadata.gz: 61e9d6978c5ef17f5610e95b429cecc2933e876c506d045e352f18d76d0c95b710e986ad3ced8606c9f954f75b2f22bb8f0054b438cf6afac43cde7b6f350f99
-  data.tar.gz: 636d98627dec1e1e85be4f8af0cf847bd6207381d68b02120454c3c5f2bf78a8efffc4e734a8a330a6c2eb9ded1e1175448dc343a50411f54a945787b05f0164
+  metadata.gz: 1cdc29130ab8009c1309876e1e74e58a98b3e4709227b0cd3715abdf86f253bb19dada401c22d9fd46d249092155af3b792d2eb9b89e00709ce2789aa4ba2fec
+  data.tar.gz: b7555fa03d18d8a1fb9f43af2fb7a142dc44abd4bc67f8ef05d692b5bf9f7ec0811f7e2cc73541c88b3cc4cfe8a266a76a4d6efa7477aa67c38360d99a1a8f1a

data/lib/flame.rb

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

data/lib/flame/application.rb

@@ -1,5 +1,5 @@
-require_relative './router'
-require_relative './dispatcher'
+require_relative 'router'
+require_relative 'dispatcher'
 
 module Flame
 	## Core class, like Framework::Application

data/lib/flame/controller.rb

@@ -1,4 +1,4 @@
-require_relative './render'
+require_relative 'render'
 
 module Flame
 	## Class for controllers helpers, like Framework::Controller

data/lib/flame/dispatcher.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require_relative 'request'
 
 module Flame
 	## Class initialize when Application.call(env) invoked
@@ -25,8 +26,12 @@ module Flame
 			@app.config
 		end
 
+		def router
+			@app.router
+		end
+
 		def request
-			@request ||= Rack::Request.new(@env)
+			@request ||= Flame::Request.new(@env)
 		end
 
 		def params
@@ -63,10 +68,9 @@ module Flame
 
 		def try_route
 			method = params['_method'] || request.request_method
-			path = request.path_info
 			route = @app.router.find_route(
 				method: method,
-				path: path
+				path_parts: request.path_parts
 			)
 			# p route
 			return nil unless route

data/lib/flame/request.rb

@@ -0,0 +1,8 @@
+module Flame
+	## Class for requests
+	class Request < Rack::Request
+		def path_parts
+			@path_parts ||= path_info.to_s.split('/').reject(&:empty?)
+		end
+	end
+end

data/lib/flame/route.rb

@@ -4,21 +4,15 @@ module Flame
 		attr_reader :attributes
 
 		def initialize(attrs = {})
-			@attributes = attrs
+			@attributes = attrs.merge(
+				path_parts: attrs[:path].to_s.split('/').reject(&:empty?)
+			)
 		end
 
 		def [](attribute)
 			@attributes[attribute]
 		end
 
-		## Arguments in order as parameters of method of controller
-		def arrange_arguments(args = {})
-			self[:controller].instance_method(self[:action]).parameters
-			  .each_with_object([]) do |par, arr|
-				  arr << args[par[1]] if par[0] == :req || args[par[1]]
-			  end
-		end
-
 		## Compare attributes for `Router.find_route`
 		def compare_attributes(attrs)
 			attrs.each do |name, value|
@@ -29,37 +23,41 @@ module Flame
 
 		## Assign arguments to path for `Controller.path_to`
 		def assign_arguments(args = {})
-			extract_path_parts
+			self[:path_parts]
 			  .map { |path_part| assign_argument(path_part, args) }
 			  .unshift('').join('/').gsub(%r{\/{2,}}, '/')
 		end
 
 		## Execute by Application.call
-		def execute(app)
-			ctrl = self[:controller].new(app)
-			args = extract_arguments(app.request.path_info)
-			app.params.merge!(args)
-			ctrl.send(self[:action], *arrange_arguments(args))
+		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
 
-		## Helpers for attributes accessors
-		def extract_path_parts(other_path = self[:path])
-			other_path.to_s.split('/').reject(&:empty?)
+		## 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
+			end
+			@args
 		end
 
-		## Extract arguments from request_path for `execute`
-		def extract_arguments(request_path)
-			args = {}
-			request_parts = extract_path_parts(request_path)
-			extract_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
-			args
+		## Arguments in order as parameters of method of controller
+		def arranged_arguments
+			self[:controller].instance_method(self[:action]).parameters
+			  .each_with_object([]) do |par, arr|
+				  arr << @args[par[1]] if par[0] == :req || @args[par[1]]
+			  end
 		end
 
 		## Helpers for `compare_attributes`
@@ -67,8 +65,8 @@ module Flame
 			case name
 			when :method
 				compare_method(value)
-			when :path
-				compare_path(value)
+			when :path_parts
+				compare_path_parts(value)
 			else
 				self[name] == value
 			end
@@ -78,18 +76,13 @@ module Flame
 			self[:method].upcase.to_sym == request_method.upcase.to_sym
 		end
 
-		def compare_path(request_path)
-			path_parts = extract_path_parts
-			request_parts = extract_path_parts(request_path)
+		def compare_path_parts(request_parts)
 			# p route_path
-			req_path_parts = path_parts.select { |part| part[1] != '?' }
+			req_path_parts = self[:path_parts].select { |part| part[1] != '?' }
 			return false if request_parts.count < req_path_parts.count
-			compare_parts(request_parts, path_parts)
-		end
-
-		def compare_parts(request_parts, path_parts)
+			# compare_parts(request_parts, self[:path_parts])
 			request_parts.each_with_index do |request_part, i|
-				path_part = path_parts[i]
+				path_part = self[:path_parts][i]
 				# p request_part, path_part
 				break false unless path_part
 				next if path_part[0] == ':'

data/lib/flame/router.rb

@@ -1,13 +1,14 @@
-require_relative './route.rb'
-require_relative './validators.rb'
+require_relative 'route'
+require_relative 'validators'
 
 module Flame
 	## Router class for routing
 	class Router
-		attr_accessor :routes
+		attr_accessor :routes, :befores
 
 		def initialize
 			@routes = []
+			@befores = {}
 		end
 
 		def add_controller(ctrl, path, block = nil)
@@ -15,9 +16,10 @@ module Flame
 			## TODO: Add `before` and `after` methods
 
 			## Add routes from controller to glob array
-			ctrl_routes = RouteRefine.new(ctrl, path, block).routes
-			ActionsValidator.new(ctrl_routes, ctrl).valid?
-			routes.concat(ctrl_routes)
+			ctrl_routes = RouteRefine.new(ctrl, path, block)
+			ActionsValidator.new(ctrl_routes.routes, ctrl).valid?
+			routes.concat(ctrl_routes.routes)
+			befores[ctrl] = ctrl_routes.befores
 		end
 
 		## Find route by any attributes
@@ -25,12 +27,18 @@ module Flame
 			routes.find { |route| route.compare_attributes(attrs) }
 		end
 
+		## Find before hook by Route
+		def find_befores(route)
+			(befores[route[:controller]][:*] || []) +
+			  (befores[route[:controller]][route[:action]] || [])
+		end
+
 		private
 
 		## Helper module for routing refine
 		class RouteRefine
 			attr_accessor :rest_routes
-			attr_reader :routes
+			attr_reader :routes, :befores
 
 			def self.http_methods
 				[:GET, :POST, :PUT, :DELETE]
@@ -50,6 +58,7 @@ module Flame
 				@ctrl = ctrl
 				@path = path || default_controller_path
 				@routes = []
+				@befores = {}
 				block.nil? ? defaults : instance_exec(&block)
 				# p @routes
 				@routes.sort! { |a, b| b[:path] <=> a[:path] }
@@ -62,6 +71,11 @@ module Flame
 				end
 			end
 
+			def before(actions, action)
+				actions = [actions] unless actions.is_a?(Array)
+				actions.each { |a| (@befores[a] ||= []).push(action) }
+			end
+
 			def defaults
 				@ctrl.public_instance_methods(false).each do |action|
 					next if find_route_index(action: action)
@@ -84,11 +98,8 @@ module Flame
 			using GorillaPatch::StringExt
 
 			def default_controller_path
-				@ctrl.name.underscore
-				  .split('_')
-				  .take_while { |part| part != 'controller' }
-				  .unshift(nil)
-				  .join('/')
+				(@ctrl.name.underscore.split('_') - %w(controller ctrl))
+				  .unshift(nil).join('/')
 			end
 
 			def make_path(path, action = nil, force_params = false)

data/lib/flame/validators.rb

@@ -1,4 +1,4 @@
-require_relative './errors.rb'
+require_relative 'errors'
 
 module Flame
 	## Compare arguments from path and from controller's action

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -84,6 +84,7 @@ files:
 - lib/flame/dispatcher.rb
 - lib/flame/errors.rb
 - lib/flame/render.rb
+- lib/flame/request.rb
 - lib/flame/route.rb
 - lib/flame/router.rb
 - lib/flame/validators.rb