flame 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b164f4b1817723648efb5412dc308265aaa30af
-  data.tar.gz: dc130470827a1bb8f1c22689c605381aa97ee78d
+  metadata.gz: 255a8d94f1326b67225cdd4b19f9f7e98de75bdd
+  data.tar.gz: 14d93ff6ae287e137c8711de646c38443583f333
 SHA512:
-  metadata.gz: 2a482215bfd58d3ca783ac1c904f171d5e09f5a2cd42245b6324bf433ffb8611827602e551099076939969fe07b23ae0defb1be6a1c68d18708a270b4b97e3f4
-  data.tar.gz: 5afe0a7dcd19b8ee8eb9d674211f456ea0232932fd40bc0e24f86837dce011d81216c9ecaba9ab84bd4f5cc263a1c813efd1be6a28ceba7febb60dda3ce3341e
+  metadata.gz: 9c4546180307af412902b9e1444bf36109c9071dcdf9cabaf828e43f2aba8c41bdbf99ea5ec5dc64e7be7647ab11204a7d76f9382d2868cc3b8f20d4f48c9215
+  data.tar.gz: d6c1a14007b6c072a2ad736237c13e90386c9e7397b5ba2471b7eb61f2a9761353ae06f00ec41245307ea44dcb662fffac654a3b10c3bf603413e7be4bc14251

data/lib/flame/cookies.rb

@@ -1,27 +1,29 @@
 module Flame
-	## Helper class for cookies
-	class Cookies
-		def initialize(request_cookies, response)
-			@request_cookies = request_cookies
-			@response = response
-		end
+	class Dispatcher
+		## Helper class for cookies
+		class Cookies
+			def initialize(request_cookies, response)
+				@request_cookies = request_cookies
+				@response = response
+			end
 
-		## Get request cookies
-		## @param key [String, Symbol] name of cookie
-		def [](key)
-			@request_cookies[key.to_s]
-		end
+			## Get request cookies
+			## @param key [String, Symbol] name of cookie
+			def [](key)
+				@request_cookies[key.to_s]
+			end
 
-		## Set (or delete) cookies for response
-		## @param key [String, Symbol] name of cookie
-		## @param new_value [Object, nil] value of cookie
-		## @example Set new value to `cat` cookie
-		##   cookies['cat'] = 'nice cat'
-		## @example Delete `cat` cookie
-		##   cookies['cat'] = nil
-		def []=(key, new_value)
-			return @response.delete_cookie(key.to_s, path: '/') if new_value.nil?
-			@response.set_cookie(key.to_s, value: new_value, path: '/')
+			## Set (or delete) cookies for response
+			## @param key [String, Symbol] name of cookie
+			## @param new_value [Object, nil] value of cookie
+			## @example Set new value to `cat` cookie
+			##   cookies['cat'] = 'nice cat'
+			## @example Delete `cat` cookie
+			##   cookies['cat'] = nil
+			def []=(key, new_value)
+				return @response.delete_cookie(key.to_s, path: '/') if new_value.nil?
+				@response.set_cookie(key.to_s, value: new_value, path: '/')
+			end
 		end
 	end
 end

data/lib/flame/errors.rb

@@ -1,93 +1,95 @@
 module Flame
-	module RouterError
-		## Error for Flame::Router.compare_actions
-		class ActionsError < StandardError
-			def initialize(ctrl, extra_actions)
-				@ctrl = ctrl
-				@extra_actions = extra_actions
+	module Errors
+		module RouterError
+			## Error for Flame::Router.compare_actions
+			class ActionsError < StandardError
+				def initialize(ctrl, extra_actions)
+					@ctrl = ctrl
+					@extra_actions = extra_actions
+				end
 			end
-		end
 
