frecon 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db237e76c74ecaf128c7b986136516d29f780cca
-  data.tar.gz: 82bb1cfe4f705c83a27f9ed22a3417fae8c18161
+  metadata.gz: a8a2e4e957492a0168c9e814b237ea59435aa800
+  data.tar.gz: 3051b10b6a8e7740370ffd75eebce4230b3ef252
 SHA512:
-  metadata.gz: b47d5f45113e9a0d53dfe466b320c80347dcf7caf836f8daaca93d5ef4a557718e3a048ce2e5d1716fea3b53207b7e8a32baa021108fb564e89d0361187ca329
-  data.tar.gz: 5472f1258969eb8ccf41c82b99741658ba5dc3a335b80a98374dfd8658eb0b888a8fe44fb14a6c4871575755bfb8c2fff34bdbe13be6ba1a66d035fcb8a7f9ea
+  metadata.gz: b579c98940cd2759ed748dbaea6b51ffeef679c6f08f958a1e7501fda4e5043e20b4fb987422ebb002b013fb679eb1ac4586a6027bfb02186b196507a0faafc7
+  data.tar.gz: a312a6a56950302d16e0075875e25ef9b830164eb9d7999820e364fa49c5b170a72b4f7bf96ff99a2a64e7cdaca836953b9811fab42a315102586fb03014a7fd

data/lib/frecon/base/variables.rb

@@ -8,7 +8,7 @@
 # <http://opensource.org/licenses/MIT>.
 
 module FReCon
-	VERSION = "0.2.1"
+	VERSION = "0.2.2"
 
 	@environment_variable = :development
 

data/lib/frecon/controller.rb

@@ -51,7 +51,7 @@ module FReCon
 				raise RequestError.new(400, e.message)
 			end
 
-			raise RequestError.new(422, "Must pass a JSON object!") if post_data.is_an?(Array)
+			raise RequestError.new(422, "Must pass a JSON object!", {post_data: post_data}) if post_data.is_an?(Array)
 			post_data
 		end
 
@@ -64,10 +64,10 @@ module FReCon
 			if @model.save
 				[201, @model.to_json]
 			else
-				raise RequestError.new(422, @model.errors.full_messages)
+				raise RequestError.new(422, @model.errors.full_messages, {params: params, post_data: post_data})
 			end
 		end
-		
+
 		def self.update(request, params, post_data = nil)
 			raise RequestError.new(400, "Must supply a #{model_name.downcase} id!") unless params[:id]
 
@@ -80,7 +80,7 @@ module FReCon
 			if @model.update_attributes(post_data)
 				@model.to_json
 			else
-				raise RequestError.new(422, @model.errors.full_messages)
+				raise RequestError.new(422, @model.errors.full_messages, {params: params, post_data: post_data})
 			end
 		end
 
@@ -94,7 +94,7 @@ module FReCon
 					raise RequestError.new(422, @model.errors.full_messages)
 				end
 			else
-				raise RequestError.new(404, could_not_find(params[:id]))
+				raise RequestError.new(404, could_not_find(params[:id]), {params: params})
 			end
 		end
 
@@ -104,7 +104,7 @@ module FReCon
 			if @model
 				@model.to_json
 			else
-				raise RequestError.new(404, could_not_find(params[:id]))
+				raise RequestError.new(404, could_not_find(params[:id]), {params: params})
 			end
 		end
 
@@ -122,7 +122,7 @@ module FReCon
 			if @model
 				@model.send(attribute).to_json
 			else
-				raise RequestError.new(404, could_not_find(params[:id]))
+				raise RequestError.new(404, could_not_find(params[:id]), {params: params, attribute: attribute})
 			end
 		end
 
@@ -135,7 +135,7 @@ module FReCon
 
 					post_data
 				else
-					raise RequestError.new(404, could_not_find(post_data["team_number"], "number", "team"))
+					raise RequestError.new(404, could_not_find(post_data["team_number"], "number", "team"), {post_data: post_data})
 				end
 			end
 		end
@@ -149,14 +149,14 @@ module FReCon
 					begin
 						match = competition.matches.find_by number: post_data["match_number"]
 					rescue ArgumentError, TypeError => e
-						raise RequestError.new(422, e.message)
+						raise RequestError.new(422, e.message, {post_data: post_data})
 					end
 
 					# Create the match if necessary.
 					begin
 						match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
 					rescue ArgumentError, TypeError => e
-						raise RequestError.new(422, e.message)
+						raise RequestError.new(422, e.message, {post_data: post_data, competition_id: competition.id})
 					end
 
 					post_data["match_id"] = match.id
@@ -173,7 +173,7 @@ module FReCon
 					begin
 						match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
 					rescue ArgumentError, TypeError => e
-						raise RequestError.new(422, e.message)
+						raise RequestError.new(422, e.message, {post_data: post_data, competition_id: competition.id})
 					end
 
 					post_data["match_id"] = match.id
@@ -183,7 +183,7 @@ module FReCon
 
 					post_data
 				else
-					raise RequestError.new(422, "A current competition is not set.  Please set it.")
+					raise RequestError.new(422, "A current competition is not set.  Please set it.", {post_data: post_data})
 				end
 			end
 		end

data/lib/frecon/controllers/teams_controller.rb

@@ -38,13 +38,13 @@ module FReCon
 					if @competition
 						@team.records.in(match_id: @competition.matches.map { |match| match.id }).to_json
 					else
-						raise RequestError.new(404, could_not_find(params[:competition_id], "id", "competition"))
+						raise RequestError.new(404, could_not_find(params[:competition_id], "id", "competition"), {params: params, team: @team})
 					end
 				else
 					@team.records.to_json
 				end
 			else
-				raise RequestError.new(404, could_not_find(params[:id], "id or number"))
+				raise RequestError.new(404, could_not_find(params[:id], "id or number"), {params: params})
 			end
 		end
 
@@ -56,12 +56,12 @@ module FReCon
 				if params[:competition_id]
 					@competition = Competition.find params[:competition_id]
 
-					raise RequestError.new(404, could_not_find(params[:competition_id], "id", "competition")) if @competition.nil?
+					raise RequestError.new(404, could_not_find(params[:competition_id], "id", "competition"), {params: params, team: @team}) if @competition.nil?
 				end
 
 				@team.matches(params[:competition_id]).to_json
 			else
-				raise RequestError.new(404, could_not_find(params[:id], "id or number"))
+				raise RequestError.new(404, could_not_find(params[:id], "id or number"), {params: params})
 			end
 		end
 
@@ -71,7 +71,7 @@ module FReCon
 			if @team
 				@team.competitions.to_json
 			else
-				raise RequestError.new(404, could_not_find(params[:id], "id or number"))
+				raise RequestError.new(404, could_not_find(params[:id], "id or number"), {params: params})
 			end
 		end
 	end

data/lib/frecon/request_error.rb

@@ -10,29 +10,32 @@
 require "json"
 
 class RequestError < StandardError
-	attr_reader :code
-	attr_reader :message
+	attr_reader :return_value
 
-	def initialize(code, message = nil)
+	def initialize(code, message = nil, context = nil)
 		@code = code
-		@message = format_error_message(message)
-	end
-
-	def format_error_message(message)
-		case message
-		when String
-			JSON.generate({ errors: [ message ] })
-		when Array
-			JSON.generate({ errors: message })
-		end
-	end
+		@message = message
+		@context = context
 
-	# A Sinatra-compliant return value.
-	def return_value
-		if @message
-			[@code, @message]
-		else
-			@code
-		end
+		# When @message is a String or an Array,
+		# the return_value is set to a Sinatra-compliant
+		# Array with @code being the first element and the
+		# response body being the stringification of the
+		# JSON stringification of @context and @message.
+		#
+		# If @message is a String, it is first put into an
+		# array.
+		#
+		# If @message is neither a String nor an Array,
+		# @return_value becomes simply @code.
+		@return_value =
+			case @message
+			when String
+				[@code, JSON.generate({ context: @context, errors: [ @message ] })]
+			when Array
+				[@code, JSON.generate({ context: @context, errors: @message })]
+			else
+				@code
+			end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frecon
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sam Craig