diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77d808bc8e09b62b8f20740ab4289c4f6b9f7aa5..f32722cb3d3b8de63a745dbd4d87275492c09ff8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,4 +3,4 @@ test: - gem install bundler - bundle install - bundle exec rake db:migrate RAILS_ENV=test - - bundle exec rake test + - bundle exec rake test \ No newline at end of file diff --git a/config/initializers/orientdb.rb b/config/initializers/orientdb.rb deleted file mode 100644 index 7af491bfb61bcd78d9e5e7ea267fd3857545a148..0000000000000000000000000000000000000000 --- a/config/initializers/orientdb.rb +++ /dev/null @@ -1,17 +0,0 @@ -require 'yaml' - -orientdb_configs = YAML.load_file Rails.root.join('config').to_s.concat('/orientdb.yml') -env_config = orientdb_configs.fetch(Rails.env) - -if Rails.env.production? - OrientDb::Config.host = ENV['PORTALMEC_ORIENTDB_HOST'] - OrientDb::Config.database = ENV['PORTALMEC_ORIENTDB_DATABASE'] - OrientDb::Config.user = ENV['PORTALMEC_ORIENTDB_USERNAME'] - OrientDb::Config.password = ENV['PORTALMEC_ORIENTDB_PASSWD'] - OrientDb::Config.port = ENV['PORTALMEC_ORIENTDB_PORT'] -else - OrientDb::Config.host = env_config['host'] - OrientDb::Config.database = env_config['database'] - OrientDb::Config.user = env_config['username'] - OrientDb::Config.password = env_config['password'] -end \ No newline at end of file diff --git a/config/initializers/dspace.rb b/config/initializers/repositories/dspace.rb similarity index 100% rename from config/initializers/dspace.rb rename to config/initializers/repositories/dspace.rb diff --git a/config/initializers/repositories.rb b/config/initializers/repositories/repositories.rb similarity index 81% rename from config/initializers/repositories.rb rename to config/initializers/repositories/repositories.rb index 93eb8e20613f14343a8f95789e08a0d8957385da..b96fc8f2fd822cdff1068f216358788dd524ff40 100644 --- a/config/initializers/repositories.rb +++ b/config/initializers/repositories/repositories.rb @@ -1,3 +1,14 @@ +require 'yaml' + +# connect to orientdb server +orientdb_configs = YAML.load_file Rails.root.join('config').to_s.concat('/orientdb.yml') +env_config = orientdb_configs.fetch(Rails.env) + +OrientDb::Config.host = env_config['host'] +OrientDb::Config.database = env_config['database'] +OrientDb::Config.user = env_config['username'] +OrientDb::Config.password = env_config['password'] + Repository::Environments.create :development do |repository| repository.register :learning_object, OrientDb::LearningObjectRepository.new(OrientDb::Client.instance) repository.register :mainPage, OrientDb::MainPageRepository.new(OrientDb::Client.instance) diff --git a/config/orientdb.yml b/config/orientdb.yml index 063f7ca51b38f1d455e25bc19bec3f0de1846cbe..88e5d0367003e3f9b48b614ec04f7c910eb54769 100644 --- a/config/orientdb.yml +++ b/config/orientdb.yml @@ -1,6 +1,6 @@ development: &development - host: mecdb2.c3sl.ufpr.br - database: PortalMEC + host: localhost + database: portalmec username: admin password: admin port: 2480 diff --git a/lib/orient_db/client.rb b/lib/orient_db/client.rb index a7089e51c3f6ca8618dc3347fd55b3aaa7eb3882..d7a58bf6121cbfb6e2c9ceca95dd78000ba4d9ec 100644 --- a/lib/orient_db/client.rb +++ b/lib/orient_db/client.rb @@ -9,6 +9,7 @@ class OrientDb::Client begin @@client = Orientdb4r.client :host => OrientDb::Config::host, :port => OrientDb::Config::port, :ssl => OrientDb::Config::ssl @@client.connect(database: OrientDb::Config::database, user: OrientDb::Config::user, password: OrientDb::Config::password) + @@client rescue Orientdb4r::UnauthorizedError => e raise 'Wrong orient db credentials' end diff --git a/lib/orient_db/migrations.rb b/lib/orient_db/migrations.rb index 56c64695142079769789e1de9ee2978e08af8c9d..4efced72171aeaeb511e8d02fc93c2ce14e79b5a 100644 --- a/lib/orient_db/migrations.rb +++ b/lib/orient_db/migrations.rb @@ -9,6 +9,7 @@ class OrientDb::Migrations @migrations << CreateHighlight.new(client) @migrations << CreateUniversity.new(client) @migrations << CreateUser.new(client) + @migrations << CreateMainpage.new(client) end ##