frecon 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58387796046e8701cec240419090e6ee551f7579
-  data.tar.gz: b69de0f4af45d87a8ad47b36d1b55dee79ce8166
+  metadata.gz: 76274cd22631fa8a8fec64c7f20e9fa3823a5c6c
+  data.tar.gz: 22e582985d03f0117c4c6c52bc9df8dd0baed5e1
 SHA512:
-  metadata.gz: 6895028dc88806ec1f183c74cd1426f86035641ce9823c9f449860fe9da5459efe20a5dfda62d53e8cf5e8659118a67390d554267c26f3c60580a2d0f9246603
-  data.tar.gz: b11ff7aafd87d88cebc58dcf9180b81ba8dc0b02bc519016b9fda94a7a89197906443058d62b2b0bb7b57b1d977f9d01e454904a0537cbcec69ff9a3e32c3b66
+  metadata.gz: 642a0a6cecd69f672894e201aea4079b284664a49bb1ebc6b118cdc220dc3e2e0c53bec0453f2b15999b199dae683bb24f860a76d9caf806d2ce8ae6a24b8d67
+  data.tar.gz: 0bb4e0aeb6e7037a77614f4f678077e6e7824a8cc5ca37a7b0dd5197e6317be94afddbddc730bd49f2439c13c11299f1629877c1f30c150426f21d8cedf5ee98

data/config/default.yml

@@ -3,6 +3,7 @@ server:
   port: 5080
 
 console:
+  level: info
 
 database:
   mongoid:

data/lib/frecon.rb

@@ -7,22 +7,45 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require 'mongoid'
-
+require 'frecon/base/bson'
+require 'frecon/base/environment'
+require 'frecon/base/object'
+require 'frecon/base/variables'
 require 'frecon/base'
 
+require 'frecon/console'
+
 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'
+
+require 'frecon/database'
+require 'frecon/match_number'
+
 require 'frecon/model'
+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'
+
 require 'frecon/scraper'
 require 'frecon/scrapers'
 
-require 'frecon/match_number'
+require 'frecon/mongoid/criteria'
 require 'frecon/position'
 require 'frecon/request_error'
 require 'frecon/routes'
 
-require 'frecon/database'
+require 'frecon/scraper'
+require 'frecon/scrapers'
+
 require 'frecon/server'
-require 'frecon/console'

data/lib/frecon/base.rb

@@ -8,6 +8,6 @@
 # <http://opensource.org/licenses/MIT>.
 
 require 'frecon/base/bson'
-require 'frecon/base/object'
 require 'frecon/base/environment'
+require 'frecon/base/object'
 require 'frecon/base/variables'

data/lib/frecon/base/bson.rb

@@ -11,6 +11,7 @@ require 'mongoid'
 
 # Public: An extension for the BSON module.
 module BSON
+
 	# Public: A monkey-patch for the BSON::ObjectId class which introduces an
 	# #as_json method.
 	class ObjectId
@@ -24,4 +25,5 @@ module BSON
 			to_s
 		end
 	end
+
 end

data/lib/frecon/base/object.rb

@@ -8,5 +8,9 @@
 # <http://opensource.org/licenses/MIT>.
 
 class Object
+
+	# Alias #is_a? to #is_an?. This allows us to write more
+	# proper-English-y code.
 	alias_method :is_an?, :is_a?
+
 end

data/lib/frecon/base/variables.rb

@@ -11,9 +11,11 @@ require 'frecon/base/environment'
 
 # Public: The FReCon API module.
 module FReCon
+
 	# Public: A String representing the current version of FReCon.
-	VERSION = '1.3.3'
+	VERSION = '1.4.0'
 
 	# Public: An Environment representing the system execution environment.
 	ENVIRONMENT = Environment.new(:development)
+
 end

data/lib/frecon/console.rb

@@ -7,9 +7,7 @@
 # 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'
 
 module FReCon
 	# Public: The wrapper system for a pry console.

data/lib/frecon/controller.rb

@@ -7,7 +7,12 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require 'frecon/base'
+require 'json'
+
+require 'frecon/request_error'
+
+require 'frecon/base/bson'
+require 'frecon/base/object'
 
 module FReCon
 	# Public: A base class to represent a controller.

data/lib/frecon/controllers.rb

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

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 'frecon/controller'
 
 module FReCon
 	# Public: The Competitions controller.

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 'frecon/controller'
 
 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 'frecon/controller'
 
 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 'frecon/controller'
 
 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 'frecon/controller'
 
 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 'frecon/controller'
 
 module FReCon
 	# Public: The Teams controller.

data/lib/frecon/database.rb

@@ -8,31 +8,45 @@
 # <http://opensource.org/licenses/MIT>.
 
 require 'logger'
-
-require 'frecon/base/variables'
-
 require 'mongoid'
-require 'frecon/mongoid/criteria'
-
 require 'tempfile'
 require 'yaml'
 
+require 'frecon/base/bson'
+require 'frecon/mongoid/criteria'
+require 'frecon/base/variables'
 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)
 
-			if FReCon::ENVIRONMENT.console['level']
-				Mongoid.logger.level = Logger::DEBUG
+			level = case (configured_level = FReCon::ENVIRONMENT.console['level'])
+			        when /^d/i
+				        ::Logger::DEBUG
+			        when /^e/i
+				        ::Logger::ERROR
+			        when /^f/i
+				        ::Logger::FATAL
+			        when /^i/i
+				        ::Logger::INFO
+			        when /^u/i
+				        ::Logger::UNKNOWN
+			        when /^w/i
+				        ::Logger::WARN
+			        else
+				        ::Logger::WARN
+			        end
+
+			if !!configured_level
 				Mongoid.logger = Logger.new($stdout)
-
-				Moped.logger.level = Logger::DEBUG
-				Moped.logger = Logger.new($stdout)
+				Mongoid.logger.level = level
 			end
 		end
+
 	end
 end

data/lib/frecon/match_number.rb

@@ -7,7 +7,10 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require 'frecon/base'
+require 'frecon/base/bson'
+require 'frecon/base/environment'
+require 'frecon/base/object'
+require 'frecon/base/variables'
 
 module FReCon
 	# Public: A wrapper to handle converting match numbers and storing them.

data/lib/frecon/model.rb

@@ -9,6 +9,7 @@
 
 require 'mongoid'
 require 'frecon/mongoid/criteria'
+require 'frecon/base/bson'
 
 module FReCon
 	# Public: A base class designed to assist with creating MongoDB Models

data/lib/frecon/mongoid.yml

@@ -8,7 +8,7 @@
 # <http://opensource.org/licenses/MIT>.
 
 development:
-  sessions:
+  clients:
     default:
       database: frecon
       hosts:
@@ -18,7 +18,7 @@ development:
     raise_not_found_error: false
 
 production:
-  sessions:
+  clients:
     default:
       database: frecon
       hosts:

data/lib/frecon/position.rb

@@ -7,7 +7,10 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
-require 'frecon/base'
+require 'frecon/base/bson'
+require 'frecon/base/environment'
+require 'frecon/base/object'
+require 'frecon/base/variables'
 
 module FReCon
 	# Public: A wrapper to handle converting team positions and storing them.

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 'http'
 
 module FReCon
 	# The default scraper scrapes other FReCon instances.
@@ -64,13 +64,13 @@ module FReCon
 
 			if !model && query.empty?
 				type = :dump
-				data = HTTParty.get("http://#{@base_uri}/dump")
+				data = HTTP.get("http://#{@base_uri}/dump")
 			elsif model && query.empty?
 				type = :index
-				data = HTTParty.get("http://#{@base_uri}/#{route_name}")
+				data = HTTP.get("http://#{@base_uri}/#{route_name}")
 			else
 				type = :single
-				data = HTTParty.get("http://#{@base_uri}/#{route_name}", { query: query })
+				data = HTTP.get("http://#{@base_uri}/#{route_name}", { query: query })
 			end
 
 			read data.body, model: model, type: type

data/lib/frecon/server.rb

@@ -12,7 +12,6 @@ require 'sinatra/base'
 require 'frecon/base/variables'
 require 'frecon/database'
 require 'frecon/routes'
-require 'frecon/controllers'
 
 module FReCon
 	# Public: The Sinatra web server.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frecon
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Sam Craig
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -63,28 +63,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement