flame 4.3.3 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b8383cdd86873f1c48723c2c1bb2ea364118441
-  data.tar.gz: f6b4af700c45d5bd103e545f395f83b1afd6f4be
+  metadata.gz: 7e934a6b8356c082c5adbf9010ebcf19c5cfdc01
+  data.tar.gz: 16ead4865ce5d9265aaf7fc7d38de401b034b816
 SHA512:
-  metadata.gz: e25c7c816f722c92d7f4962469d8f02fcf10001d0a6a3e2cc3b2e304b5ea8c3269e195b5949e63b2bb458d1c0f334624d078822f4f7d764a5a8596d6d055a329
-  data.tar.gz: a7cdaa073a030b8f9dd748d6233c0ca6fd2156827a3c34583db2f78df342d8f94f244c4026a555da707133cce51ccbab995d2a6ed4d926f9886ce823422a4385
+  metadata.gz: ef6fe5a9eb6e074ad671ee088b18966bdf894002bcb6afe00f814d21772f77477bc04cdff2611d84cc94ac22acfddb168c4bc294d07912a5d675de552df5d9b5
+  data.tar.gz: c26c8020c593d48f8bf185833abc0602951c67ee1a0fcbe4ae874fa80d6af874fede4fd29a6ff37f2d94a2e6bb616d92caa3f4b4d7f29d1a3e8c09e6383df782

data/lib/flame/controller.rb

@@ -18,6 +18,12 @@ module Flame
 			@dispatcher.path_to(*args)
 		end
 
+		## Build a URI to the given controller and action, or path
+		def url_to(*args)
+			path = args.first.is_a?(String) ? args.first : path_to(*args)
+			"#{request.scheme}://#{request.host}#{path}"
+		end
+
 		## Redirect for response
 		## @overload redirect(path)
 		##   Redirect to the string path

data/lib/flame/dispatcher.rb

@@ -82,7 +82,7 @@ module Flame
 			response[Rack::CONTENT_TYPE] = Rack::Mime.mime_type(ext)
 		end
 
-		## Get path for controller and action.
+		## Build a path to the given controller and action, with any expected params
 		##
 		## @param ctrl [Flame::Controller] class of controller
 		## @param action [Symbol] method of controller
@@ -92,7 +92,7 @@ module Flame
 		##   path_to ArticlesController, :show, id: 2 # => "/articles/show/2"
 		def path_to(ctrl, action = :index, args = {})
 			route = @app.class.router.find_route(controller: ctrl, action: action)
-			fail Errors::RouteNotFoundError.new(ctrl, action) unless route
+			raise Errors::RouteNotFoundError.new(ctrl, action) unless route
 			path = route.assign_arguments(args)
 			path.empty? ? '/' : path
 		end

data/lib/flame/route.rb

@@ -102,7 +102,7 @@ module Flame
 				param = args[path_part[1..-1].to_sym]
 				## Required argument is nil
 				error = Errors::ArgumentNotAssignedError.new(path, path_part)
-				fail error if param.nil?
+				raise error if param.nil?
 				## All is ok
 				param
 			end

data/lib/flame/validators.rb

@@ -45,7 +45,7 @@ module Flame
 				## 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(
+				raise Errors::RouterError::ExtraPathArgumentsError.new(
 					@ctrl, @action, @path, extra_path_args
 				)
 			end
@@ -54,7 +54,7 @@ module Flame
 				## 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(
+				raise Errors::RouterError::ExtraActionArgumentsError.new(
 					@ctrl, @action, @path, extra_action_args
 				)
 			end
@@ -80,7 +80,7 @@ module Flame
 			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(
+				raise Errors::RouterError::ExtraRoutesActionsError.new(
 					@ctrl, extra_routes_actions
 				)
 			end
@@ -88,7 +88,7 @@ module Flame
 			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(
+				raise Errors::RouterError::ExtraControllerActionsError.new(
 					@ctrl, extra_ctrl_actions
 				)
 			end

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack