flame 4.0.7.2 → 4.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9321147aff3df22a9bb2b87150e51c7399299660
-  data.tar.gz: 54a8172fe1dda218fe68723b3d2ee1c0352ec5f9
+  metadata.gz: 75e02998d8d17eae77b354d3e0f728bf0fbf37e6
+  data.tar.gz: c6e806c54b89f1f89e3bad8334f654fad103278b
 SHA512:
-  metadata.gz: b6468b13a0dc138a44b662897026b27105671be32d2109b8a02ef6261cb53982e8319c7982cb71614585cbd08c954507e9cf186b7ce53397f5f8c22752c5eb2b
-  data.tar.gz: f025e272406a3ee31e6d898f16fcad395da8a4d4d4fcf25fd256a0065f7b810a04cb05a44214b184be4b58949db9a2f43fa8ec8a3265d9bf5bb80032b5ff12ed
+  metadata.gz: 357ad3becd4d875377fa55c76b23eb4f2ab7d1c94e9c8f3493751b125f4d085e747bce14d0aeac8463d74095ab433dd6e6842fccb122f8b39c295f8b2784f42b
+  data.tar.gz: 7fda6f630bedcd1755161218e567a9c0741536145213ccef10579562210e560b9a5c58ebccc6cd673d19c733fd2ae366afd9be34a5de3836c632c30bc052862e

data/lib/flame/dispatcher.rb

@@ -171,15 +171,15 @@ module Flame
 			route = @app.router.find_nearest_route(request.path_parts)
 			## Halt with default body if the route not found
 			##   or it's `not_found` method not defined
-			return halt unless route && route[:controller].method_defined?(:not_found)
+			return halt unless route && route.controller.method_defined?(:not_found)
 			## Execute `not_found` method for the founded route
 			route_exec(route, :not_found)
 		end
 
 		## Create controller object and execute method
 		def route_exec(route, method = nil)
-			method ||= route[:action]
-			route[:controller].new(self).send(:execute, method)
+			method ||= route.action
+			route.controller.new(self).send(:execute, method)
 		end
 	end
 end

data/lib/flame/route.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 module Flame
 	class Router
+		ARG_CHAR = ':'.freeze
+		ARG_CHAR_OPT = '?'.freeze
+
 		## Class for Route in Router.routes
 		class Route
-			attr_reader :attributes
-
-			def initialize(attrs = {})
-				@attributes = attrs.merge(
-					## Split path to parts (Array of String)
-					path_parts: attrs[:path].to_s.split('/').reject(&:empty?).freeze
-				)
-			end
+			attr_reader :method, :controller, :action, :path, :path_parts
 
-			## Get the attribute of route
-			## @param key [Symbol] name of attribute
-			def [](key)
-				@attributes[key]
+			def initialize(controller, action, method, path)
+				@controller = controller
+				@action = action
+				@method = method.to_sym.upcase
+				## MAKE PATH
+				@path = path
+				Validators::ArgumentsValidator.new(@controller, @path, @action).valid?
+				@path_parts = @path.to_s.split('/').reject(&:empty?)
+				freeze
 			end
 
-			## Set the attribute of route
-			## @param key [Symbol] name of attribute
-			## @param value [Object] value of attribute
-			def []=(key, value)
-				@attributes[key] = value
+			def freeze
+				@path.freeze
+				@path_parts.freeze
+				super
 			end
 
 			## Compare attributes for `Router.find_route`
@@ -36,25 +38,30 @@ module Flame
 			## Assign arguments to path for `Controller.path_to`
 			## @param args [Hash] arguments for assigning
 			def assign_arguments(args = {})
-				self[:path_parts]
-				  .map { |path_part| assign_argument(path_part, args) }
-				  .unshift('').join('/').gsub(%r{\/{2,}}, '/')
+				parts = @path_parts.map { |part| assign_argument(part, args) }
+				self.class.path_merge(parts.unshift(''))
 			end
 
 			## Extract arguments from request_parts for `execute`
 			## @param request_parts [Array] parts of the request (Array of String)
 			def arguments(request_parts)
-				self[:path_parts].each_with_index.with_object({}) do |(path_part, i), args|
+				@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] == ':'
+					path_part_opt = path_part[1] == ARG_CHAR_OPT
+					next args unless path_part[0] == ARG_CHAR
 					break args if path_part_opt && request_part.nil?
 					args[
-					  path_part[(path_part_opt ? 2 : 1)..-1].to_sym
+						path_part[(path_part_opt ? 2 : 1)..-1].to_sym
 					] = URI.decode(request_part)
 				end
 			end
 
+			def self.path_merge(*parts)
+				parts.join('/').gsub(%r{\/{2,}}, '/')
+			end
+
+			private
+
 			## Helpers for `compare_attributes`
 			def compare_attribute(name, value)
 				case name
@@ -63,24 +70,24 @@ module Flame
 				when :path_parts
 					compare_path_parts(value)
 				else
-					self[name] == value
+					send(name) == value
 				end
 			end
 
 			def compare_method(request_method)
-				self[:method].upcase.to_sym == request_method.upcase.to_sym
+				method.upcase.to_sym == request_method.upcase.to_sym
 			end
 
 			def compare_path_parts(request_parts)
 				# p route_path
-				req_path_parts = self[:path_parts].select { |part| part[1] != '?' }
+				req_path_parts = @path_parts.select { |part| part[1] != ARG_CHAR_OPT }
 				return false if request_parts.count < req_path_parts.count
 				# compare_parts(request_parts, self[:path_parts])
 				request_parts.each_with_index do |request_part, i|
-					path_part = self[:path_parts][i]
+					path_part = @path_parts[i]
 					# p request_part, path_part
 					break false unless path_part
-					next if path_part[0] == ':'
+					next if path_part[0] == ARG_CHAR
 					break false unless request_part == path_part
 				end
 			end
@@ -88,13 +95,13 @@ module Flame
 			## Helpers for `assign_arguments`
 			def assign_argument(path_part, args = {})
 				## Not argument
-				return path_part unless path_part[0] == ':'
+				return path_part unless path_part[0] == ARG_CHAR
 				## Not required argument
-				return args[path_part[2..-1].to_sym] if path_part[1] == '?'
+				return args[path_part[2..-1].to_sym] if path_part[1] == ARG_CHAR_OPT
 				## Required argument
 				param = args[path_part[1..-1].to_sym]
 				## Required argument is nil
-				error = Errors::ArgumentNotAssignedError.new(self[:path], path_part)
+				error = Errors::ArgumentNotAssignedError.new(path, path_part)
 				fail error if param.nil?
 				## All is ok
 				param

data/lib/flame/router.rb

@@ -67,9 +67,9 @@ module Flame
 				@rest_routes ||= [
 					{ method: :GET,     path: '/',  action: :index  },
 					{ method: :POST,    path: '/',  action: :create },
-					{ method: :GET,     path: '/:id',  action: :show   },
-					{ method: :PUT,     path: '/:id',  action: :update },
-					{ method: :DELETE,  path: '/:id',  action: :delete }
+					{ method: :GET,     path: '/',  action: :show   },
+					{ method: :PUT,     path: '/',  action: :update },
+					{ method: :DELETE,  path: '/',  action: :delete }
 				]
 			end
 
@@ -94,13 +94,17 @@ module Flame
 				##   @param action [Symbol] name of method for the request
 				##   @example Set method to :POST for action `goodbye`
 				##     post :goodbye
-				define_method(request_method.downcase) do |path, action = nil|
-					if action.nil?
+				method = request_method.downcase
+				define_method(method) do |path, action = nil, prefix: false|
+					unless action
 						action = path.to_sym
-						path = "/#{path}"
+						path = nil
 					end
-					Validators::ArgumentsValidator.new(@ctrl, path, action).valid?
-					add_route(request_method, path, action)
+					path = default_action_path(action, path) if prefix || path.nil?
+					path = Route.path_merge(@path, path)
+					route = Route.new(@ctrl, action, method, path)
+					index = find_route_index(action: action)
+					index ? @routes[index] = route : @routes.push(route)
 				end
 			end
 
@@ -110,7 +114,7 @@ module Flame
 				rest
 				@ctrl.public_instance_methods(false).each do |action|
 					next if find_route_index(action: action)
-					add_route(:GET, nil, action)
+					send(:GET.downcase, action)
 				end
 			end
 
@@ -118,10 +122,9 @@ module Flame
 			def rest
 				rest_routes.each do |rest_route|
 					action = rest_route[:action]
-					if @ctrl.public_instance_methods.include?(action) &&
+					next unless @ctrl.public_instance_methods.include?(action) &&
 					   find_route_index(action: action).nil?
-						add_route(*rest_route.values, true)
-					end
+					send(*rest_route.values.map(&:downcase), prefix: true)
 				end
 			end
 
@@ -130,10 +133,7 @@ module Flame
 			## @param path [String, nil] root path for mounting controller
 			## @yield Block of code for routes refine
 			def mount(ctrl, path = nil, &block)
-				path = path_merge(
-					@path,
-					(path || ctrl.default_path)
-				)
+				path = Route.path_merge(@path, path || ctrl.default_path)
 				@router.add_controller(ctrl, path, block)
 			end
 
@@ -142,48 +142,27 @@ module Flame
 			## Execute block of refinings end sorting routes
 			def execute(&block)
 				block.nil? ? defaults : instance_exec(&block)
-				# instance_exec(&@ctrl.mounted) if @ctrl.respond_to? :mounted
-				# @router.app.helpers.each do |helper|
-				# 	instance_exec(&helper.mount) if helper.respond_to?(:mount)
-				# end
-				# p @routes
-				@routes.sort! { |a, b| b[:path] <=> a[:path] }
+				@routes.sort! { |a, b| b.path <=> a.path }
+			end
+
+			def find_route_index(attrs)
+				@routes.find_index { |route| route.compare_attributes(attrs) }
 			end
 
 			## Build path for the action of controller
-			def make_path(path, action = nil, force_params = false)
-				## TODO: Add :arg:type support (:id:num, :name:str, etc.)
-				unshifted = force_params ? path : action_path(action)
-				if path.nil? || force_params
-					parameters = @ctrl.instance_method(action).parameters
-					parameters.map! { |par| ":#{par[0] == :req ? '' : '?'}#{par[1]}" }
-					path = parameters.unshift(unshifted).join('/')
+			## @todo Add :arg:type support (:id:num, :name:str, etc.)
+			def default_action_path(action, prefix)
+				unshifted = prefix ? prefix : action_prefix(action)
+				parameters = @ctrl.instance_method(action).parameters
+				parameters.map! do |par|
+					":#{par[0] == :req ? '' : ARG_CHAR_OPT}#{par[1]}"
 				end
-				path_merge(@path, path)
+				Route.path_merge(parameters.unshift(unshifted))
 			end
 
-			def action_path(action)
+			def action_prefix(action)
 				action == :index ? '/' : action
 			end
-
-			def path_merge(*parts)
-				parts.join('/').gsub(%r{\/{2,}}, '/')
-			end
-
-			def add_route(method, path, action, force_params = false)
-				route = Route.new(
-					method: method,
-					path: make_path(path, action, force_params),
-					controller: @ctrl,
-					action: action
-				)
-				index = find_route_index(action: action)
-				index ? @routes[index] = route : @routes.push(route)
-			end
-
-			def find_route_index(attrs)
-				@routes.find_index { |route| route.compare_attributes(attrs) }
-			end
 		end
 	end
 end

data/lib/flame/validators.rb

@@ -1,3 +1,4 @@
+require_relative 'route'
 require_relative 'errors'
 
 module Flame
@@ -23,8 +24,11 @@ module Flame
 
 			## Split path to args array
 			def path_arguments(path)
-				args = path.split('/').select { |part| part[0] == ':' }
-				args.map { |arg| arg[1..-1].to_sym }
+				args = path.split('/').select { |part| part[0] == Router::ARG_CHAR }
+				args.map do |arg|
+					opt_arg = arg[1] == Router::ARG_CHAR_OPT
+					arg[(opt_arg ? 2 : 1)..-1].to_sym
+				end
 			end
 
 			## Take args from controller's action
@@ -59,7 +63,7 @@ module Flame
 		## Compare actions from routes and from controller
 		class ActionsValidator
 			def initialize(route_refine)
-				@routes_actions = route_refine.routes.map { |route| route[:action] }
+				@routes_actions = route_refine.routes.map { |route| route.action }
 				@ctrl = route_refine.ctrl
 				@ctrl_actions = {
 					public: @ctrl.public_instance_methods(false),

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.0.7.2
+  version: 4.0.9
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack