frecon 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f815f2ffe36eae99a451ce057c3f2bc41a355783
-  data.tar.gz: 0b415f99c4fdc44bc23236bd259cddec01bd505b
+  metadata.gz: 87a1e0ba2b53235ae6571889845af40b25e12222
+  data.tar.gz: 54af0be09f289107088b401d9b90490c0e8d333a
 SHA512:
-  metadata.gz: 86b2d39602ae88bce2c4c10312ac8f9f91f29170b8774104e954d7300bb6e56cecf97ee3d72ec6c5c7c656b7c9c100227efa72cf5df74849a1f944b176c13fb7
-  data.tar.gz: 0ce13da7ae08cffc748ad6e4ca3baa30e8a0606dfc98b5bc4131b7f59a2a24edc730540a028a2797ae780aed853d03fa87e9b108878465f1eac37a63611b7a89
+  metadata.gz: 93bfbc489e1b4f92caa4737655750bbc0d86f1fe13a6e4e452e9ed170143e0ce66fb820a34d56a00eafea833a570c75f89cfc3903184a41d5fe98a6bfb0ea668
+  data.tar.gz: 8742321caf2e7c047af913e0520ef4e57877f006d731003eeed1351afb2cf5adf9bcb3fb0ccc1b0483493f459289a0d96872ebc614c00a112446c2ee435719cf

data/bin/frecon

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
 # Allow running locally.
-lib_directory = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+lib_directory = File.class_eval('expand_path(join(dirname(__FILE__), "..", "lib"))')
 $LOAD_PATH.unshift(lib_directory) unless $LOAD_PATH.include?(lib_directory)
 
 require "frecon"

data/lib/frecon/base/variables.rb

@@ -1,4 +1,13 @@
 module FReCon
-	ENVIRONMENT = :development
-	VERSION = "0.1.0"
+	VERSION = "0.1.1"
+
+	@environment_variable = :development
+
+	def self.environment
+		@environment_variable
+	end
+
+	def self.environment=(arg)
+		@environment_variable = arg
+	end
 end

data/lib/frecon/console.rb

@@ -4,7 +4,7 @@ require "frecon/server"
 module FReCon
 	class Console
 		def self.start
-			Database.setup
+			Database.setup(FReCon.environment)
 
 			# Use pry if it is installed.
 			# Use the context of the FReCon module;

data/lib/frecon/controllers/records_controller.rb

@@ -11,15 +11,24 @@ module FReCon
 			# 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"]
 				if post_data["competition_name"] && (competition = Competition.find_by name: post_data["competition_name"])
 					# Try to set the match to the already existing match.
-					match = competition.matches.find_by number: post_data["match_number"]
+					begin
+						match = competition.matches.find_by number: post_data["match_number"]
+					rescue ArgumentError, TypeError => e
+						return [422, ErrorFormatter.format(e.message)]
+					end
 
 					# Create the match if necessary.
-					match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
+					begin
+						match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
+					rescue ArgumentError, TypeError => e
+						return [422, ErrorFormatter.format(e.message)]
+					end
 
 					post_data["match_id"] = match.id
 
@@ -30,7 +39,11 @@ module FReCon
 					match = competition.matches.find_by number: post_data["match_number"]
 
 					# Create the match if necessary.
-					match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
+					begin
+						match ||= Match.create(number: post_data["match_number"], competition_id: competition.id)
+					rescue ArgumentError, TypeError => e
+						return [422, ErrorFormatter.format(e.message)]
+					end
 
 					post_data["match_id"] = match.id
 

data/lib/frecon/database.rb

@@ -5,9 +5,9 @@ require "frecon/models"
 
 module FReCon
 	class Database
-		def self.setup()
-			Mongoid.load!(File.join(File.dirname(__FILE__), "mongoid.yml"), ENVIRONMENT)
-
+		def self.setup(environment)
+			Mongoid.load!(File.join(File.dirname(__FILE__), "mongoid.yml"), environment)
+			
 			Mongoid.logger.level = Logger::DEBUG
 			Mongoid.logger = Logger.new($stdout)
 

data/lib/frecon/model.rb

@@ -6,8 +6,23 @@ module FReCon
 			child.class_eval do
 				include Mongoid::Document
 				include Mongoid::Timestamps
-				include Mongoid::Attributes::Dynamic		
+				include Mongoid::Attributes::Dynamic
+
+				validate :no_invalid_relations
+			end
+		end
+
+		def no_invalid_relations
+			# Get all of the belongs_to fields (ends with "_id" and not "_id" because that is the id).
+			attributes.keys.select { |attribute| attribute.end_with?("_id") && attribute != "_id" }.each do |relation|
+				# Get the model for the belongs_to association.
+				model = "FReCon::".concat(relation.gsub(/_id\Z/, "").capitalize).constantize
+				errors.add(relation.to_sym, "is invalid") if relation_invalid(model, send(relation))
 			end
 		end
+
+		def relation_invalid(class_constant, id)
+			class_constant.find_by(id: id).nil?
+		end
 	end
 end

data/lib/frecon/server.rb

@@ -8,14 +8,16 @@ module FReCon
 	class Server < Sinatra::Base
 		include Routes
 
-		configure do
-			Database.setup
-		end
-
 		before do
 			content_type "application/json"
 		end
 
+		def self.run!
+			Database.setup(FReCon.environment)
+
+			super
+		end
+
 		def self.start
 			run!
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frecon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sam Craig
@@ -95,7 +95,7 @@ files:
 - lib/frecon/position.rb
 - lib/frecon/routes.rb
 - lib/frecon/server.rb
-homepage: https://github.com/scouting-project/scouting-project
+homepage: https://github.com/frc-frecon/frecon
 licenses: []
 metadata: {}
 post_install_message: