diff --git a/Gemfile b/Gemfile
index 37e070584e47dd9f39a88014f8928e76cc949338..7a7f64807ef4bf2ae8c2b80efd1726a3e3d43aa2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,6 +100,11 @@ group :development, :test do
gem 'spring'
gem 'sqlite3'
+
+ #JavaScript runtime
+ gem 'execjs'
+ gem 'therubyracer'
+
end
group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000000000000000000000000000000000000..5581e23b9f1dd5365b99fcc3dfda6bf81f5982e1
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,349 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ abstract_type (0.0.7)
+ actionmailer (4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
+ mail (~> 2.5, >= 2.5.4)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.0)
+ actionview (= 4.2.0)
+ activesupport (= 4.2.0)
+ rack (~> 1.6.0)
+ rack-test (~> 0.6.2)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ actionview (4.2.0)
+ activesupport (= 4.2.0)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ activejob (4.2.0)
+ activesupport (= 4.2.0)
+ globalid (>= 0.3.0)
+ activemodel (4.2.0)
+ activesupport (= 4.2.0)
+ builder (~> 3.1)
+ activerecord (4.2.0)
+ activemodel (= 4.2.0)
+ activesupport (= 4.2.0)
+ arel (~> 6.0)
+ activesupport (4.2.0)
+ i18n (~> 0.7)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
+ tzinfo (~> 1.1)
+ adamantium (0.2.0)
+ ice_nine (~> 0.11.0)
+ memoizable (~> 0.4.0)
+ arel (6.0.3)
+ ast (2.1.0)
+ autoprefixer-rails (6.0.2)
+ execjs
+ json
+ axiom-types (0.1.1)
+ descendants_tracker (~> 0.0.4)
+ ice_nine (~> 0.11.0)
+ thread_safe (~> 0.3, >= 0.3.1)
+ bcrypt (3.1.10)
+ better_errors (2.1.1)
+ coderay (>= 1.0.0)
+ erubis (>= 2.6.6)
+ rack (>= 0.9.0)
+ binding_of_caller (0.7.2)
+ debug_inspector (>= 0.0.1)
+ bootstrap-sass (3.3.5.1)
+ autoprefixer-rails (>= 5.0.0.1)
+ sass (>= 3.3.0)
+ builder (3.2.2)
+ bullet (4.14.7)
+ activesupport (>= 3.0.0)
+ uniform_notifier (~> 1.9.0)
+ byebug (6.0.2)
+ chart-js-rails (0.0.9)
+ railties (> 3.1)
+ chronic (0.10.2)
+ climate_control (0.0.3)
+ activesupport (>= 3.0)
+ cocaine (0.5.7)
+ climate_control (>= 0.0.3, < 1.0)
+ coderay (1.1.0)
+ coercible (1.0.0)
+ descendants_tracker (~> 0.0.1)
+ coffee-rails (4.1.0)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.0)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.9.1.1)
+ concord (0.1.5)
+ adamantium (~> 0.2.0)
+ equalizer (~> 0.0.9)
+ curb (0.8.8)
+ debug_inspector (0.0.2)
+ descendants_tracker (0.0.4)
+ thread_safe (~> 0.3, >= 0.3.1)
+ devise (3.5.1)
+ bcrypt (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (>= 3.2.6, < 5)
+ responders
+ thread_safe (~> 0.1)
+ warden (~> 1.2.3)
+ devise_token_auth (0.1.34)
+ devise (= 3.5.1)
+ rails (~> 4.2)
+ diff-lcs (1.2.5)
+ domain_name (0.5.24)
+ unf (>= 0.0.5, < 1.0.0)
+ dspace_rest_client (1.1.2)
+ curb (~> 0.8.6)
+ rest-client (>= 1.7, < 2)
+ equalizer (0.0.11)
+ erubis (2.7.0)
+ execjs (2.6.0)
+ fast_stack (0.1.0)
+ rake
+ rake-compiler
+ flamegraph (0.1.0)
+ fast_stack
+ flay (2.4.0)
+ ruby_parser (~> 3.0)
+ sexp_processor (~> 4.0)
+ flog (4.2.1)
+ ruby_parser (~> 3.1, > 3.1.0)
+ sexp_processor (~> 4.4)
+ globalid (0.3.6)
+ activesupport (>= 4.1.0)
+ gruff (0.6.0)
+ rmagick (>= 2.13.4)
+ http-cookie (1.0.2)
+ domain_name (~> 0.5)
+ i18n (0.7.0)
+ ice_nine (0.11.1)
+ jbuilder (2.3.1)
+ activesupport (>= 3.0.0, < 5)
+ multi_json (~> 1.2)
+ jquery-rails (4.0.5)
+ rails-dom-testing (~> 1.0)
+ railties (>= 4.2.0)
+ thor (>= 0.14, < 2.0)
+ jquery-turbolinks (2.1.0)
+ railties (>= 3.1.0)
+ turbolinks
+ json (1.8.3)
+ libv8 (3.16.14.7)
+ locastyle (0.0.1)
+ loofah (2.0.3)
+ nokogiri (>= 1.5.9)
+ mail (2.6.3)
+ mime-types (>= 1.16, < 3)
+ memoizable (0.4.2)
+ thread_safe (~> 0.3, >= 0.3.1)
+ mime-types (2.6.2)
+ mimemagic (0.3.0)
+ mina (0.3.7)
+ open4 (~> 1.3.4)
+ rake
+ mini_portile (0.6.2)
+ minitest (5.8.0)
+ multi_json (1.11.2)
+ netrc (0.10.3)
+ nokogiri (1.6.6.2)
+ mini_portile (~> 0.6.0)
+ open4 (1.3.4)
+ orientdb4r (0.5.1)
+ rest-client (~> 1.7)
+ orm_adapter (0.5.0)
+ paperclip (4.3.1)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
+ cocaine (~> 0.5.5)
+ mime-types
+ mimemagic (= 0.3.0)
+ parser (2.2.2.6)
+ ast (>= 1.1, < 3.0)
+ pg (0.18.3)
+ procto (0.0.2)
+ puma (2.13.4)
+ rack (1.6.4)
+ rack-cors (0.4.0)
+ rack-mini-profiler (0.9.7)
+ rack (>= 1.1.3)
+ rack-test (0.6.3)
+ rack (>= 1.0)
+ rails (4.2.0)
+ actionmailer (= 4.2.0)
+ actionpack (= 4.2.0)
+ actionview (= 4.2.0)
+ activejob (= 4.2.0)
+ activemodel (= 4.2.0)
+ activerecord (= 4.2.0)
+ activesupport (= 4.2.0)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.2.0)
+ sprockets-rails
+ rails-deprecated_sanitizer (1.0.3)
+ activesupport (>= 4.2.0.alpha)
+ rails-dom-testing (1.0.7)
+ activesupport (>= 4.2.0.beta, < 5.0)
+ nokogiri (~> 1.6.0)
+ rails-deprecated_sanitizer (>= 1.0.1)
+ rails-html-sanitizer (1.0.2)
+ loofah (~> 2.0)
+ railties (4.2.0)
+ actionpack (= 4.2.0)
+ activesupport (= 4.2.0)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rainbow (2.0.0)
+ rake (10.4.2)
+ rake-compiler (0.9.5)
+ rake
+ rdoc (4.2.0)
+ reek (1.6.5)
+ parser (~> 2.2.0.pre.7)
+ rainbow (>= 1.99, < 3.0)
+ unparser (~> 0.2.2)
+ ref (1.0.5)
+ responders (2.1.0)
+ railties (>= 4.2.0, < 5)
+ rest-client (1.8.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 3.0)
+ netrc (~> 0.7)
+ rmagick (2.15.4)
+ rsolr (1.0.12)
+ builder (>= 2.1.2)
+ ruby_parser (3.7.1)
+ sexp_processor (~> 4.1)
+ rubycritic (1.4.0)
+ flay (= 2.4.0)
+ flog (= 4.2.1)
+ parser (>= 2.2.0, < 3.0)
+ reek (= 1.6.5)
+ virtus (~> 1.0)
+ sass (3.4.18)
+ sass-rails (5.0.4)
+ railties (>= 4.0.0, < 5.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ sdoc (0.4.1)
+ json (~> 1.7, >= 1.7.7)
+ rdoc (~> 4.0)
+ select2-rails (4.0.0)
+ thor (~> 0.14)
+ sexp_processor (4.6.0)
+ shoulda (3.5.0)
+ shoulda-context (~> 1.0, >= 1.0.1)
+ shoulda-matchers (>= 1.4.1, < 3.0)
+ shoulda-callback-matchers (1.1.3)
+ activesupport (>= 3)
+ shoulda-context (1.2.1)
+ shoulda-matchers (2.8.0)
+ activesupport (>= 3.0.0)
+ spring (1.4.0)
+ sprockets (3.3.4)
+ rack (~> 1.0)
+ sprockets-rails (2.3.3)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (>= 2.8, < 4.0)
+ sqlite3 (1.3.10)
+ therubyracer (0.12.2)
+ libv8 (~> 3.16.14.0)
+ ref
+ thor (0.19.1)
+ thread_safe (0.3.5)
+ tilt (2.0.1)
+ turbolinks (2.5.3)
+ coffee-rails
+ tzinfo (1.2.2)
+ thread_safe (~> 0.1)
+ uglifier (2.7.2)
+ execjs (>= 0.3.0)
+ json (>= 1.8.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.1)
+ uniform_notifier (1.9.0)
+ unparser (0.2.4)
+ abstract_type (~> 0.0.7)
+ adamantium (~> 0.2.0)
+ concord (~> 0.1.5)
+ diff-lcs (~> 1.2.5)
+ equalizer (~> 0.0.9)
+ parser (~> 2.2.2)
+ procto (~> 0.0.2)
+ virtus (1.0.5)
+ axiom-types (~> 0.1)
+ coercible (~> 1.0)
+ descendants_tracker (~> 0.0, >= 0.0.3)
+ equalizer (~> 0.0, >= 0.0.9)
+ warden (1.2.3)
+ rack (>= 1.0)
+ web-console (2.2.1)
+ activemodel (>= 4.0)
+ binding_of_caller (>= 0.7.2)
+ railties (>= 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ whenever (0.9.4)
+ chronic (>= 0.6.3)
+ will_paginate (3.0.7)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ bcrypt (~> 3.1.7)
+ better_errors
+ bootstrap-sass
+ bullet
+ byebug
+ chart-js-rails
+ coffee-rails (~> 4.1.0)
+ devise
+ devise_token_auth
+ dspace_rest_client (~> 1.1.0)
+ execjs
+ flamegraph
+ gruff
+ jbuilder (~> 2.0)
+ jquery-rails
+ jquery-turbolinks
+ locastyle
+ mina
+ orientdb4r
+ paperclip
+ pg
+ puma
+ rack-cors
+ rack-mini-profiler
+ rails (= 4.2.0)
+ rdoc
+ rmagick
+ rsolr (~> 1.0.12)
+ rubycritic
+ sass-rails (~> 5.0)
+ sdoc (~> 0.4.0)
+ select2-rails
+ shoulda
+ shoulda-callback-matchers (~> 1.1.1)
+ spring
+ sqlite3
+ therubyracer
+ turbolinks
+ uglifier (>= 1.3.0)
+ web-console (~> 2.0)
+ whenever
+ will_paginate (~> 3.0.5)
+
+BUNDLED WITH
+ 1.10.6
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 6edf2387280c0305d5a85cd77af40cb30647e494..0579097790de7c0b49400ad9676537504614a638 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -4,7 +4,7 @@ class CollectionsController < ApplicationController
# GET /collections
# GET /collections.json
def index
- @collections = collection_repository.all
+ @collections = collection_repository.find_all
end
# GET /collections/1
@@ -56,7 +56,7 @@ class CollectionsController < ApplicationController
private
def set_collection
- @collection = collection_repository.find params[:id]
+ @collection = collection_repository.find_by_id params[:id]
end
def collection_repository
diff --git a/app/controllers/institutions_controller.rb b/app/controllers/institutions_controller.rb
index 96c21aa17d468af0acb632a45c2cbc9eb9de3bfc..0eb2ca291f822c645e854198ba8bfc22330a4d07 100644
--- a/app/controllers/institutions_controller.rb
+++ b/app/controllers/institutions_controller.rb
@@ -4,7 +4,7 @@ class InstitutionsController < ApplicationController
# GET /institutions
# GET /institutions.json
def index
- @institutions = institution_repository.all
+ @institutions = institution_repository.find_all
end
# GET /institutions/1
@@ -62,7 +62,7 @@ class InstitutionsController < ApplicationController
private
def set_institution
- @institution = institution_repository.find("##{params[:id]}")
+ @institution = institution_repository.find_by_id("##{params[:id]}")
end
def institution_repository
diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb
index 3ded253c23cd10465b3624db636413ac3bf7b848..c61bdb7186eec207c7a93fa77e28c051bf627df5 100644
--- a/app/controllers/learning_objects_controller.rb
+++ b/app/controllers/learning_objects_controller.rb
@@ -6,7 +6,7 @@ class LearningObjectsController < ApplicationController
# GET /learning_objects
# GET /learning_objects.json
def index
- @learning_objects = learning_object_repository.all
+ @learning_objects = learning_object_repository.find_all
end
# GET /learning_objects/1
@@ -73,7 +73,7 @@ class LearningObjectsController < ApplicationController
# Use callbacks to share common setup or constraints between actions.
def set_learning_object
- @learning_object = learning_object_repository.find params[:id]
+ @learning_object = learning_object_repository.find_by_id params[:id]
end
# Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb
index 4c6de9d93bc5e37daaf181fa63076625b43d02ae..59cb720fc36173eda9ba0768332ff15b055cc60d 100644
--- a/app/controllers/management/users_controller.rb
+++ b/app/controllers/management/users_controller.rb
@@ -3,7 +3,7 @@ class Management::UsersController < ManagementController
before_action :set_roles, only: [:new, :edit]
def index
- @users = user_repository.all
+ @users = user_repository.find_all
end
# GET /users/1
@@ -61,7 +61,7 @@ class Management::UsersController < ManagementController
# Use callbacks to share common setup or constraints between actions.
def set_user
- @user = user_repository.find params[:id]
+ @user = user_repository.find_by_id params[:id]
end
# Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index c3353d960229b8a8882d717ab44145b7996c6ea7..459c4f54a1d0b7fa82b9c72c612d96a69de2af38 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -10,17 +10,17 @@ class WelcomeController < ApplicationController
end
@General = mainPage["highlights"].collect do |id|
- repository.for(:learning_object).find(id)
+ repository.for(:learning_object).find_by_id(id)
end
@Subjects = repository.for(:subject).find_all.take(8)
@Subjects.delete_if do |subject|
- if subject['highlights'].nil? || subject['highlights'].empty?
+ if subject.highlights.nil? || subject.highlights.empty?
true
end
end
@Subjects.each do |subject|
- object = repository.for(:learning_object).find(subject['highlights'].first)
+ object = repository.for(:learning_object).find_by_id(subject.highlights.first)
subject['first_highlight'] = object
end
diff --git a/app/models/attribute.rb b/app/models/attribute.rb
new file mode 100644
index 0000000000000000000000000000000000000000..af0710be3bf389b3fec994e82629afaccbc4e199
--- /dev/null
+++ b/app/models/attribute.rb
@@ -0,0 +1,6 @@
+class Attribute
+ include ActiveModel::Model
+
+ attr_accessor :id, :key, :value
+
+end
\ No newline at end of file
diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index ea388a9a040c6343d088c54d39b2527623b59c50..a81ad0253324282f7cf6adc5396c8763e399616c 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -2,7 +2,8 @@ class LearningObject
include ActiveModel::Model
attr_accessor :id, :id_dspace, :rid, :name, :description,
:thumbnail, :date_creation, :last_modified,
- :type, :bitstreams, :metadata, :likes, :views, :downloads
+ :type, :bitstreams, :metadata, :likes, :views,
+ :downloads, :subjects, :attributes
validates_presence_of :name, :date_creation, :type, :likes, :views, :downloads
validates_numericality_of :likes, greater_than_or_equal_to: 0
@@ -17,17 +18,26 @@ class LearningObject
@subjects ||= learning_object_repository.get_subjects(self)
end
+ def attributes
+ @attributes ||= learning_object_repository.get_attributes(self)
+ end
+
def categories
get_metadata_value_of 'dc.subject.category'
end
def get_metadata_value_of key
- values = @metadata.select { |v| v["key"] == key }
- unless values.empty?
- return values.first["value"]
- end
+ get_metadata_values_of(key).first
end
+ def get_metadata_values_of key
+ values = []
+ @metadata.each do |m|
+ values << m["value"] if m["key"] == key
+ end
+ values
+ end
+
private
def defaults
diff --git a/app/models/subject.rb b/app/models/subject.rb
index 58e25fa4d60b98f24147ccee7839f0dee1e01bc7..a76b5da86bb24b66ca55e7cb654bd8e0a38dacb8 100644
--- a/app/models/subject.rb
+++ b/app/models/subject.rb
@@ -1,5 +1,15 @@
class Subject
include ActiveModel::Model
- attr_accessor :id, :dateCreation, :description, :highlights, :name
+ attr_accessor :id, :date_creation, :description, :highlights, :name,
+ :learning_objects
+
+ def learning_objects
+ @learning_objects ||= subject_repository.get_learning_objects(self)
+ end
+
+ def subject_repository
+ Portalmec::Application.repository.for :subject
+ end
+
end
\ No newline at end of file
diff --git a/app/repositories/orient_db/attribute_repository.rb b/app/repositories/orient_db/attribute_repository.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4c5373180e4f1aac39f80384dd3c8f78288ff5ba
--- /dev/null
+++ b/app/repositories/orient_db/attribute_repository.rb
@@ -0,0 +1,30 @@
+module OrientDb
+ class AttributeRepository < Base
+
+ def find_by_key_and_value(key, value)
+ result = connection.query sprintf("SELECT FROM %s WHERE key = '%s' AND value = '%s'", odb_class, key, value)
+ build_objects(result)
+ end
+
+ def build_object(args={})
+ subject = nil
+ unless args.nil?
+ subject = Attribute.new(:id => args["@rid"])
+ args.each do |var, val|
+ var_name = "@"+var
+ if subject.respond_to?(var)
+ subject.instance_variable_set(var_name, val)
+ end
+ end
+ end
+ subject
+ end
+
+ private
+
+ def odb_class
+ "Attribute"
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/app/repositories/orient_db/base.rb b/app/repositories/orient_db/base.rb
index 53599f9125b196ed8d4d04a645719a3419ad04c8..349ff82fd3f7c1c418682e5bb6b620d7280fc57e 100644
--- a/app/repositories/orient_db/base.rb
+++ b/app/repositories/orient_db/base.rb
@@ -1,12 +1,67 @@
class OrientDb::Base
+ include OrientDb::Methods::GenericMethods
def initialize(orientdb_connection)
@connection = orientdb_connection
end
-
def connection
@connection
end
+ def find_by_id(id)
+ result = get_by_rid(id)
+ build_object result
+ end
+
+ # Example:
+ # list = repository.for(:learning_objects).find_all
+ # list.each do |learning_object|
+ # learning_object.inspect <LearningObject model>
+ # end
+ def find_all
+ objects_hash = connection.query "SELECT FROM #{odb_class}", :limit => -1
+ objects = build_objects(objects_hash) || []
+ end
+
+ def find_all_from_offset_to_limit(offset,limit)
+ objects_hash = connection.query "SELECT FROM #{odb_class} SKIP #{offset}", :limit => limit
+ objects = build_objects(objects_hash) || []
+ end
+
+ def create(object)
+ hash = build_hash(object)
+ result = connection.create_document(hash)
+ object.id = result["@rid"]
+ object
+ end
+
+ def build_objects(hash=[])
+ objects = []
+ hash.each do |h|
+ objects << build_object(h)
+ end
+ objects
+ end
+
+ def build_hash(object)
+ hash = {}
+ hash["@class"] = odb_class
+ object.instance_variables.each do |var|
+ var_name = var.to_s.gsub(/\A@/,"")
+ hash[var_name] = object.instance_variable_get(var)
+ end
+ hash
+ end
+
+ def build_object(args={})
+ raise NoMethodError, "You must implement this method"
+ end
+
+ private
+
+ def odb_class
+ raise NoMethodError, "You must implement this method"
+ end
+
end
diff --git a/app/repositories/orient_db/carousel_repository.rb b/app/repositories/orient_db/carousel_repository.rb
index a8a2d8c0a0c529dba2d7a43e4d02a0adfe9f5dd5..cf39aa0748c95cf833c983d7cb2b01cc5730e4c7 100644
--- a/app/repositories/orient_db/carousel_repository.rb
+++ b/app/repositories/orient_db/carousel_repository.rb
@@ -20,5 +20,11 @@ module OrientDb
return nil
end
+ private
+
+ def odb_class
+ "Carousel"
+ end
+
end
end
diff --git a/app/repositories/orient_db/collection_repository.rb b/app/repositories/orient_db/collection_repository.rb
index a597b2ca3db07e288434284982510cccedbef7a6..80e6b177add29920a2b038400e8267d5baee9449 100644
--- a/app/repositories/orient_db/collection_repository.rb
+++ b/app/repositories/orient_db/collection_repository.rb
@@ -2,18 +2,6 @@ module OrientDb
class CollectionRepository < Base
include OrientDb::Methods::EdgeMethods
- def all
- hash = connection.query "SELECT FROM Collection"
- collections = build_collections(hash)
- end
-
- # Usage:
- # collection = repository.for(:collections).find '#14:14'
- def find(id)
- result = connection.query "SELECT FROM #{id}"
- build_collection result.first
- end
-
# Usage:
# repository.for(:collections).destroy collection
#
@@ -21,22 +9,17 @@ module OrientDb
connection.command sprintf("DELETE VERTEX %s", collection.id)
end
- private
-
- def build_collection(args={})
+ def build_object(args={})
Collection.new(
:id => args["@rid"],
:name => args["name"]
)
end
- def build_collections(hash=[])
- collections = []
- hash.each do |h|
- collections << build_collection(h)
- end
+ private
- collections
+ def odb_class
+ "Collection"
end
end
diff --git a/app/repositories/orient_db/institution_repository.rb b/app/repositories/orient_db/institution_repository.rb
index 6bc0e470f058a2ff7d0dce33ec002053c7472200..028e13b96f04e1747c3e2825ad6e2638be70bb41 100644
--- a/app/repositories/orient_db/institution_repository.rb
+++ b/app/repositories/orient_db/institution_repository.rb
@@ -2,24 +2,6 @@ module OrientDb
class InstitutionRepository < Base
include OrientDb::Methods::EdgeMethods
- # Example:
- # list = repository.for(:institutions).all
- # list.each do |institution|
- # institution_object.inspect <LearningObject model>
- # end
- def all
- hash = connection.query "SELECT FROM Institution"
- institutions = build_institutions(hash)
- end
-
- # Usage:
- # institution = repository.for(:institutions).get_by_dspace_id 123
- #
- def find(id)
- result = connection.query "SELECT FROM #{id}"
- build_institution result.first
- end
-
def create(name, url)
connection.command sprintf("INSERT INTO Institution (name) VALUES ('%s')", name)
end
@@ -31,21 +13,17 @@ module OrientDb
connection.command sprintf("DELETE VERTEX %s", institution.id)
end
- private
-
- def build_institution(args={})
+ def build_object(args={})
return Institution.new(
:id => args["@rid"],
:title => args["title"],
)
end
- def build_institutions(hash=[])
- institutions = []
- hash.each do |h|
- institutions << build_institution(h)
- end
- return institutions
+ private
+
+ def odb_class
+ "Institution"
end
end
diff --git a/app/repositories/orient_db/learning_object_repository.rb b/app/repositories/orient_db/learning_object_repository.rb
index b15496835163b9045c69a23ef74d9d8c324583f1..689a95815eeeccde16e5b7c97ae8e90b42252f14 100644
--- a/app/repositories/orient_db/learning_object_repository.rb
+++ b/app/repositories/orient_db/learning_object_repository.rb
@@ -14,41 +14,35 @@ module OrientDb
create_edge "Likes", user.rid, learning_object.id
end
- # Example:
- # list = repository.for(:learning_objects).all
- # list.each do |learning_object|
- # learning_object.inspect <LearningObject model>
- # end
- def all
- learning_objects_hash = connection.query "SELECT FROM LearningObject"
- build_learning_objects(learning_objects_hash) || []
- end
-
# Usage:
# learning_object = repository.for(:learning_objects).get_by_dspace_id 123
#
def get_by_dspace_id(id_dspace)
- result = connection.query "SELECT FROM LearningObject WHERE id_dspace=#{id_dspace}"
- build_learning_object result.first
+ result = select_by_property(odb_class, "id_dspace", id_dspace)
+ build_object result.first
end
- # Usage:
- # learning_object = repository.for(:learning_objects).get_by_dspace_id 123
- #
- def find(id)
- result = connection.query "SELECT FROM #{id}"
- build_learning_object result.first
+ def get_subjects(learning_object)
+ result = get_edges_end("IsAbout","out",learning_object.id)
+ Portalmec::Application.repository.for(:subject).build_objects(result)
end
- def create(name, url)
- connection.command sprintf("INSERT INTO LearningObject (name,URL) VALUES ('%s','%s')", name, url)
+ def get_attributes(learning_object)
+ result = get_edges_end("HasAttr","out",learning_object.id)
+ Portalmec::Application.repository.for(:attribute).build_objects(result)
+ end
+
+ def create_relations(learning_object)
+ edges = create_edges_from_array("IsAbout",learning_object.id,learning_object.subjects, true)
+ edges << create_edges_from_array("HasAttr",learning_object.id,learning_object.attributes, true)
+ edges.flatten
end
# Usage:
# repository.for(:learning_objects).destroy learning_object
#
def destroy(learning_object)
- connection.command sprintf("DELETE VERTEX LearningObject where @rid = '%s'", learning_object.id)
+ connection.command sprintf("DELETE VERTEX #{odb_class} where @rid = '%s'", learning_object.id)
end
##
@@ -66,18 +60,10 @@ module OrientDb
learning_objects = build_learning_objects(learning_objects_hash) || []
end
- private
-
- def count_likes(learning_object)
- get_in_edges_count "Likes", learning_object.id
- end
-
- def count_views(learning_object)
- get_in_edges_count "Views", learning_object.id
- end
-
- def build_learning_object(args={})
- lo = LearningObject.new(:id => args["@rid"],
+ def build_object(args={})
+ lo = nil
+ unless args.nil?
+ lo = LearningObject.new(:id => args["@rid"],
:name => args["name"],
:description => args["description"],
:thumbnail => args["thumbnail"],
@@ -87,28 +73,44 @@ module OrientDb
:bitstreams => args["bitstreams"],
:metadata => args["metadata"],
:last_modified => args["last_modified"])
-
- unless args["in_Likes"].nil?
- lo.likes = args["in_Likes"].count
- else
- lo.likes = 0
+ lo.likes = args.has_key?("in_Likes") ? args["in_Likes"].size : 0
+ lo.views = args.has_key?("in_Views") ? args["in_Views"].size : 0
end
+ lo
+ end
+
+ def build_hash
+ hash = super
+ hash.delete("likes")
+ hash.delete("views")
+ hash.delete("downloads")
+ hash.delete("subjects")
+ hash.delete("attributes")
+ hash
+ end
+
+ private
- unless args["in_Views"].nil?
- lo.views = args["in_Views"].count
- else
- lo.views = 0
+ def create_edges_from_array(edge_class, id, array, unique=false)
+ edges = []
+ array.each do |o|
+ unless unique && edge_exists?(edge_class, id, o.id)
+ edges << create_edge(edge_class, id, o.id)
+ end
end
+ edges
+ end
- lo
+ def odb_class
+ "LearningObject"
end
- def build_learning_objects(hash=[])
- learning_objects = []
- hash.each do |h|
- learning_objects << build_learning_object(h)
- end
- learning_objects
+ def count_likes(learning_object)
+ get_in_edges_count "Likes", learning_object.id
+ end
+
+ def count_views(learning_object)
+ get_in_edges_count "Views", learning_object.id
end
end
diff --git a/app/repositories/orient_db/main_page_repository.rb b/app/repositories/orient_db/main_page_repository.rb
index 3b27e083e1bd9a4aa921ededa4827a67321d2a79..3663b56d481e6f1a0af7d6460d4fb228709af896 100644
--- a/app/repositories/orient_db/main_page_repository.rb
+++ b/app/repositories/orient_db/main_page_repository.rb
@@ -25,5 +25,11 @@ module OrientDb
connection.command "update #{id} #{operation} #{atributte} = #{new}"
end
+ private
+
+ def odb_class
+ "MainPage"
+ end
+
end
end
diff --git a/app/repositories/orient_db/subject_repository.rb b/app/repositories/orient_db/subject_repository.rb
index b7889fc55699145ad441d9729a9e7ebde0d12b8b..f61ce039052400071af43deae864f31520fbb861 100644
--- a/app/repositories/orient_db/subject_repository.rb
+++ b/app/repositories/orient_db/subject_repository.rb
@@ -1,27 +1,51 @@
module OrientDb
class SubjectRepository < Base
+ include OrientDb::Methods::EdgeMethods
- def find_all
- connection.query "SELECT FROM Subject", limit: -1
+ def find_by_name(name)
+ result = select_by_property(odb_class, "name", name)
+ build_object(result.first)
end
- def find_by_id(id)
- connection.query "SELECT FROM Subject where @rid = '#{id}'"
+ def destroy_data(id)
+ connection.command "DELETE VERTEX Subject where @rid = '#{id}'"
end
- def destroy_data(id)
- return @connection.command "DELETE VERTEX Subject where @rid = '#{id}'"
- rescue
- return nil
+ def update(id,operation,atributte,new_value)
+ puts "update #{id} #{operation} #{atributte} = #{new_value}"
+ connection.command "update #{id} #{operation} #{atributte} = #{new_value}"
+ end
+
+ def get_learning_objects(subject)
+ result = get_edges_end("IsAbout","in",subject.id)
+ Portalmec::Application.repository.for(:learning_object).build_objects(result)
end
- def get_objects(id)
- connection.query "select expand(in('IsAbout')) from #{id}"
+ def build_hash
+ hash = super
+ hash.delete("learning_objects")
+ hash
end
- def update(id,operation,atributte,new)
- puts "update #{id} #{operation} #{atributte} = #{new}"
- return @connection.command "update #{id} #{operation} #{atributte} = #{new}"
+ def build_object(args={})
+ subject = nil
+ unless args.nil?
+ subject = Subject.new(:id => args["@rid"])
+ args.each do |var, val|
+ var_name = "@"+var
+ if subject.respond_to?(var)
+ subject.instance_variable_set(var_name, val)
+ end
+ end
+ end
+ subject
end
+
+ private
+
+ def odb_class
+ "Subject"
+ end
+
end
end
diff --git a/app/repositories/orient_db/user_repository.rb b/app/repositories/orient_db/user_repository.rb
index 28d930e8fe63de55ae83da66a0adc94188e25555..8068a3f257520146b9ee68607ad1773452c4dca3 100644
--- a/app/repositories/orient_db/user_repository.rb
+++ b/app/repositories/orient_db/user_repository.rb
@@ -24,5 +24,11 @@ module OrientDb
(result.count > 0)
end
+ private
+
+ def odb_class
+ "User"
+ end
+
end
end
diff --git a/config/initializers/repositories/dspace.rb b/config/initializers/repositories/dspace.rb
index f2a71dbd217f0bff4b7c836afa4107a2859cbd94..48a75aab0f7308207fba630d98dd22130408b31c 100644
--- a/config/initializers/repositories/dspace.rb
+++ b/config/initializers/repositories/dspace.rb
@@ -15,4 +15,4 @@ else
config = dspace_configs.fetch(Rails.env)
set_dspace_config config['host'], config['port'], config['rest_webapp_name'], config['solr_webapp_name']
-end
+end
\ No newline at end of file
diff --git a/config/initializers/repositories/repositories.rb b/config/initializers/repositories/repositories.rb
index caebcb6b5995c78904a92585f573b3f540cd2990..bc014e7c0215152ef0799b463f60a7531a847f6c 100644
--- a/config/initializers/repositories/repositories.rb
+++ b/config/initializers/repositories/repositories.rb
@@ -26,6 +26,8 @@ Repository::Environments.create :development do |repository|
repository.register :user, UserRepositoryProxy.new(OrientDb::UserRepository.new(OrientDb::Client.instance))
repository.register :subject, OrientDb::SubjectRepository.new(OrientDb::Client.instance)
repository.register :institution, OrientDb::InstitutionRepository.new(OrientDb::Client.instance)
+ repository.register :subject, OrientDb::SubjectRepository.new(OrientDb::Client.instance)
+ repository.register :attribute, OrientDb::AttributeRepository.new(OrientDb::Client.instance)
repository.register :collection, OrientDb::CollectionRepository.new(OrientDb::Client.instance)
end
@@ -35,6 +37,7 @@ Repository::Environments.create :test do |repository|
repository.register :webLink, OrientDb::WeblinkRepository.new(OrientDb::Client.instance)
repository.register :user, UserRepositoryProxy.new(OrientDb::UserRepository.new(OrientDb::Client.instance))
repository.register :subject, OrientDb::SubjectRepository.new(OrientDb::Client.instance)
+ repository.register :attribute, OrientDb::AttributeRepository.new(OrientDb::Client.instance)
repository.register :collection, OrientDb::CollectionRepository.new(OrientDb::Client.instance)
end
@@ -44,5 +47,6 @@ Repository::Environments.create :production do |repository|
repository.register :webLink, OrientDb::WeblinkRepository.new(OrientDb::Client.instance)
repository.register :user, UserRepositoryProxy.new(OrientDb::UserRepository.new(OrientDb::Client.instance))
repository.register :subject, OrientDb::SubjectRepository.new(OrientDb::Client.instance)
+ repository.register :attribute, OrientDb::AttributeRepository.new(OrientDb::Client.instance)
repository.register :collection, OrientDb::CollectionRepository.new(OrientDb::Client.instance)
end
diff --git a/config/orientdb.yml b/config/orientdb.yml
index 33d7dae7cccd737915522aaa7ff9abc3ac34f4fb..07945002eacbdb755ce3058bf6ff217959fc76e8 100644
--- a/config/orientdb.yml
+++ b/config/orientdb.yml
@@ -1,6 +1,6 @@
development: &development
host: localhost
- database: portalmec
+ database: PortalMEC
username: admin
password: admin
port: 2480
diff --git a/lib/orient_db/methods/edge_methods.rb b/lib/orient_db/methods/edge_methods.rb
index 0784e472dcadd44dd8f858ef478248aed7319e7c..0e5c8c448fe1059c3b09917ae569dd2c3d340731 100644
--- a/lib/orient_db/methods/edge_methods.rb
+++ b/lib/orient_db/methods/edge_methods.rb
@@ -13,6 +13,15 @@ module OrientDb
connection.command "CREATE EDGE #{edge_class} FROM #{from_id} TO #{to_id}"
end
+ def get_edges_end(edge_class, type, vertex_id)
+ connection.query sprintf("SELECT expand(%s('%s')) FROM %s", type, edge_class, vertex_id)
+ end
+
+ def edge_exists?(edge_class, from_id, to_id)
+ edge = connection.query sprintf("SELECT outE('%s') FROM %s WHERE out('%s') CONTAINS %s", edge_class, from_id, edge_class, to_id)
+ !edge.empty?
+ end
+
end
end
end
diff --git a/lib/orient_db/methods/generic_methods.rb b/lib/orient_db/methods/generic_methods.rb
new file mode 100644
index 0000000000000000000000000000000000000000..fe39c0f59a86e6f4bd672ef4186c2dfc632feee6
--- /dev/null
+++ b/lib/orient_db/methods/generic_methods.rb
@@ -0,0 +1,15 @@
+module OrientDb
+ module Methods
+ module GenericMethods
+
+ def get_by_rid(rid)
+ connection.get_document(rid)
+ end
+
+ def select_by_property(from, prop_name, prop_value)
+ connection.query sprintf("SELECT FROM %s WHERE %s = '%s'", from, prop_name, prop_value)
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/lib/tasks/mainPage.rake b/lib/tasks/mainPage.rake
index 3f2ca563b1a1ba69ad6b3a6dfd63da927295759e..69f84cb36e8a8dace047d8321cbfec20366bcf3b 100644
--- a/lib/tasks/mainPage.rake
+++ b/lib/tasks/mainPage.rake
@@ -7,12 +7,10 @@ namespace :mainPage do
subjects = repository.for(:subject).find_all
subjects.each do |subject|
# select all the learning objects about that subject
- objects = repository.for(:subject).get_objects(subject['@rid'])
+ objects = subject.learning_objects
# transform the objects to RankingItem
objects = objects.collect do |object|
- downloads = 0
- object = repository.for(:learning_object).find(object['@rid'])
- Ranking::Item.new(object.id,object.views.first["COUNT"],downloads,object.likes.first["COUNT"])
+ Ranking::Item.new(object.id,object.views,object.downloads,object.likes)
end
# rank them
rater = Ranking::Rater.new(Ranking::Strategies::BasicRater.new(0,1,100))
@@ -21,10 +19,10 @@ namespace :mainPage do
(general_highlights << objects.take(5)).flatten!
# add the object to the subject highlight
- puts subject['name']
- repository.for(:subject).update(subject['@rid'],'set','highlights','[]')
+ puts subject.name
+ repository.for(:subject).update(subject.id,'set','highlights','[]')
objects.each do |object|
- repository.for(:subject).update(subject['@rid'],'add','highlights',object.name)
+ repository.for(:subject).update(subject.id,'add','highlights',object.name)
end
end
puts 'Generating the main page highlights'
diff --git a/lib/tasks/orientdb.rake b/lib/tasks/orientdb.rake
index 504aa1f120363f4c7d471ca017e70808a053ad6f..3568b65a4c4833f8a5555ec49943557811480bc1 100644
--- a/lib/tasks/orientdb.rake
+++ b/lib/tasks/orientdb.rake
@@ -8,4 +8,78 @@ namespace :orientdb do
migrations.run
end
+ task create_learning_object_relations: :environment do
+ desc "Create LearningObject relations based on its metadata"
+
+ lo_repo = Portalmec::Application.repository.for(:learning_object)
+ subject_repo = Portalmec::Application.repository.for(:subject)
+ attr_repo = Portalmec::Application.repository.for(:attribute)
+
+ # Quantity of LearningObjects fetched on each iteration
+ limit = 1000
+ # Starting point from where LearningObjects will be fetched
+ offset = 0
+
+ loop do
+ p " --> importing LearningObjects from #{offset} to #{offset+limit}"
+
+ begin
+ # Get LearningObjects from OrientDB (from offset to offset+limit)
+ learning_objects = lo_repo.find_all_from_offset_to_limit(offset,limit)
+ rescue
+ # Sleeps for a while to wait database's recovery
+ sleep(30.seconds)
+ # Goes to next iteration to retry
+ next
+ else
+ # Terminate loop if there are no more LearningObjects
+ break if learning_objects.empty?
+
+ learning_objects.each do |lo|
+ metadata = get_unique_matadata_keys(lo)
+ subjects = metadata["dc.subject.category"]
+ subjects ||= []
+ metadata.delete("dc.subject.category")
+ lo.subjects=[]
+ lo.attributes=[]
+
+ subjects.each do |subject_name|
+ subject = subject_repo.find_by_name(subject_name)
+ if subject.nil?
+ subject = Subject.new(:name => subject_name)
+ subject_repo.create(subject)
+ end
+ lo.subjects << subject
+ end
+
+ metadata.each do |key, value|
+ value.each do |v|
+ attribute = attr_repo.find_by_key_and_value(key,v).first
+ if attribute.nil?
+ attribute = Attribute.new(:key => key, :value => v)
+ attr_repo.create(attribute)
+ end
+ lo.attributes << attribute
+ end
+ end
+
+ p lo_repo.create_relations(lo)
+ end
+
+ offset += limit
+ end
+ end
+
+ end
+
+ def get_unique_matadata_keys(lo)
+ hash = {}
+ lo.metadata.each do |m|
+ unless hash.has_key?(m['key'])
+ hash[m['key']] = lo.get_metadata_values_of(m['key'])
+ end
+ end
+ hash
+ end
+
end
\ No newline at end of file