frecon 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a2e4e957492a0168c9e814b237ea59435aa800
-  data.tar.gz: 3051b10b6a8e7740370ffd75eebce4230b3ef252
+  metadata.gz: fd60a8e39df9d65354023f15a71e7ff1941465cc
+  data.tar.gz: 322aad2f9008ee3bac2f566a1afcc7ccc60938f8
 SHA512:
-  metadata.gz: b579c98940cd2759ed748dbaea6b51ffeef679c6f08f958a1e7501fda4e5043e20b4fb987422ebb002b013fb679eb1ac4586a6027bfb02186b196507a0faafc7
-  data.tar.gz: a312a6a56950302d16e0075875e25ef9b830164eb9d7999820e364fa49c5b170a72b4f7bf96ff99a2a64e7cdaca836953b9811fab42a315102586fb03014a7fd
+  metadata.gz: d40ef54381e9b613289a0c1b82f486a965975866e1f7e3cbe16ec15285708e05156b2bfc4c6a27a567b3ecd72fa128f379fbcbfad6b008f5ccd19f81970b559b
+  data.tar.gz: e6c5a2c2bbddf8de4b04441c59cc45575f76019fb2f81e3d110860b736c8ce8a6ff57203f36d6e6f92066261b52c8b5ad18d9e8052543500d158b74f352c4df2

data/lib/frecon/base/bson.rb

@@ -0,0 +1,16 @@
+# lib/frecon/base/bson.rb
+#
+# Copyright (C) 2014 Christopher Cooper, Sam Craig, Tiger Huang, Vincent Mai, Sam Mercier, and Kristofer Rye
+#
+# This file is part of FReCon, an API for scouting at FRC Competitions, which is
+# licensed under the MIT license.  You should have received a copy of the MIT
+# license with this program.  If not, please see
+# <http://opensource.org/licenses/MIT>.
+
+module BSON
+	class ObjectId
+		def as_json(*args)
+			to_s
+		end
+	end
+end

data/lib/frecon/base/variables.rb

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

data/lib/frecon/base.rb

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

data/lib/frecon/controller.rb

@@ -34,44 +34,61 @@ module FReCon
 			"Could not find #{model} of #{attribute} #{value}!"
 		end
 
-		# Processes a POST/PUT request and returns the post data.
-		def self.process_json_object_request(request)
+		def self.process_json_request(request)
 			# Rewind the request body (an IO object)
 			# in case someone else has already played
 			# through it.
 			request.body.rewind
 
 			begin
-				# Parse the POST data as a JSON hash
-				# (because that's what it is)
 				post_data = JSON.parse(request.body.read)
 			rescue JSON::ParserError => e
-				# If we have malformed JSON (JSON::ParserError is
-				# raised), escape out of the function.
 				raise RequestError.new(400, e.message)
 			end
 
-			raise RequestError.new(422, "Must pass a JSON object!", {post_data: post_data}) if post_data.is_an?(Array)
 			post_data
 		end
 
 		def self.create(request, params, post_data = nil)
-			post_data ||= process_json_object_request request
+			post_data ||= process_json_request request
 
-			@model = model.new
-			@model.attributes = post_data
+			if post_data.is_an? Array
+				results = post_data.map do |post_data_item|
+					begin
+						self.create(nil, nil, post_data_item)
+					rescue RequestError => e
+						e.return_value
+					end
+				end
+
+				status_code = 201
+
+				if(results.map do |result|
+					   result.is_an?(Array) ? result[0] : 422
+				   end.select do |status_code|
+					   status_code != 201
+				   end.count > 0)
+
+					status_code = 422
+				end
 
-			if @model.save
-				[201, @model.to_json]
+				[status_code, results.to_json]
 			else
-				raise RequestError.new(422, @model.errors.full_messages, {params: params, post_data: post_data})
+				@model = model.new
+				@model.attributes = post_data
+
+				if @model.save
+					[201, @model.to_json]
+				else
+					raise RequestError.new(422, @model.errors.full_messages, {params: params, post_data: post_data})
+				end
 			end
 		end
 
 		def self.update(request, params, post_data = nil)
 			raise RequestError.new(400, "Must supply a #{model_name.downcase} id!") unless params[:id]
 
-			post_data ||= process_json_object_request request
+			post_data ||= process_json_request request
 
 			@model = find_model params
 
@@ -127,6 +144,8 @@ module FReCon
 		end
 
 		def self.team_number_to_team_id(post_data)
+			return post_data unless post_data.is_a?(Hash)
+
 			if post_data["team_number"] && !post_data["team_id"]
 				unless (team = Team.number post_data["team_number"]).nil?
 					post_data["team_id"] = team.id
@@ -143,6 +162,8 @@ module FReCon
 		# This supports match_number and competition_name
 		# or match_number and competition (which is a Hash).
 		def self.match_number_and_competition_to_match_id(post_data)
+			return post_data unless post_data.is_a?(Hash)
+
 			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.
@@ -165,7 +186,7 @@ module FReCon
 					post_data.delete("competition_name")
 
 					post_data
-				elsif post_data["competition"] && post_data["competition"]["_id"] && post_data["competition"]["_id"]["$oid"] && (competition = Competition.find_by(id: post_data["competition"]["_id"]["$oid"]))
+				elsif post_data["competition"] && post_data["competition"]["_id"] && (competition = Competition.find_by(id: post_data["competition"]["_id"]))
 					# Try to set the match to the already existing match.
 					match = competition.matches.find_by number: post_data["match_number"]
 

data/lib/frecon/controllers/dump_controller.rb

@@ -15,11 +15,23 @@ module FReCon
 		def self.full(params)
 			dump = {}
 
-			Model.descendants.each do |child|
-				dump[child.name.gsub(/FReCon::/, "").downcase.pluralize] = child.all
+			ordered_descendants = Model.descendants.sort_by do |model|
+				id_fields = model.fields.keys.select do |attribute|
+					attribute.ends_with?("_id") && attribute != "_id"
+				end
+
+				[id_fields.count, dump_compliant_name(model)]
+			end
+
+			ordered_descendants.each do |child|
+				dump[dump_compliant_name(child)] = child.all
 			end
 
 			dump.to_json
 		end
+
+		def self.dump_compliant_name(model)
+			model.name.gsub(/FReCon::/, "").downcase.pluralize
+		end
 	end
 end

data/lib/frecon/controllers/participations_controller.rb

@@ -9,8 +9,8 @@
 
 module FReCon
 	class ParticipationsController < Controller
-		def self.create(request, params)
-			super(request, params, team_number_to_team_id(process_json_object_request(request)))
+		def self.create(request, params, post_data = nil)
+			super(request, params, post_data || team_number_to_team_id(process_json_request(request)))
 		end
 
 		def self.competition(params)

data/lib/frecon/controllers/records_controller.rb

@@ -13,8 +13,8 @@ require "frecon/models"
 
 module FReCon
 	class RecordsController < Controller
-		def self.create(request, params)
-			super(request, params, match_number_and_competition_to_match_id(team_number_to_team_id(process_json_object_request(request))))
+		def self.create(request, params, post_data = nil)
+			super(request, params, post_data || match_number_and_competition_to_match_id(team_number_to_team_id(process_json_request(request))))
 		end
 
 		def self.competition(params)

data/lib/frecon/controllers/robots_controller.rb

@@ -12,8 +12,8 @@ require "frecon/models/robot"
 
 module FReCon
 	class RobotsController < Controller
-		def self.create(request, params)
-			super(request, params, team_number_to_team_id(process_json_object_request(request)))
+		def self.create(request, params, post_data = nil)
+			super(request, params, post_data || team_number_to_team_id(process_json_request(request)))
 		end
 
 		def self.competition(params)

data/lib/frecon/match_number.rb

@@ -125,6 +125,9 @@ module FReCon
 				# round (Integer), optional
 				# replay_number (Integer), optional
 
+				# 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 ArgumentError, "type must be in #{POSSIBLE_TYPES.inspect}" unless POSSIBLE_TYPES.include?(args[:type].to_sym)
 

data/lib/frecon/model.rb

@@ -26,6 +26,10 @@ module FReCon
 			ObjectSpace.each_object(Class).select { |possibleChild| possibleChild < self }
 		end
 
+		def self.controller
+			(self.name.pluralize + "Controller").constantize
+		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|

data/lib/frecon/position.rb

@@ -31,6 +31,8 @@ module FReCon
 			when String
 				Position.new(object).mongoize
 			when Hash
+				# Convert keys to symbols if necessary.
+				object = Hash[object.map { |key, value| [key.to_sym, value] }]
 				Position.new(object[:alliance], object[:number]).mongoize
 			else
 				object
@@ -45,6 +47,8 @@ module FReCon
 			when String
 				Position.new(object).mongoize
 			when Hash
+				# Convert keys to symbols if necessary.
+				object = Hash[object.map { |key, value| [key.to_sym, value] }]
 				Position.new(object[:alliance], object[:number]).mongoize
 			else
 				object

data/lib/frecon/scraper.rb

@@ -0,0 +1,70 @@
+# lib/frecon/scraper.rb
+#
+# Copyright (C) 2014 Christopher Cooper, Sam Craig, Tiger Huang, Vincent Mai, Sam Mercier, and Kristofer Rye
+#
+# This file is part of FReCon, an API for scouting at FRC Competitions, which is
+# licensed under the MIT license.  You should have received a copy of the MIT
+# license with this program.  If not, please see
+# <http://opensource.org/licenses/MIT>.
+
+require "httparty"
+
+module FReCon
+	# The default scraper scrapes other FReCon instances.
+	# To scrape a different source, a descendant scraper should be used.
+	class Scraper
+		def initialize(base_uri)
+			@base_uri = base_uri
+		end
+
+		# Reads and imports a data string.
+		# Determines what to do with information in the `context` hash.
+		def read(data, context = {})
+			# `data` will be a string, so we need to convert it from JSON.
+			data = JSON.parse(data)
+
+			# Here we want `context` to tell us what model we are making.
+			if context[:model]
+				result = context[:model].controller.create(nil, nil, data)
+				result.first == 201 ? result.first : JSON.parse(result.last)
+			else
+				# Therefore, we must be dealing with a dump.
+				statuses = data.map do |key, value|
+					begin
+						unless value.empty?
+							model = ("FReCon::" + key.singularize.capitalize).constantize
+							result = model.controller.create(nil, nil, value)
+							result.first == 201 ? result.first : JSON.parse(result.last)
+						end
+					rescue Moped::Errors::OperationFailure => e
+						RequestError.new(422, "A model already exists in your database with the key you are trying to import.\nPerhaps you should clear your database?").return_value
+					end
+				end
+				statuses.delete(nil)
+				statuses
+			end
+		end
+
+		# If no arguments are passed, will import the whole other database.
+		# If only one argument is passed, will import all of that model.
+		# 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)
+
+			# The route name for the model branch.
+			route_name = model.name.gsub(/FReCon::/, "").downcase.pluralize if model
+			
+			if !model && query.empty?
+				data = HTTParty.get("http://#{@base_uri}:4567/dump")
+			elsif model && query.empty?
+				data = HTTParty.get("http://#{@base_uri}:4567/#{route_name}")
+			else
+				data = HTTParty.get("http://#{@base_uri}:4567/#{route_name}", { query: query })
+			end
+
+			read data.body, model: model
+		end
+	end
+end

data/lib/frecon/scrapers.rb

@@ -0,0 +1,10 @@
+# lib/frecon/scrapers.rb
+#
+# Copyright (C) 2014 Christopher Cooper, Sam Craig, Tiger Huang, Vincent Mai, Sam Mercier, and Kristofer Rye
+#
+# This file is part of FReCon, an API for scouting at FRC Competitions, which is
+# licensed under the MIT license.  You should have received a copy of the MIT
+# license with this program.  If not, please see
+# <http://opensource.org/licenses/MIT>.
+
+require "frecon/scraper"

data/lib/frecon/server.rb

@@ -22,6 +22,7 @@ module FReCon
 		end
 
 		def self.run!
+			set :environment, FReCon.environment
 			Database.setup(FReCon.environment)
 
 			super

data/lib/frecon.rb

@@ -7,8 +7,12 @@
 # license with this program.  If not, please see
 # <http://opensource.org/licenses/MIT>.
 
+require "mongoid"
+
 require "frecon/base"
 
 require "frecon/database"
 require "frecon/server"
 require "frecon/console"
+
+require "frecon/scrapers"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frecon
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Craig
@@ -57,6 +57,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 description: A JSON API for scouting FRC competitions that manages the database for
   the user.
 email: frc-frecon@googlegroups.com
@@ -68,6 +82,7 @@ files:
 - bin/frecon
 - lib/frecon.rb
 - lib/frecon/base.rb
+- lib/frecon/base/bson.rb
 - lib/frecon/base/object.rb
 - lib/frecon/base/variables.rb
 - lib/frecon/console.rb
@@ -94,6 +109,8 @@ files:
 - lib/frecon/position.rb
 - lib/frecon/request_error.rb
 - lib/frecon/routes.rb
+- lib/frecon/scraper.rb
+- lib/frecon/scrapers.rb
 - lib/frecon/server.rb
 homepage: https://github.com/frc-frecon/frecon
 licenses: