Merged with master

Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>

.ruby-version

-2.3
+2.3.1

app/controllers/concerns/reviewable_controller.rb

@@ -45,7 +45,7 @@ module ReviewableController
     rate = Rate.where(user: current_user, review: @review).first_or_initialize
 
     if rate.update(approves: approves)
-      render json: rate, status: :ok
+      render json: rate, status: :created
     else
       render json: rate.errors, status: :unprocessable_entity
     end

app/policies/review_policy.rb

@@ -5,18 +5,20 @@ class ReviewPolicy < ApplicationPolicy
   end
 
   def update?
-    record if owns?
+    record if own?
   end
 
   def destroy?
-    record if record.user == user
+    record if own?
   end
 
   def rate?
     record if user_exists?
   end
 
-  def owner
-    record.users
+  private
+
+  def own?
+    record.user == user
   end
 end

app/services/institution_importer.rb

@@ -16,8 +16,11 @@ class InstitutionImporter
         institution = Institution.new(name: publisher)
         institution.save
         @names << publisher
+      else
+        institution = Institution.find_by_name(publisher)
       end
 
+
       learning_object.publisher = institution
       learning_object.save
     end

config/routes.rb

@@ -35,13 +35,10 @@ Rails.application.routes.draw do
     mount_devise_token_auth_for 'User', skip: [:omniauth_callbacks], at: :auth
   end
 
-  # devise_for :users, :controllers => { :omniauth_callbacks => "callbacks" }
   namespace :v1 do
     resources :users, concerns: :followable do
       member do
-        resources :bookmarks, module: 'users', only: [:index, :create]
-
-        delete :bookmarks, to: 'bookmarks#destroy'
+        resources :bookmarks, module: 'users', only: [:index, :create, :destroy]
       end
     end
     get :search, to: 'search#index'

lib/tasks/portalmec.rake

@@ -7,8 +7,8 @@ namespace :portalmec do
 
     Rake::Task['import:learning_objects'].invoke
     Rake::Task['import:tags'].invoke
-    Rake::Task['tags:define_topics'].invoke
-    Rake::Task['tags:define_school_levels'].invoke
+    # Rake::Task['tags:define_topics'].invoke
+    # Rake::Task['tags:define_school_levels'].invoke
     Rake::Task['object_type:restart'].invoke
     Rake::Task['language:restart'].invoke
 

test/fixtures/learning_objects.yml

@@ -46,6 +46,32 @@ institution_lo:
   author: 'Mauricio'
   publisher: ufpr (Institution)
 
+lo_complete:
+  name: 'Institution Object 1'
+  description: 'Testing'
+  author: 'Mauricio'
+  id_dspace: '1'
+  object_type: image
+  language: portuguese
+
+lo_metadata:
+  name: 'Institution Object 1'
+  description: 'Testing'
+  author: 'Mauricio'
+  id_dspace: '2'
+  object_type: image
+  language: portuguese
+  metadata:  '[{"key": "dc.creator", "value": "ufpr", "language": "nil"}]'
+
+lo_metadata2:
+  name: 'Institution Object 2'
+  description: 'Testing'
+  author: 'Mauricio'
+  id_dspace: '3'
+  object_type: image
+  language: portuguese
+  metadata:  '[{"key": "dc.creator", "value": "ufpr", "language": "nil"}]'
+
 search:
   name: 'Teste'
   description: 'Testing'

test/services/institution_importer_test.rb

+require 'test_helper'
+
+class InstitutionImporterTest < ActiveSupport::TestCase
+
+  test 'importing learning object with metadata publisher = nil' do
+    importer = InstitutionImporter.new()
+    lo = learning_objects(:lo_complete)
+    importer.items = [lo]
+    importer.import
+    assert_not_nil Institution.find_by_name(lo.publisher.name)
+  end
+
+  test 'importing learning object with metadata publisher != nil' do
+    importer = InstitutionImporter.new()
+    lo = learning_objects(:lo_metadata)
+    importer.items = [lo]
+    importer.import
+    assert_not_nil Institution.find_by_name(lo.publisher.name)
+  end
+
+  test 'importing learning object with institution that already exists' do
+    importer = InstitutionImporter.new()
+    lo1 = learning_objects(:lo_metadata)
+    lo2 = learning_objects(:lo_metadata2)
+    importer.items = [lo1, lo2]
+    importer.import
+    assert_equal Institution.find_by_name(lo1.publisher.name), Institution.find_by_name(lo2.publisher.name)
+  end
+
+end