frecon 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c2b4116037363c5580518c012f3f9f539928742
-  data.tar.gz: 25724f6f99f6a82ff6d559c77e4ef35e079091ff
+  metadata.gz: 1753ce0da52b68eee609e44cdd93d62a063d6728
+  data.tar.gz: dc9277e50cf48a1cff8b1429151b810b05b80712
 SHA512:
-  metadata.gz: 46530c063a1616ea0e691a5fcf85c2bad581ca936a7bdee6ce5180084574b6387141fea2e5fc9106b43d82e1295464da897f65dfc37371e3ec182ac9b99d7fce
-  data.tar.gz: 843fba889e81bf13534267dc43d929a919f891ca5d7dcaa6705b0c802456edef05c6378bfa021fae0ceba9eb27a16aba6fde10545846a4a0bdfdb809abe9b814
+  metadata.gz: 3a07b211ec464b371ab2cfd5b0cbe3809ecd78318054929d680e0739139d02004cbf056271f40fc486a827a445fccf6ff768ef10555c999cd044499d44ea197d
+  data.tar.gz: f4e2d91ad1766d12cfb27c3dadc0762f454fd2f03233ed85cedee66cab8b929dd0b7379133f6e46061029722065f20536606b730b37fb2aefa92776b552d55c0

data/bin/frecon

@@ -10,7 +10,7 @@
 # <http://opensource.org/licenses/MIT>.
 
 # Include rel-path ../lib/ in the $LOAD_PATH if it's not there already.
-lib_directory = File.class_eval('expand_path(join(dirname(__FILE__), "..", "lib"))')
+lib_directory = File.join(File.dirname(__FILE__), "..", "lib")
 $LOAD_PATH.unshift(lib_directory) unless $LOAD_PATH.include?(lib_directory)
 
 require "frecon"

data/lib/frecon/base/variables.rb

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

data/lib/frecon/controller.rb

@@ -42,15 +42,15 @@ module FReCon
 			rescue JSON::ParserError => e
 				# If we have malformed JSON (JSON::ParserError is
 				# raised), escape out of the function.
-				return [400, ErrorFormatter.format(e.message)]
+				raise RequestError.new(400, e.message)
 			end
 
-			post_data.is_an?(Array) ? [422, ErrorFormatter.format("Must pass a JSON object!")] : post_data
+			raise RequestError.new(422, "Must pass a JSON object!") if post_data.is_an?(Array)
+			post_data
 		end
 
 		def self.create(request, params)
 			post_data = process_request request
-			return post_data if post_data.is_an?(Array)
 
 			@model = model.new
 			@model.attributes = post_data
@@ -58,24 +58,23 @@ module FReCon
 			if @model.save
 				[201, @model.to_json]
 			else
-				[422, ErrorFormatter.format(@model.errors.full_messages)]
+				raise RequestError.new(422, @model.errors.full_messages)
 			end
 		end
 
 		def self.update(request, params)
-			return [400, "Must supply a #{model_name.downcase}!"] unless params[:id]
+			raise RequestError.new(400, "Must supply a #{model_name.downcase}!") unless params[:id]
 
 			post_data = process_request request
-			return post_data if post_data.is_an?(Array)
 
 			@model = model.find params[:id]
 
-			return [404, ErrorFormatter.format(could_not_find(params[:id]))] unless @model
+			raise RequestError.new(404, could_not_find(params[:id])) unless @model
 
 			if @model.update_attributes(post_data)
 				@model.to_json
 			else
-				[422, ErrorFormatter.format(@model.errors.full_messages)]
+				raise RequestError.new(422, @model.errors.full_messages)
 			end
 		end
 
@@ -86,10 +85,10 @@ module FReCon
 				if @model.destroy
 					204
 				else
-					[422, ErrorFormatter.format(@model.errors.full_messages)]
+					raise RequestError.new(422, @model.errors.full_messages)
 				end
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:id]))]
+				raise RequestError.new(404, could_not_find(params[:id]))
 			end
 		end
 
@@ -99,7 +98,7 @@ module FReCon
 			if @model
 				@model.to_json
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:id]))]
+				raise RequestError.new(404, could_not_find(params[:id]))
 			end
 		end
 
@@ -117,7 +116,7 @@ module FReCon
 			if @model
 				@model.send(attribute).to_json
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:id]))]
+				raise RequestError.new(404, could_not_find(params[:id]))
 			end
 		end
 
@@ -130,7 +129,7 @@ module FReCon
 
 					post_data
 				else
-					return [404, ErrorFormatter.format(could_not_find(post_data["team_number"], "number", "team"))]
+					raise RequestError.new(404, could_not_find(post_data["team_number"], "number", "team"))
 				end
 			end
 		end

data/lib/frecon/controllers/participations_controller.rb

@@ -11,7 +11,6 @@ module FReCon
 	class ParticipationsController < Controller
 		def self.create(request, params)
 			post_data = process_request request
-			return post_data if post_data.is_an?(Array)
 			
 			# Convert team number to team_id.
 			post_data = team_number_to_team_id(post_data)
@@ -22,7 +21,7 @@ module FReCon
 			if @model.save
 				[201, @model.to_json]
 			else
-				[422, ErrorFormatter.format(@model.errors.full_messages)]
+				raise RequestError.new(422, @model.errors.full_messages)
 			end
 		end
 		

data/lib/frecon/controllers/records_controller.rb

@@ -15,12 +15,10 @@ module FReCon
 	class RecordsController < Controller
 		def self.create(request, params)
 			post_data = process_request request
-			return post_data if post_data.is_an?(Array)
 
 			# Change special post_data attributes.
 			# Convert team number to team id.
 			post_data = team_number_to_team_id(post_data)
-			return post_data if post_data.is_an?(Array)
 
 			# Convert match number and competition name to match id.
 			if post_data["match_number"] && !post_data["match_id"]
@@ -29,14 +27,14 @@ module FReCon
 					begin
 						match = competition.matches.find_by number: post_data["match_number"]
 					rescue ArgumentError, TypeError => e
-						return [422, ErrorFormatter.format(e.message)]
+						raise RequestError.new(422, e.message)
 					end
 
 					# Create the match if necessary.
 					begin
 						match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
 					rescue ArgumentError, TypeError => e
-						return [422, ErrorFormatter.format(e.message)]
+						raise RequestError.new(422, e.message)
 					end
 
 					post_data["match_id"] = match.id
@@ -51,7 +49,7 @@ module FReCon
 					begin
 						match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
 					rescue ArgumentError, TypeError => e
-						return [422, ErrorFormatter.format(e.message)]
+						raise RequestError.new(422, e.message)
 					end
 
 					post_data["match_id"] = match.id
@@ -59,7 +57,7 @@ module FReCon
 					post_data.delete("match_number")
 					post_data.delete("competition")
 				else
-					return [422, ErrorFormatter.format("A current competition is not set.  Please set it.")]
+					raise RequestError.new(422, "A current competition is not set.  Please set it.")
 				end
 			end
 
@@ -70,7 +68,7 @@ module FReCon
 				# Use to_json for now; we can filter it later.
 				[201, @record.to_json]
 			else
-				[422, ErrorFormatter.format(@record.errors.full_messages)]
+				raise RequestError.new(422, @record.errors.full_messages)
 			end
 		end
 

data/lib/frecon/controllers/teams_controller.rb

@@ -15,7 +15,6 @@ module FReCon
 	class TeamsController < Controller
 		def self.create(request, params)
 			post_data = process_request request
-			return post_data if post_data.is_an?(Array)
 
 			@team = Team.new
 			@team.attributes = post_data
@@ -24,26 +23,22 @@ module FReCon
 				# Use to_json for now; we can filter it later.
 				[201, @team.to_json]
 			else
-				[422, ErrorFormatter.format(@team.errors.full_messages)]
+				raise RequestError.new(422, @team.errors.full_messages)
 			end
 		end
 
 		def self.update(request, params)
-			return [400, "Must supply a team number!"] unless params[:number]
+			raise RequestError.new(400, "Must supply a team number!") unless params[:number]
 
 			post_data = process_request request
-			return post_data if post_data.is_an?(Array)
 
 			@team = Team.find_by number: params[:number]
-
-			if @team.nil?
-				return [404, ErrorFormatter.format(could_not_find(params[:number], "number"))]
-			end
+			raise RequestError.new(404, could_not_find(params[:number], "number")) if @team.nil?
 
 			if @team.update_attributes(post_data)
 				@team.to_json
 			else
-				[422, ErrorFormatter.format(@team.errors.full_messages)]
+				raise RequestError.new(422, @team.errors.full_messages)
 			end
 		end
 
@@ -54,10 +49,10 @@ module FReCon
 				if @team.destroy
 					204
 				else
-					[422, ErrorFormatter.format(@team.errors.full_messages)]
+					raise RequestError.new(422, @team.errors.full_messages)
 				end
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:number], "number"))]
+				raise RequestError.new(404, could_not_find(params[:number], "number"))
 			end
 		end
 
@@ -67,7 +62,7 @@ module FReCon
 			if @team
 				@team.to_json
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:number], "number"))]
+				raise RequestError.new(404, could_not_find(params[:number], "number"))
 			end
 		end
 
@@ -81,13 +76,13 @@ module FReCon
 					if @competition
 						@team.records.in(match_id: @competition.matches.map { |match| match.id }).to_json
 					else
-						[404, ErrorFormatter.format(could_not_find(params[:competition_id], "id", "competition"))]
+						raise RequestError.new(404, could_not_find(params[:competition_id], "id", "competition"))
 					end
 				else
 					@team.records.to_json
 				end
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:number], "number"))]
+				raise RequestError.new(404, could_not_find(params[:number], "number"))
 			end
 		end
 
@@ -99,12 +94,12 @@ module FReCon
 				if params[:competition_id]
 					@competition = Competition.find params[:competition_id]
 
-					return [404, ErrorFormatter.format(could_not_find(params[:competition_id], "id", "competition"))] if @competition.nil?
+					raise RequestError.new(404, could_not_find(params[:competition_id], "id", "competition")) if @competition.nil?
 				end
 
 				@team.matches(params[:competition_id]).to_json
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:number], "number"))]
+				raise RequestError.new(404, could_not_find(params[:number], "number"))
 			end
 		end
 
@@ -114,7 +109,7 @@ module FReCon
 			if @team
 				@team.competitions.to_json
 			else
-				[404, ErrorFormatter.format(could_not_find(params[:number], "number"))]
+				raise RequestError.new(404, could_not_find(params[:number], "number"))
 			end
 		end
 	end

data/lib/frecon/controllers.rb

@@ -8,7 +8,7 @@
 # <http://opensource.org/licenses/MIT>.
 
 require "json"
-require "frecon/error_formatter"
+require "frecon/request_error"
 
 require "frecon/controller"
 

data/lib/frecon/{error_formatter.rb → request_error.rb}

@@ -1,4 +1,4 @@
-# lib/frecon/error_formatter.rb
+# lib/frecon/request_error.rb
 #
 # Copyright (C) 2014 Christopher Cooper, Sam Craig, Tiger Huang, Vincent Mai, Sam Mercier, and Kristofer Rye
 #
@@ -9,15 +9,21 @@
 
 require "json"
 
-module FReCon
-	class ErrorFormatter
-		def self.format(message)
-			case message
-			when String
-				JSON.generate({ errors: [ message ] })
-			when Array
-				JSON.generate({ errors: message })
-			end
+class RequestError < StandardError
+	attr_reader :code
+	attr_reader :message
+
+	def initialize(code, message = 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
 end

data/lib/frecon/routes.rb

@@ -14,31 +14,51 @@ module FReCon
 		def self.resource_routes(base, name, controller, methods = [:create, :update, :delete, :show, :index])
 			if methods.include?(:create)
 				base.post "/#{name}" do
-					controller.create request, params
+					begin
+						controller.create request, params
+					rescue RequestError => e
+						[e.code, e.message]
+					end
 				end
 			end
 
 			if methods.include?(:update)
 				base.put "/#{name}/:id" do
-					controller.update request, params
+					begin
+						controller.update request, params
+					rescue RequestError => e
+						[e.code, e.message]
+					end
 				end
 			end
 
 			if methods.include?(:delete)
 				base.delete "/#{name}/:id" do
-					controller.delete params
+					begin
+						controller.delete params
+					rescue RequestError => e
+						[e.code, e.message]
+					end
 				end
 			end
 
 			if methods.include?(:show)
 				base.get "/#{name}/:id" do
-					controller.show params
+					begin
+						controller.show params
+					rescue RequestError => e
+						[e.code, e.message]
+					end
 				end
 			end
 
 			if methods.include?(:index)
 				base.get "/#{name}" do
-					controller.index params
+					begin
+						controller.index params
+					rescue RequestError => e
+						[e.code, e.message]
+					end
 				end
 			end
 		end
@@ -47,81 +67,149 @@ module FReCon
 			resource_routes base, "teams", TeamsController, [:create, :index]
 
 			base.put "/teams/:number" do
-				TeamsController.update request, params
+				begin
+					TeamsController.update request, params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.delete "/teams/:number" do
-				TeamsController.delete params
+				begin
+					TeamsController.delete params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/teams/:number" do
-				TeamsController.show params
+				begin
+					TeamsController.show params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/teams/:number/records/?:competition_id?" do
-				TeamsController.records params
+				begin
+					TeamsController.records params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/teams/:number/matches/?:competition_id?" do
-				TeamsController.matches params
+				begin
+					TeamsController.matches params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/teams/:number/competitions" do
-				TeamsController.competitions params
+				begin
+					TeamsController.competitions params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			resource_routes base, "competitions", CompetitionsController
 
 			base.get "/competitions/:id/teams" do
-				CompetitionsController.teams params
+				begin
+					CompetitionsController.teams params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/competitions/:id/matches" do
-				CompetitionsController.matches params
+				begin
+					CompetitionsController.matches params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/competitions/:id/records" do
-				CompetitionsController.records params
+				begin
+					CompetitionsController.records params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			resource_routes base, "matches", MatchesController
 
 			base.get "/matches/:id/records" do
-				MatchesController.records params
+				begin
+					MatchesController.records params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/matches/:id/competition" do
-				MatchesController.competition params
+				begin
+					MatchesController.competition params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			resource_routes base, "records", RecordsController
 
 			base.get "/records/:id/competition" do
-				RecordsController.competition params
+				begin
+					RecordsController.competition params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			resource_routes base, "robots", RobotsController
 
 			base.get "/robots/:id/competition" do
-				RobotsController.competition params
+				begin
+					RobotsController.competition params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/robots/:id/team" do
-				RobotsController.team params
+				begin
+					RobotsController.team params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			resource_routes base, "participations", ParticipationsController
 
 			base.get "/participations/:id/competition" do
-				ParticipationsController.competition params
+				begin
+					ParticipationsController.competition params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/participations/:id/team" do
-				ParticipationsController.team params
+				begin
+					ParticipationsController.team params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 
 			base.get "/dump" do
-				DumpController.full params
+				begin
+					DumpController.full params
+				rescue RequestError => e
+					[e.code, e.message]
+				end
 			end
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frecon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sam Craig
@@ -81,7 +81,6 @@ files:
 - lib/frecon/controllers/robots_controller.rb
 - lib/frecon/controllers/teams_controller.rb
 - lib/frecon/database.rb
-- lib/frecon/error_formatter.rb
 - lib/frecon/match_number.rb
 - lib/frecon/model.rb
 - lib/frecon/models.rb
@@ -93,6 +92,7 @@ files:
 - lib/frecon/models/team.rb
 - lib/frecon/mongoid.yml
 - lib/frecon/position.rb
+- lib/frecon/request_error.rb
 - lib/frecon/routes.rb
 - lib/frecon/server.rb
 homepage: https://github.com/frc-frecon/frecon