-		## Error if routes have more actions, than controller
-		class ExtraRoutesActionsError < ActionsError
-			def message
-				"Controller '#{@ctrl}' has no methods" \
-				" '#{@extra_actions.join(', ')}' from routes"
+			## Error if routes have more actions, than controller
+			class ExtraRoutesActionsError < ActionsError
+				def message
+					"Controller '#{@ctrl}' has no methods" \
+					" '#{@extra_actions.join(', ')}' from routes"
+				end
 			end
-		end
 
-		## Error if controller has not assigned in routes actions
-		class ExtraControllerActionsError < ActionsError
-			def message
-				"Routes for '#{@ctrl}' has no methods" \
-				" '#{@extra_actions.join(', ')}'"
+			## Error if controller has not assigned in routes actions
+			class ExtraControllerActionsError < ActionsError
+				def message
+					"Routes for '#{@ctrl}' has no methods" \
+					" '#{@extra_actions.join(', ')}'"
+				end
 			end
-		end
 
-		## Error for Flame::Router::RouteRefine.arguments_valid?
-		class ArgumentsError < StandardError
-			def initialize(ctrl, action, path, extra_args)
-				@ctrl = ctrl
-				@action = action
-				@path = path
-				@extra_args = extra_args
+			## Error for Flame::Router::RouteRefine.arguments_valid?
+			class ArgumentsError < StandardError
+				def initialize(ctrl, action, path, extra_args)
+					@ctrl = ctrl
+					@action = action
+					@path = path
+					@extra_args = extra_args
+				end
 			end
-		end
 
-		## Error if path has more arguments, than controller's method
-		class ExtraPathArgumentsError < ArgumentsError
-			def message
-				"Method '#{@action}' from controller '#{@ctrl}'" \
-				" does not know arguments '#{@extra_args.join(', ')}'" \
-				" from path '#{@path}'"
+			## Error if path has more arguments, than controller's method
+			class ExtraPathArgumentsError < ArgumentsError
+				def message
+					"Method '#{@action}' from controller '#{@ctrl}'" \
+					" does not know arguments '#{@extra_args.join(', ')}'" \
+					" from path '#{@path}'"
+				end
 			end
-		end
 
-		## Error if path has no arguments, that controller's method required
-		class ExtraActionArgumentsError < ArgumentsError
-			def message
-				"Path '#{@path}' does not contain required arguments" \
-				" '#{@extra_args.join(', ')}' of method '#{@action}'" \
-				" from controller '#{@ctrl}'"
+			## Error if path has no arguments, that controller's method required
+			class ExtraActionArgumentsError < ArgumentsError
+				def message
+					"Path '#{@path}' does not contain required arguments" \
+					" '#{@extra_args.join(', ')}' of method '#{@action}'" \
+					" from controller '#{@ctrl}'"
+				end
 			end
 		end
-	end
 
-	## Error for Flame::Router.find_path
-	class RouteNotFoundError < StandardError
-		def initialize(ctrl, method)
-			@ctrl = ctrl
-			@method = method
-		end
+		## Error for Flame::Router.find_path
+		class RouteNotFoundError < StandardError
+			def initialize(ctrl, method)
+				@ctrl = ctrl
+				@method = method
+			end
 
-		def message
-			"Route with controller '#{@ctrl}' and method '#{@method}'" \
-			' not found in application routes'
+			def message
+				"Route with controller '#{@ctrl}' and method '#{@method}'" \
+				' not found in application routes'
+			end
 		end
-	end
 
-	## Error for Flame::Controller.path_to
-	class ArgumentNotAssignedError < StandardError
-		def initialize(path, path_part)
-			@path = path
-			@path_part = path_part
-		end
+		## Error for Flame::Controller.path_to
+		class ArgumentNotAssignedError < StandardError
+			def initialize(path, path_part)
+				@path = path
+				@path_part = path_part
+			end
 
-		def message
-			"Argument '#{@path_part}' for path '#{@path}' is not assigned"
+			def message
+				"Argument '#{@path_part}' for path '#{@path}' is not assigned"
+			end
 		end
-	end
 
-	## Error for Flame::Router.find_path
-	class UnexpectedTypeOfHookError < StandardError
-		def initialize(hook, route)
-			@hook = hook
-			@route = route
-		end
+		## Error for Flame::Router.find_path
+		class UnexpectedTypeOfHookError < StandardError
+			def initialize(hook, route)
+				@hook = hook
+				@route = route
+			end
 
-		def message
-			"Unexpected hook-block class '#{@hook.class}'" \
-			" in route '#{@route}'"
+			def message
+				"Unexpected hook-block class '#{@hook.class}'" \
+				" in route '#{@route}'"
+			end
 		end
 	end
 end

data/lib/flame/route.rb

@@ -1,101 +1,103 @@
 module Flame
-	## Class for Route in Router.routes
-	class Route
-		attr_reader :attributes
+	class Router
+		## 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
+			def initialize(attrs = {})
+				@attributes = attrs.merge(
+					## Split path to parts (Array of String)
+					path_parts: attrs[:path].to_s.split('/').reject(&:empty?).freeze
+				)
+			end
 
-		## Get the attribute of route
-		## @param key [Symbol] name of attribute
-		def [](key)
-			@attributes[key]
-		end
+			## Get the attribute of route
+			## @param key [Symbol] name of attribute
+			def [](key)
+				@attributes[key]
+			end
 
-		## Set the attribute of route
-		## @param key [Symbol] name of attribute
-		## @param value [Object] value of attribute
-		def []=(key, value)
-			@attributes[key] = value
-		end
+			## Set the attribute of route
+			## @param key [Symbol] name of attribute
+			## @param value [Object] value of attribute
+			def []=(key, value)
+				@attributes[key] = value
+			end
 
-		## Compare attributes for `Router.find_route`
-		## @param attrs [Hash] Hash of attributes for comparing
-		def compare_attributes(attrs)
-			attrs.each do |name, value|
-				next true if compare_attribute(name, value)
-				break false
+			## Compare attributes for `Router.find_route`
+			## @param attrs [Hash] Hash of attributes for comparing
+			def compare_attributes(attrs)
+				attrs.each do |name, value|
+					next true if compare_attribute(name, value)
+					break false
+				end
 			end
-		end
 
-		## 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,}}, '/')
-		end
+			## 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,}}, '/')
+			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|
-				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)
+			## 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|
+					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
 			end
-		end
 
-		## Helpers for `compare_attributes`
-		def compare_attribute(name, value)
-			case name
-			when :method
-				compare_method(value)
-			when :path_parts
-				compare_path_parts(value)
-			else
-				self[name] == value
+			## Helpers for `compare_attributes`
+			def compare_attribute(name, value)
+				case name
+				when :method
+					compare_method(value)
+				when :path_parts
+					compare_path_parts(value)
+				else
+					self[name] == value
+				end
 			end
-		end
 
-		def compare_method(request_method)
-			self[:method].upcase.to_sym == request_method.upcase.to_sym
-		end
+			def compare_method(request_method)
+				self[: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] != '?' }
-			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]
-				# p request_part, path_part
-				break false unless path_part
-				next if path_part[0] == ':'
-				break false unless request_part == path_part
+			def compare_path_parts(request_parts)
+				# p route_path
+				req_path_parts = self[:path_parts].select { |part| part[1] != '?' }
+				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]
+					# p request_part, path_part
+					break false unless path_part
+					next if path_part[0] == ':'
+					break false unless request_part == path_part
+				end
 			end
-		end
 
-		## Helpers for `assign_arguments`
-		def assign_argument(path_part, args = {})
-			## Not argument
-			return path_part unless path_part[0] == ':'
-			## Not required argument
-			return args[path_part[2..-1].to_sym] if path_part[1] == '?'
-			## Required argument
-			param = args[path_part[1..-1].to_sym]
-			## Required argument is nil
-			fail ArgumentNotAssignedError.new(self[:path], path_part) if param.nil?
-			## All is ok
-			param
+			## Helpers for `assign_arguments`
+			def assign_argument(path_part, args = {})
+				## Not argument
+				return path_part unless path_part[0] == ':'
+				## Not required argument
+				return args[path_part[2..-1].to_sym] if path_part[1] == '?'
+				## Required argument
+				param = args[path_part[1..-1].to_sym]
+				## Required argument is nil
+				fail ArgumentNotAssignedError.new(self[:path], path_part) if param.nil?
+				## All is ok
+				param
+			end
 		end
 	end
 end

data/lib/flame/router.rb

@@ -20,7 +20,9 @@ module Flame
 
 			## Add routes from controller to glob array
 			route_refine = RouteRefine.new(self, ctrl, path, block)
-			concat_routes(route_refine) if ActionsValidator.new(route_refine).valid?
+			if Validators::ActionsValidator.new(route_refine).valid?
+				concat_routes(route_refine)
+			end
 		end
 
 		## Find route by any attributes
@@ -65,9 +67,9 @@ module Flame
 				@rest_routes ||= [
 					{ method: :GET,     path: '/',  action: :index  },
 					{ method: :POST,    path: '/',  action: :create },
-					{ method: :GET,     path: '/',  action: :show   },
-					{ method: :PUT,     path: '/',  action: :update },
-					{ method: :DELETE,  path: '/',  action: :delete }
+					{ method: :GET,     path: '/:id',  action: :show   },
+					{ method: :PUT,     path: '/:id',  action: :update },
+					{ method: :DELETE,  path: '/:id',  action: :delete }
 				]
 			end
 
@@ -97,7 +99,7 @@ module Flame
 						action = path.to_sym
 						path = "/#{path}"
 					end
-					ArgumentsValidator.new(@ctrl, path, action).valid?
+					Validators::ArgumentsValidator.new(@ctrl, path, action).valid?
 					add_route(request_method, path, action)
 				end
 			end

data/lib/flame/validators.rb

@@ -1,91 +1,93 @@
 require_relative 'errors'
 
 module Flame
-	## Compare arguments from path and from controller's action
-	class ArgumentsValidator
-		def initialize(ctrl, path, action)
-			@ctrl = ctrl
-			@path = path
-			@action = action
-		end
+	module Validators
+		## Compare arguments from path and from controller's action
+		class ArgumentsValidator
+			def initialize(ctrl, path, action)
+				@ctrl = ctrl
+				@path = path
+				@action = action
+			end
 
-		def valid?
-			## Break path for ':arg' arguments
-			@path_args = path_arguments(@path)
-			## Take all and required arguments from Controller#action
-			@action_args = action_arguments(@action)
-			## Compare arguments from path and arguments from method
-			no_extra_path_arguments? && no_extra_action_arguments?
-		end
+			def valid?
+				## Break path for ':arg' arguments
+				@path_args = path_arguments(@path)
+				## Take all and required arguments from Controller#action
+				@action_args = action_arguments(@action)
+				## Compare arguments from path and arguments from method
+				no_extra_path_arguments? && no_extra_action_arguments?
+			end
 
-		private
+			private
 
-		## Split path to args array
-		def path_arguments(path)
-			args = path.split('/').select { |part| part[0] == ':' }
-			args.map { |arg| arg[1..-1].to_sym }
-		end
+			## Split path to args array
+			def path_arguments(path)
+				args = path.split('/').select { |part| part[0] == ':' }
+				args.map { |arg| arg[1..-1].to_sym }
+			end
 
-		## Take args from controller's action
-		def action_arguments(action)
-			parameters = @ctrl.instance_method(action).parameters
-			req_parameters = parameters.select { |par| par[0] == :req }
-			{
-				all: parameters.map { |par| par[1] },
-				req: req_parameters.map { |par| par[1] }
-			}
-		end
+			## Take args from controller's action
+			def action_arguments(action)
+				parameters = @ctrl.instance_method(action).parameters
+				req_parameters = parameters.select { |par| par[0] == :req }
+				{
+					all: parameters.map { |par| par[1] },
+					req: req_parameters.map { |par| par[1] }
+				}
+			end
 
-		def no_extra_path_arguments?
-			## Subtraction action args from path args
-			extra_path_args = @path_args - @action_args[:all]
-			return true if extra_path_args.empty?
-			fail RouterError::ExtraPathArgumentsError.new(
-				@ctrl, @action, @path, extra_path_args
-			)
-		end
+			def no_extra_path_arguments?
+				## Subtraction action args from path args
+				extra_path_args = @path_args - @action_args[:all]
+				return true if extra_path_args.empty?
+				fail Errors::RouterError::ExtraPathArgumentsError.new(
+					@ctrl, @action, @path, extra_path_args
+				)
+			end
 
-		def no_extra_action_arguments?
-			## Subtraction path args from action required args
-			extra_action_args = @action_args[:req] - @path_args
-			return true if extra_action_args.empty?
-			fail RouterError::ExtraActionArgumentsError.new(
-				@ctrl, @action, @path, extra_action_args
-			)
+			def no_extra_action_arguments?
+				## Subtraction path args from action required args
+				extra_action_args = @action_args[:req] - @path_args
+				return true if extra_action_args.empty?
+				fail Errors::RouterError::ExtraActionArgumentsError.new(
+					@ctrl, @action, @path, extra_action_args
+				)
+			end
 		end
-	end
 
-	## Compare actions from routes and from controller
-	class ActionsValidator
-		def initialize(route_refine)
-			@routes_actions = route_refine.routes.map { |route| route[:action] }
-			@ctrl = route_refine.ctrl
-			@ctrl_actions = {
-				public: @ctrl.public_instance_methods(false),
-				all: @ctrl.instance_methods + @ctrl.private_instance_methods
-			}
-		end
+		## Compare actions from routes and from controller
+		class ActionsValidator
+			def initialize(route_refine)
+				@routes_actions = route_refine.routes.map { |route| route[:action] }
+				@ctrl = route_refine.ctrl
+				@ctrl_actions = {
+					public: @ctrl.public_instance_methods(false),
+					all: @ctrl.instance_methods + @ctrl.private_instance_methods
+				}
+			end
 
-		def valid?
-			no_extra_routes_actions? && no_extra_controller_actions?
-		end
+			def valid?
+				no_extra_routes_actions? && no_extra_controller_actions?
+			end
 
-		private
+			private
 
-		def no_extra_routes_actions?
-			extra_routes_actions = @routes_actions - @ctrl_actions[:public]
-			return true if extra_routes_actions.empty?
-			fail RouterError::ExtraRoutesActionsError.new(
-				@ctrl, extra_routes_actions
-			)
-		end
+			def no_extra_routes_actions?
+				extra_routes_actions = @routes_actions - @ctrl_actions[:public]
+				return true if extra_routes_actions.empty?
+				fail Errors::RouterError::ExtraRoutesActionsError.new(
+					@ctrl, extra_routes_actions
+				)
+			end
 
-		def no_extra_controller_actions?
-			extra_ctrl_actions = @ctrl_actions[:public] - @routes_actions
-			return true if extra_ctrl_actions.empty?
-			fail RouterError::ExtraControllerActionsError.new(
-				@ctrl, extra_ctrl_actions
-			)
+			def no_extra_controller_actions?
+				extra_ctrl_actions = @ctrl_actions[:public] - @routes_actions
+				return true if extra_ctrl_actions.empty?
+				fail Errors::RouterError::ExtraControllerActionsError.new(
+					@ctrl, extra_ctrl_actions
+				)
+			end
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,7 +28,7 @@ dependencies:
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
     - - "<"
@@ -38,7 +38,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
     - - "<"