frecon 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fb4e7fd0591958e05533a08df54016514d378b
-  data.tar.gz: 548fabecbb1a71fcfd243e50550e6ce52114cee3
+  metadata.gz: ca8d8f19739e084e910a26abb0aced06a7d9d27b
+  data.tar.gz: fe2a74382f77dcc3c2b22b9c86b33ae41f521e63
 SHA512:
-  metadata.gz: 74e902cd66162a0e4fbcf5840e47c5dcc45e8ab7d40f169ff50f2cb419f03edf179d32440c61419f73b2df7bb7477566295856c83c026b72cf86073ed7c554a6
-  data.tar.gz: bc8cebbe5f5c3324707f9788c359646bfe09884f95c28385d32054cbc834da1aa502b48e7863bc283bdd975ed3f194cc7411abacdf406d664074dce7ccc528c2
+  metadata.gz: 7b63c78b3b9994ed34d297d73b8aa7608da1394d9b96a0876c6f6f87b26d8f061beb7f0885c91da46a1c56f26348dffd9b620f424418d71fd50b38a3b7d92ee8
+  data.tar.gz: e06dea7ca098a75ef22c12b6ad0982e02f6575a83e46da6cf2cb387a2c46f47e4a642b3a2ad95b2a576f9a3afb32981e98ea431c1e6dc6027a6ea7c3bff41cef

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Dependencies loaded from frecon.gemspec
 gemspec

data/Rakefile

@@ -1,4 +1,4 @@
-require "yard"
+require 'yard'
 
 YARD::Config.load_plugin('tomdoc')
 YARD::Config.load_plugin('mongoid')
@@ -14,7 +14,7 @@ namespace :docs do
 	end
 end
 
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/frecon/base/bson.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "mongoid"
+require 'mongoid'
 
 # Public: An extension for the BSON module.
 module BSON

data/lib/frecon/base/environment.rb

@@ -1,4 +1,4 @@
-require "yaml"
+require 'yaml'
 
 module FReCon
 
@@ -8,7 +8,7 @@ module FReCon
 
 		# Public: The configuration Hash for the server-related configuration.
 		#
-		# Keys will typically include "port", "host", etc.
+		# Keys will typically include 'port', 'host', etc.
 		attr_accessor :server
 
 		# Public: The configuration Hash for the console-related configuration.
@@ -16,7 +16,7 @@ module FReCon
 
 		# Public: The configuration Hash for the database-related configuration.
 		#
-		# Keys will typically include "mongoid", which should be a Hash
+		# Keys will typically include 'mongoid', which should be a Hash
 		# representation of a valid mongoid.yml file.
 		attr_accessor :database
 
@@ -68,11 +68,11 @@ module FReCon
 			configuration.merge(system || {})
 			configuration.merge(user || {})
 
-			# Grab out the "server", "console", and "database" values from the
+			# Grab out the 'server', 'console', and 'database' values from the
 			# configuration and store those in the appropriate instance variables.
-			@server = configuration["server"] || {}
-			@console = configuration["console"] || {}
-			@database = configuration["database"] || {}
+			@server = configuration['server'] || {}
+			@console = configuration['console'] || {}
+			@database = configuration['database'] || {}
 
 			configuration
 		end
@@ -110,7 +110,7 @@ module FReCon
 
 		# Public: Generate the filename for the defaults configuration file.
 		def default_configuration_filename
-			File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "config", "default.yml"))
+			File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'default.yml'))
 		end
 
 		# Public: Generate the filename for the system configuration file.
@@ -139,7 +139,7 @@ module FReCon
 		end
 
 		# Public: Validate a value for @variable.
-		# 
+		#
 		# Checks the value for @variable against a list of valid environments.
 		def validate_symbol(symbol)
 			raise ArgumentError, "Environment variable is not one of #{self.valid_environments}" unless
@@ -155,7 +155,7 @@ module FReCon
 
 		# Public: Return a Hash representing the default server settings.
 		def server_defaults
-			{"host" => "localhost", "port" => 4567}
+			{'host' => 'localhost', 'port' => 4567}
 		end
 
 		# Public: Return a Hash representing the default console settings.

data/lib/frecon/base/variables.rb

@@ -7,12 +7,12 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/base/environment"
+require 'frecon/base/environment'
 
 # Public: The FReCon API module.
 module FReCon
 	# Public: A String representing the current version of FReCon.
-	VERSION = "1.3.1"
+	VERSION = '1.3.2'
 
 	# Public: An Environment representing the system execution environment.
 	ENVIRONMENT = Environment.new(:development)

data/lib/frecon/base.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/base/bson"
-require "frecon/base/object"
-require "frecon/base/environment"
-require "frecon/base/variables"
+require 'frecon/base/bson'
+require 'frecon/base/object'
+require 'frecon/base/environment'
+require 'frecon/base/variables'

data/lib/frecon/console.rb

@@ -7,9 +7,9 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/base/variables"
-require "frecon/database"
-require "frecon/server"
+require 'frecon/base/variables'
+require 'frecon/database'
+require 'frecon/server'
 
 module FReCon
 	# Public: The wrapper system for a pry console.
@@ -20,7 +20,7 @@ module FReCon
 		def self.start
 			Database.setup!
 
-			require "pry"
+			require 'pry'
 
 			FReCon.pry
 		end

data/lib/frecon/controller.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/base"
+require 'frecon/base'
 
 module FReCon
 	# Public: A base class to represent a controller.
@@ -16,18 +16,18 @@ module FReCon
 		#
 		# Returns a Symbol that is the Model name.
 		def self.model_name
-			# Removes the namespace "FReCon::" and "Controller" from
+			# Removes the namespace 'FReCon::' and 'Controller' from
 			# the class name, then singularizes the result.
-			self.name.gsub(/FReCon::|Controller\Z/, "").singularize
+			self.name.gsub(/FReCon::|Controller\Z/, '').singularize
 		end
 
 		# Public: Converts the class's name to a Model.
 		#
 		# Returns the Model's class.
 		def self.model
-			# Removes the trailing "Controller" from the class name,
+			# Removes the trailing 'Controller' from the class name,
 			# singularizes the result, and turns it into the class.
-			self.name.gsub(/Controller\Z/, "").singularize.constantize
+			self.name.gsub(/Controller\Z/, '').singularize.constantize
 		end
 
 		# Public: Find a model.
@@ -37,7 +37,7 @@ module FReCon
 		#
 		# Returns either the found model value or nil.
 		def self.find_model(params)
-			model.find params.delete("id")
+			model.find params.delete('id')
 		end
 
 		# Public: Generate a could-not-find message.
@@ -47,7 +47,7 @@ module FReCon
 		# model     - The model that the search was performed upon.
 		#
 		# Returns a String containing the error message.
-		def self.could_not_find(value, attribute = "id", model = model_name.downcase)
+		def self.could_not_find(value, attribute = 'id', model = model_name.downcase)
 			"Could not find #{model} of #{attribute} #{value}!"
 		end
 
@@ -220,8 +220,8 @@ module FReCon
 			if params.empty?
 				@models = model.all
 			else
-				params.delete("splat")
-				params.delete("captures")
+				params.delete('splat')
+				params.delete('captures')
 
 				@models = model.all.psv_filter(params)
 			end

data/lib/frecon/controllers/competitions_controller.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/models/competition"
+require 'json'
+require 'frecon/models/competition'
 
 module FReCon
 	# Public: The Competitions controller.

data/lib/frecon/controllers/dump_controller.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/models"
+require 'json'
+require 'frecon/models'
 
 module FReCon
 	# Public: The Dump controller.
@@ -21,7 +21,7 @@ module FReCon
 
 			ordered_descendants = Model.descendants.sort_by do |model|
 				id_fields = model.fields.keys.select do |attribute|
-					attribute.ends_with?("_id") && attribute != "_id"
+					attribute.ends_with?('_id') && attribute != '_id'
 				end
 
 				[id_fields.count, dump_compliant_name(model)]
@@ -39,11 +39,11 @@ module FReCon
 		# Examples
 		#
 		#   DumpController.dump_compliant_name(FReCon::Team)
-		#   # => "teams"
+		#   # => 'teams'
 		#
 		# Returns a dump-compliant string.
 		def self.dump_compliant_name(model)
-			model.name.gsub(/FReCon::/, "").downcase.pluralize
+			model.name.gsub(/FReCon::/, '').downcase.pluralize
 		end
 	end
 end

data/lib/frecon/controllers/matches_controller.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/models/match"
+require 'json'
+require 'frecon/models/match'
 
 module FReCon
 	# Public: The Matches controller.

data/lib/frecon/controllers/participations_controller.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/models/participation"
+require 'json'
+require 'frecon/models/participation'
 
 module FReCon
 	# Public: The Participations controller.

data/lib/frecon/controllers/records_controller.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/models/record"
+require 'json'
+require 'frecon/models/record'
 
 module FReCon
 	# Public: The Records controller.

data/lib/frecon/controllers/robots_controller.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/models/robot"
+require 'json'
+require 'frecon/models/robot'
 
 module FReCon
 	# Public: The Robots controller.

data/lib/frecon/controllers/teams_controller.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/models/team"
+require 'json'
+require 'frecon/models/team'
 
 module FReCon
 	# Public: The Teams controller.

data/lib/frecon/controllers.rb

@@ -7,15 +7,15 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
-require "frecon/request_error"
+require 'json'
+require 'frecon/request_error'
 
-require "frecon/controller"
+require 'frecon/controller'
 
-require "frecon/controllers/competitions_controller"
-require "frecon/controllers/dump_controller"
-require "frecon/controllers/matches_controller"
-require "frecon/controllers/participations_controller"
-require "frecon/controllers/records_controller"
-require "frecon/controllers/robots_controller"
-require "frecon/controllers/teams_controller"
+require 'frecon/controllers/competitions_controller'
+require 'frecon/controllers/dump_controller'
+require 'frecon/controllers/matches_controller'
+require 'frecon/controllers/participations_controller'
+require 'frecon/controllers/records_controller'
+require 'frecon/controllers/robots_controller'
+require 'frecon/controllers/teams_controller'

data/lib/frecon/database.rb

@@ -7,26 +7,26 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "logger"
+require 'logger'
 
-require "frecon/base/variables"
+require 'frecon/base/variables'
 
-require "mongoid"
-require "frecon/mongoid/criteria"
+require 'mongoid'
+require 'frecon/mongoid/criteria'
 
-require "tempfile"
-require "yaml"
+require 'tempfile'
+require 'yaml'
 
-require "frecon/models"
+require 'frecon/models'
 
 module FReCon
 	# Public: A system to set up the database.
 	class Database
 		# Public: Set up the database.
 		def self.setup!
-			Mongoid.load!(File.join(File.dirname(__FILE__), "mongoid.yml"), FReCon::ENVIRONMENT.variable)
+			Mongoid.load!(File.join(File.dirname(__FILE__), 'mongoid.yml'), FReCon::ENVIRONMENT.variable)
 
-			if FReCon::ENVIRONMENT.console["level"]
+			if FReCon::ENVIRONMENT.console['level']
 				Mongoid.logger.level = Logger::DEBUG
 				Mongoid.logger = Logger.new($stdout)
 

data/lib/frecon/match_number.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/base"
+require 'frecon/base'
 
 module FReCon
 	# Public: A wrapper to handle converting match numbers and storing them.
@@ -111,17 +111,17 @@ module FReCon
 				# Match `args' against the regular expression, described below.
 				#
 				# This regular expression matches all values where the first group of
-				# characters is one of either [ "p", "q", "qf", "sf", "f" ], which is
-				# parsed as the "type" of the match. This is followed by an "m" and a
-				# group of digits, which is parsed as the "number" of the match.
+				# characters is one of either [ 'p', 'q', 'qf', 'sf', 'f' ], which is
+				# parsed as the 'type' of the match. This is followed by an 'm' and a
+				# group of digits, which is parsed as the 'number' of the match.
 				#
-				# In addition, one can specify a "round number" following the first group
+				# In addition, one can specify a 'round number' following the first group
 				# of characters such as in eliminations and finals. Often times, there
-				# are multiple so-called "rounds" in eliminations, and so the system will
+				# are multiple so-called 'rounds' in eliminations, and so the system will
 				# optionally capture that round.
 				#
-				# Also, one can specify a "replay number" following the match number.
-				# this is done by appending "r" and a group of digits which is the replay
+				# Also, one can specify a 'replay number' following the match number.
+				# this is done by appending 'r' and a group of digits which is the replay
 				# number.
 				#
 				# Below are listed the match groups and what they are:
@@ -136,44 +136,44 @@ module FReCon
 				match_data = args.match(/(p|q|qf|sf|f)([\d]+)?m([\d]+)(r)?([\d]+)?/i)
 
 				# Whine if we don't have a match (string is incorrectly formatted)
-				raise ArgumentError, "string is improperly formatted" unless match_data
+				raise ArgumentError, 'string is improperly formatted' unless match_data
 
 				# Check and set required stuff first, everything else later.
 
 				# Whine if we don't have a match type
-				raise ArgumentError, "match type must be supplied" unless match_data[1]
+				raise ArgumentError, 'match type must be supplied' unless match_data[1]
 
 				# Parse the match type string
 				@type = case match_data[1].downcase
-				        when "p"
+				        when 'p'
 					        :practice
-				        when "q"
+				        when 'q'
 					        :qualification
-				        when "qf"
+				        when 'qf'
 					        :quarterfinal
-				        when "sf"
+				        when 'sf'
 					        :semifinal
-				        when "f"
+				        when 'f'
 					        :final
 				        else
-					        raise ArgumentError, "match type must be in [\"p\", \"q\", \"qf\", \"sf\", \"f\"]"
+					        raise ArgumentError, 'match type must be in [\'p\', \'q\', \'qf\', \'sf\', \'f\']'
 				        end
 
 				# Whine if we don't have a match number
-				raise ArgumentError, "match number must be supplied" unless match_data[3]
+				raise ArgumentError, 'match number must be supplied' unless match_data[3]
 
 				# Parse the match number
 				@number = match_data[3].to_i
-				raise ArgumentError, "match number must be greater than 0" unless @number > 0
+				raise ArgumentError, 'match number must be greater than 0' unless @number > 0
 
 				# Parse the round number, if it is present
 				if match_data[2]
 					@round = match_data[2].to_i
-					raise ArgumentError, "round number must be greater than 0" unless @round > 0
+					raise ArgumentError, 'round number must be greater than 0' unless @round > 0
 				end
 
 				# Parse replay match group, store replay number if present.
-				@replay_number = match_data[5].to_i if match_data[4] == "r"
+				@replay_number = match_data[5].to_i if match_data[4] == 'r'
 			elsif args.is_a?(Hash)
 				# type (Symbol or String)
 				# number (Integer)
@@ -183,31 +183,31 @@ module FReCon
 				# Convert keys to symbols if needed.
 				args = Hash[args.map { |key, value| [key.to_sym, value] }]
 
-				raise TypeError, "type must be a Symbol or String" unless args[:type].is_a?(Symbol) || args[:type].is_a?(String)
+				raise TypeError, 'type must be a Symbol or String' unless args[:type].is_a?(Symbol) || args[:type].is_a?(String)
 				raise ArgumentError, "type must be in #{POSSIBLE_TYPES.inspect}" unless POSSIBLE_TYPES.include?(args[:type].to_sym)
 
 				@type = args[:type].to_sym
 
-				raise TypeError, "match number must be an Integer" unless args[:number].is_an?(Integer)
-				raise ArgumentError, "match number must be greater than 0" unless args[:number] > 0
+				raise TypeError, 'match number must be an Integer' unless args[:number].is_an?(Integer)
+				raise ArgumentError, 'match number must be greater than 0' unless args[:number] > 0
 
 				@number = args[:number]
 
 				if args[:round]
-					raise TypeError, "round number must be an Integer" unless args[:round].is_an?(Integer)
-					raise ArgumentError, "round number must be greater than 0" unless args[:round] > 0
+					raise TypeError, 'round number must be an Integer' unless args[:round].is_an?(Integer)
+					raise ArgumentError, 'round number must be greater than 0' unless args[:round] > 0
 
 					@round = args[:round]
 				end
 
 				if args[:replay_number]
-					raise TypeError, "replay number must be an Integer" unless args[:replay_number].is_an?(Integer)
-					raise ArgumentError, "replay number must be greater than 0" unless args[:replay_number] > 0
+					raise TypeError, 'replay number must be an Integer' unless args[:replay_number].is_an?(Integer)
+					raise ArgumentError, 'replay number must be greater than 0' unless args[:replay_number] > 0
 
 					@replay_number = args[:replay_number]
 				end
 			else
-				raise TypeError, "argument must be a String or Hash"
+				raise TypeError, 'argument must be a String or Hash'
 			end
 		end
 
@@ -217,15 +217,15 @@ module FReCon
 		def to_s
 			type_string = case @type
 			              when :practice
-				              "p"
+				              'p'
 			              when :qualification
-				              "q"
+				              'q'
 			              when :quarterfinal
-				              "qf"
+				              'qf'
 			              when :semifinal
-				              "sf"
+				              'sf'
 			              when :final
-				              "f"
+				              'f'
 			              end
 			match_string = "m#{@number}"
 			replay_string = "r#{@replay_number}" if replay?

data/lib/frecon/model.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "mongoid"
-require "frecon/mongoid/criteria"
+require 'mongoid'
+require 'frecon/mongoid/criteria'
 
 module FReCon
 	# Public: A base class designed to assist with creating MongoDB Models
@@ -45,7 +45,7 @@ module FReCon
 				# Examples
 				#
 				#   # (Taken from the Team model)
-				#   register_routable_relation :matches, "matches"
+				#   register_routable_relation :matches, 'matches'
 				#
 				# Returns the result of pushing an object to class's attributes
 				#   class variable.
@@ -82,18 +82,18 @@ module FReCon
 		#
 		# Returns the associated Controller if it exists, else nil.
 		def self.controller
-			(self.name.pluralize + "Controller").constantize
+			(self.name.pluralize + 'Controller').constantize
 		end
 
 		# Public: Validate that no invalid relations exist within this Model
 		def no_invalid_relations
-			# Get all of the belongs_to fields (ends with "_id" and not "_id" because that is the id).
+			# Get all of the belongs_to fields (ends with '_id' and not '_id' because that is the id).
 			attributes.keys.select do |attribute|
-				attribute.end_with?("_id") && attribute != "_id"
+				attribute.end_with?('_id') && attribute != '_id'
 			end.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))
+				model = 'FReCon::'.concat(relation.gsub(/_id\Z/, '').capitalize).constantize
+				errors.add(relation.to_sym, 'is invalid') if relation_invalid?(model, send(relation))
 			end
 		end
 

data/lib/frecon/models/competition.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/model"
+require 'frecon/model'
 
 module FReCon
 	# Public: The Competition model.
@@ -36,10 +36,10 @@ module FReCon
 			Team.in id: robots.map(&:team_id)
 		end
 
-		register_routable_relation :matches, "matches"
-		register_routable_relation :participations, "participations"
-		register_routable_relation :records, "records"
-		register_routable_relation :robots, "robots"
-		register_routable_relation :teams, "teams"
+		register_routable_relation :matches, 'matches'
+		register_routable_relation :participations, 'participations'
+		register_routable_relation :records, 'records'
+		register_routable_relation :robots, 'robots'
+		register_routable_relation :teams, 'teams'
 	end
 end

data/lib/frecon/models/match.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/model"
-require "frecon/match_number"
+require 'frecon/model'
+require 'frecon/match_number'
 
 module FReCon
 	# Public: The Match model.
@@ -38,10 +38,10 @@ module FReCon
 			Team.in id: robots.map(&:team_id)
 		end
 
-		register_routable_relation :competition, "competition"
-		register_routable_relation :records, "records"
-		register_routable_relation :participations, "participations"
-		register_routable_relation :robots, "robots"
-		register_routable_relation :teams, "teams"
+		register_routable_relation :competition, 'competition'
+		register_routable_relation :records, 'records'
+		register_routable_relation :participations, 'participations'
+		register_routable_relation :robots, 'robots'
+		register_routable_relation :teams, 'teams'
 	end
 end

data/lib/frecon/models/participation.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/model"
+require 'frecon/model'
 
 module FReCon
 	# Public: The Participation model.
@@ -28,10 +28,10 @@ module FReCon
 			competition.matches
 		end
 
-		register_routable_relation :robot, "robot"
-		register_routable_relation :team, "team"
-		register_routable_relation :competition, "competition"
-		register_routable_relation :matches, "matches"
-		register_routable_relation :records, "records"
+		register_routable_relation :robot, 'robot'
+		register_routable_relation :team, 'team'
+		register_routable_relation :competition, 'competition'
+		register_routable_relation :matches, 'matches'
+		register_routable_relation :records, 'records'
 	end
 end

data/lib/frecon/models/record.rb

@@ -7,8 +7,8 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/model"
-require "frecon/position"
+require 'frecon/model'
+require 'frecon/position'
 
 module FReCon
 	# Public: The Record model.
@@ -36,10 +36,10 @@ module FReCon
 			participation.robot.team
 		end
 
-		register_routable_relation :match, "match"
-		register_routable_relation :competition, "competition"
-		register_routable_relation :participation, "participation"
-		register_routable_relation :robot, "robot"
-		register_routable_relation :team, "team"
+		register_routable_relation :match, 'match'
+		register_routable_relation :competition, 'competition'
+		register_routable_relation :participation, 'participation'
+		register_routable_relation :robot, 'robot'
+		register_routable_relation :team, 'team'
 	end
 end

data/lib/frecon/models/robot.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/model"
+require 'frecon/model'
 
 module FReCon
 	# Public: The Robot model.
@@ -35,10 +35,10 @@ module FReCon
 			Match.in id: records.map(&:match_id).uniq
 		end
 
-		register_routable_relation :team, "team"
-		register_routable_relation :participations, "participations"
-		register_routable_relation :competitions, "competitions"
-		register_routable_relation :records, "records"
-		register_routable_relation :matches, "matches"
+		register_routable_relation :team, 'team'
+		register_routable_relation :participations, 'participations'
+		register_routable_relation :competitions, 'competitions'
+		register_routable_relation :records, 'records'
+		register_routable_relation :matches, 'matches'
 	end
 end

data/lib/frecon/models/team.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/model"
+require 'frecon/model'
 
 module FReCon
 	# Public: The Team model.
@@ -51,11 +51,11 @@ module FReCon
 			Match.in competition_id: competitions.map(&:id)
 		end
 
-		register_routable_relation :robots, "robots"
-		register_routable_relation :participations, "participations"
-		register_routable_relation :competitions, "competitions"
-		register_routable_relation :records, "records"
-		register_routable_relation :matches, "matches"
+		register_routable_relation :robots, 'robots'
+		register_routable_relation :participations, 'participations'
+		register_routable_relation :competitions, 'competitions'
+		register_routable_relation :records, 'records'
+		register_routable_relation :matches, 'matches'
 
 		# alias_method works by default solely on instance
 		# methods, so change context to the metaclass of

data/lib/frecon/models.rb

@@ -7,9 +7,9 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/models/competition"
-require "frecon/models/match"
-require "frecon/models/participation"
-require "frecon/models/record"
-require "frecon/models/robot"
-require "frecon/models/team"
+require 'frecon/models/competition'
+require 'frecon/models/match'
+require 'frecon/models/participation'
+require 'frecon/models/record'
+require 'frecon/models/robot'
+require 'frecon/models/team'

data/lib/frecon/mongoid/criteria.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "mongoid"
+require 'mongoid'
 
 # Public: An extension for the Mongoid module.
 module Mongoid
@@ -17,7 +17,7 @@ module Mongoid
 		# Public: Filter by given PSV parameters.
 		#
 		# PSV is an introduced system that can be used within query strings to
-		# narrow a query.  Since HTTP query strings can use "+" to act as spaces
+		# narrow a query.  Since HTTP query strings can use '+' to act as spaces
 		# within a key-value pair, one can use these pluses to define nested
 		# query parameters when querying the database as in an indexing or
 		# showing request.
@@ -26,12 +26,12 @@ module Mongoid
 		#
 		# Examples
 		#
-		#   Record.all.psv_filter({"participation robot team number" => "2503"})
+		#   Record.all.psv_filter({'participation robot team number' => '2503'})
 		#   => #<Mongoid::Criteria ...>
 		#
 		#   # Since each instance of Record has a :team shortcut method,
 		#   # we can just filter it like so.
-		#   Record.all.psv_filter({"team number" => "2503"})
+		#   Record.all.psv_filter({'team number' => '2503'})
 		#   => #<Mongoid::Criteria ...>
 		#
 		# Returns a filtered version of self.
@@ -55,20 +55,20 @@ module Mongoid
 
 				# Create a comparison hash to be used to compare <attribute> to
 				# <expected value>.
-				if comparison_value.length == 0 || comparison_value == "__nil__"
+				if comparison_value.length == 0 || comparison_value == '__nil__'
 					comparison_hash = {comparison_key => nil}
 				else
 					comparison_hash = {comparison_key => comparison_value}
 				end
 
 				# Each of the subsequent keys should be a model name.  Generate a string
-				# corresponding to the "<model>" + "_id" for use as the comparison key,
+				# corresponding to the '<model>' + '_id' for use as the comparison key,
 				# and find the model class by generating a constant.
 				#
 				# Then, nest a comparison around the current comparison hash.
 				psv_keys.each do |model|
 					model_id = (model.to_s + '_id').to_sym
-					model_class = ("FReCon::" + model.to_s.capitalize).constantize
+					model_class = ('FReCon::' + model.to_s.capitalize).constantize
 
 					comparison_hash = {model_id => model_class.in(comparison_hash).map(&:id)}
 				end

data/lib/frecon/position.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/base"
+require 'frecon/base'
 
 module FReCon
 	# Public: A wrapper to handle converting team positions and storing them.
@@ -102,7 +102,7 @@ module FReCon
 				# Match `string' against the regular expression, described below.
 				#
 				# This regular expression matches all values for `string' where
-				# the first letter is either "r" or "b" (case-insensitive due to /i
+				# the first letter is either 'r' or 'b' (case-insensitive due to /i
 				# at the end of the regular expression) and the last one-or-more
 				# characters in the string are digits 0-9. Anything between those two
 				# that is either a letter or an underscore is not retained, but
@@ -110,8 +110,8 @@ module FReCon
 				# will not match.
 				#
 				# You can use any words you like if you have more than just
-				# "r<n>" or "b<n>", for example "red_2" matches just the same
-				# as "r2", or, just for fun, just the same as "royal______2".
+				# 'r<n>' or 'b<n>', for example 'red_2' matches just the same
+				# as 'r2', or, just for fun, just the same as 'royal______2'.
 				#
 				# This behavior may change in the future.
 				match_data = args[0].match(/^([rb])[a-z\_]*([0-9]+)/i)
@@ -120,29 +120,29 @@ module FReCon
 				# string that was matched, hence the indices that start
 				# at one.
 
-				raise ArgumentError, "string is improperly formatted" unless match_data
+				raise ArgumentError, 'string is improperly formatted' unless match_data
 
 				@alliance = case match_data[1].downcase
-				            when "b"
+				            when 'b'
 					            :blue
-				            when "r"
+				            when 'r'
 					            :red
 				            else
-					            raise ArgumentError, "alliance character must be in [\"b\", \"r\"]"
+					            raise ArgumentError, "alliance character must be in ['b', 'r']"
 				            end
 
 				position_number = match_data[2].to_i
-				raise ArgumentError, "position number must be in [1, 2, 3]" unless [1, 2, 3].include?(position_number)
+				raise ArgumentError, 'position number must be in [1, 2, 3]' unless [1, 2, 3].include?(position_number)
 
 				@number = position_number
 			elsif args.length == 2
-				raise TypeError, "alliance must be a Symbol or String" unless args[0].is_a?(Symbol) || args[0].is_a?(String)
-				raise ArgumentError, "alliance must be in [:blue, :red]" unless [:blue, :red].include?(args[0].to_sym)
+				raise TypeError, 'alliance must be a Symbol or String' unless args[0].is_a?(Symbol) || args[0].is_a?(String)
+				raise ArgumentError, 'alliance must be in [:blue, :red]' unless [:blue, :red].include?(args[0].to_sym)
 
 				@alliance = args[0].to_sym
 
-				raise TypeError, "second argument must be an Integer" unless args[1].is_an?(Integer)
-				raise ArgumentError, "second argument must be in [1, 2, 3]" unless [1, 2, 3].include?(args[1])
+				raise TypeError, 'second argument must be an Integer' unless args[1].is_an?(Integer)
+				raise ArgumentError, 'second argument must be in [1, 2, 3]' unless [1, 2, 3].include?(args[1])
 
 				@number = args[1]
 			else

data/lib/frecon/request_error.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "json"
+require 'json'
 
 # Public: A class representing errors that emanate from request handling.
 class RequestError < StandardError

data/lib/frecon/routes.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/controllers"
+require 'frecon/controllers'
 
 module FReCon
 	# Public: A module containing all of the routes.
@@ -74,13 +74,13 @@ module FReCon
 					begin
 						@model = controller.find_model(params)
 
-						params.delete("id")
+						params.delete('id')
 
 						result = @model.method(model_attribute_method[:method]).call
 
 						if result.is_a? Mongoid::Criteria
-							params.delete("splat")
-							params.delete("captures")
+							params.delete('splat')
+							params.delete('captures')
 
 							result.psv_filter(params).to_json
 						else
@@ -97,25 +97,25 @@ module FReCon
 		#
 		# base - The child that included this module (should be a Sinatra App)
 		def self.included(base)
-			resource_routes base, "teams", TeamsController
-			resource_routes base, "competitions", CompetitionsController
-			resource_routes base, "matches", MatchesController
-			resource_routes base, "records", RecordsController
-			resource_routes base, "robots", RobotsController
-			resource_routes base, "participations", ParticipationsController
-
-			attribute_routes base, "teams", TeamsController
-			attribute_routes base, "competitions", CompetitionsController
-			attribute_routes base, "matches", MatchesController
-			attribute_routes base, "records", RecordsController
-			attribute_routes base, "robots", RobotsController
-			attribute_routes base, "participations", ParticipationsController
+			resource_routes base, 'teams', TeamsController
+			resource_routes base, 'competitions', CompetitionsController
+			resource_routes base, 'matches', MatchesController
+			resource_routes base, 'records', RecordsController
+			resource_routes base, 'robots', RobotsController
+			resource_routes base, 'participations', ParticipationsController
+
+			attribute_routes base, 'teams', TeamsController
+			attribute_routes base, 'competitions', CompetitionsController
+			attribute_routes base, 'matches', MatchesController
+			attribute_routes base, 'records', RecordsController
+			attribute_routes base, 'robots', RobotsController
+			attribute_routes base, 'participations', ParticipationsController
 
 			base.before do
-				params.delete("_")
+				params.delete('_')
 			end
 
-			base.get "/dump" do
+			base.get '/dump' do
 				begin
 					DumpController.full params
 				rescue RequestError => e
@@ -123,7 +123,7 @@ module FReCon
 				end
 			end
 
-			if ENV["PRINT_ROUTES"]
+			if ENV['PRINT_ROUTES']
 				base.routes.each do |verb, routes|
 					puts "#{verb}:"
 

data/lib/frecon/scraper.rb

@@ -7,7 +7,7 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "httparty"
+require 'httparty'
 
 module FReCon
 	# The default scraper scrapes other FReCon instances.
@@ -24,9 +24,9 @@ module FReCon
 			data = JSON.parse(data)
 
 			if context[:type] == :single && data.empty?
-				return [404, "Could not find a model with that query."]
+				return [404, 'Could not find a model with that query.']
 			elsif
-				puts "Just a heads up: you are importing an empty array of data."
+				puts 'Just a heads up: you are importing an empty array of data.'
 			end
 
 			# Here we want `context` to tell us what model we are making.
@@ -38,7 +38,7 @@ module FReCon
 				statuses = data.map do |key, value|
 					begin
 						unless value.empty?
-							model = ("FReCon::" + key.singularize.capitalize).constantize
+							model = ('FReCon::' + key.singularize.capitalize).constantize
 							result = model.controller.create(nil, nil, value)
 							result.first == 201 ? result.first : JSON.parse(result.last)
 						end
@@ -56,12 +56,12 @@ module FReCon
 		# If two arguments are passed, will import the models that match
 		# the query params.
 		def get(model = nil, query = {})
-			# Turns something like "team" into Team.
-			model = ("FReCon::" + model.capitalize).constantize if model.is_a?(String)
+			# Turns something like 'team' into Team.
+			model = ('FReCon::' + model.capitalize).constantize if model.is_a?(String)
 
 			# The route name for the model branch.
-			route_name = model.name.gsub(/FReCon::/, "").downcase.pluralize if model
-			
+			route_name = model.name.gsub(/FReCon::/, '').downcase.pluralize if model
+
 			if !model && query.empty?
 				type = :dump
 				data = HTTParty.get("http://#{@base_uri}/dump")

data/lib/frecon/scrapers.rb

@@ -7,4 +7,4 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "frecon/scraper"
+require 'frecon/scraper'

data/lib/frecon/server.rb

@@ -7,12 +7,12 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "sinatra/base"
+require 'sinatra/base'
 
-require "frecon/base/variables"
-require "frecon/database"
-require "frecon/routes"
-require "frecon/controllers"
+require 'frecon/base/variables'
+require 'frecon/database'
+require 'frecon/routes'
+require 'frecon/controllers'
 
 module FReCon
 	# Public: The Sinatra web server.
@@ -20,7 +20,7 @@ module FReCon
 		include Routes
 
 		before do
-			content_type "application/json"
+			content_type 'application/json'
 		end
 
 		# Public: Start the Server.
@@ -40,8 +40,8 @@ module FReCon
 		def self.setup!
 			# Set the Thin and Sinatra options.
 			set :server, %w[thin HTTP webrick]
-			set :bind, FReCon::ENVIRONMENT.server["host"]
-			set :port, FReCon::ENVIRONMENT.server["port"]
+			set :bind, FReCon::ENVIRONMENT.server['host']
+			set :port, FReCon::ENVIRONMENT.server['port']
 			set :environment, FReCon::ENVIRONMENT.variable.to_s
 
 			# Set up the database.

data/lib/frecon.rb

@@ -7,22 +7,22 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require "mongoid"
+require 'mongoid'
 
-require "frecon/base"
+require 'frecon/base'
 
-require "frecon/controller"
-require "frecon/controllers"
-require "frecon/model"
-require "frecon/models"
-require "frecon/scraper"
-require "frecon/scrapers"
+require 'frecon/controller'
+require 'frecon/controllers'
+require 'frecon/model'
+require 'frecon/models'
+require 'frecon/scraper'
+require 'frecon/scrapers'
 
-require "frecon/match_number"
-require "frecon/position"
-require "frecon/request_error"
-require "frecon/routes"
+require 'frecon/match_number'
+require 'frecon/position'
+require 'frecon/request_error'
+require 'frecon/routes'
 
-require "frecon/database"
-require "frecon/server"
-require "frecon/console"
+require 'frecon/database'
+require 'frecon/server'
+require 'frecon/console'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frecon
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Sam Craig
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra