From 817f627fa42df9acb2d0897d4127f829e4d35d5e Mon Sep 17 00:00:00 2001 From: amartynov Date: Tue, 30 Jun 2015 16:06:48 +0300 Subject: [PATCH] project_template connector --- .../db/mongo/connectors/project_template.rb | 15 +++++++++++++++ devops-service/db/mongo/mongo_connector.rb | 7 +++++++ devops-service/db/mongo/mongo_user.rb | 18 ------------------ 3 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 devops-service/db/mongo/connectors/project_template.rb delete mode 100644 devops-service/db/mongo/mongo_user.rb diff --git a/devops-service/db/mongo/connectors/project_template.rb b/devops-service/db/mongo/connectors/project_template.rb new file mode 100644 index 0000000..e461edd --- /dev/null +++ b/devops-service/db/mongo/connectors/project_template.rb @@ -0,0 +1,15 @@ +module Connectors + class ProjectTemplates < Base + include Helpers::InsertCommand, + Helpers::ShowCommand, + Helpers::ListCommand, + Helpers::DeleteCommand, + Helpers::UpdateCommand + + + def initialize(db) + @collection = db.collection('project_templates') + end + end +end + diff --git a/devops-service/db/mongo/mongo_connector.rb b/devops-service/db/mongo/mongo_connector.rb index 781223b..c095c23 100644 --- a/devops-service/db/mongo/mongo_connector.rb +++ b/devops-service/db/mongo/mongo_connector.rb @@ -18,6 +18,9 @@ class MongoConnector [:project, :projects_all, :projects, :project_names_with_envs, :projects_by_image, :projects_by_user, :project_insert, :project_update, :project_delete, :is_project_exists?, :check_project_auth] => :projects_connector, + [:project_templates, :projects_all, :projects, :project_names_with_envs, + :projects_by_image, :projects_by_user, :project_insert, :project_update, + :project_delete, :is_project_exists?, :check_project_auth] => :projects_templates_connector, [:servers_find, :servers, :servers_by_names, :server_by_instance_id, :server_by_chef_node_name, :servers_by_key, :server_insert, :server_delete, :server_update, :server_set_chef_node_name] => :servers_connector, @@ -55,6 +58,10 @@ class MongoConnector @projects_connector ||= Connectors::Project.new(@db) end + def projects_templates_connector + @projects__templates_connector ||= Connectors::ProjectTemplates.new(@db) + end + def servers_connector @servers_connector ||= Connectors::Server.new(@db) end diff --git a/devops-service/db/mongo/mongo_user.rb b/devops-service/db/mongo/mongo_user.rb deleted file mode 100644 index e42cd72..0000000 --- a/devops-service/db/mongo/mongo_user.rb +++ /dev/null @@ -1,18 +0,0 @@ -require "mongo" -require "db/exceptions/record_not_found" - -class MongoUser - - def initialize(db, host, port=27017) - @mongo_client = MongoClient.new(host, port) - @db = @mongo_client.db(db) - @users = @db.collection("users") - end - - def user username, password - u = @users.find("_id" => username, "password" => password).to_a[0] - raise RecordNotFound.new("User '#{username}' does not exist") if u.nil? - u - end - -end