Merge branch 'virtuoso_integration' of gitlab.com:participa/noosfero into virtuoso_integration

Victor Costa
2 parents c69c6c7c e07ff8d5
Showing 5 changed files with 59 additions and 44 deletions Show diff stats
plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb
plugins/virtuoso/lib/virtuoso_plugin/triples_management.rb
plugins/virtuoso/public/triples_management.js
plugins/virtuoso/test/functional/virtuoso_plugin_admin_controller_test.rb
plugins/virtuoso/test/unit/dspace_harvest_test.rb
@@ -47,15 +47,16 @@ class VirtuosoPluginAdminController &lt; AdminController
       to_triple.object = params[:to_triple][:object]
       triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
-      triples_management.update_triple(from_triple, to_triple)
-      render json: { :ok => true, :message => _('Triple succesfully updated.') }
+      triple_updated = triples_management.update_triple(from_triple, to_triple)
+      message = triple_updated ? _('Triple succesfully updated.') : _('Triple not updated.')
+
+      render json: { :ok => triple_updated, :message => message }
     end
   end
   def add_triple
     if request.post?
-
       triple = VirtuosoPlugin::Triple.new
       triple.graph = params[:triple][:graph]
       triple.subject = params[:triple][:subject]
@@ -63,9 +64,11 @@ class VirtuosoPluginAdminController &lt; AdminController
       triple.object = params[:triple][:object]
       triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
-      triples_management.add_triple(triple)
-      render json: { :ok => true, :message => _('Triple succesfully added.') }
+      triple_added = triples_management.add_triple(triple)
+      message = triple_added ? _('Triple succesfully added.') : _('Triple not added.')
+
+      render json: { :ok => triple_added, :message => message }
     end
   end
@@ -78,9 +81,11 @@ class VirtuosoPluginAdminController &lt; AdminController
       triple.object = params[:triple][:object]
       triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
-      triples_management.remove_triple(triple)
-      render json: { :ok => true, :message => _('Triple succesfully removed.') }
+      triple_deleted = triples_management.remove_triple(triple)
+      message = triple_deleted ? _('Triple succesfully removed.') : _('Triple not removed.')
+
+      render json: { :ok => triple_deleted, :message => message }
     end
   end
@@ -18,17 +18,37 @@ class VirtuosoPlugin::TriplesManagement
   def update_triple(from_triple, to_triple)
     query = "WITH <#{from_triple.graph}> DELETE { <#{from_triple.subject}> <#{from_triple.predicate}> #{from_triple.object} } INSERT { <#{to_triple.subject}> <#{to_triple.predicate}> #{to_triple.object} }"
-    plugin.virtuoso_client.query(query)
+    begin
+      query_result = plugin.virtuoso_client.query(query)[0][:"callret-0"].to_s
+    rescue RDF::Virtuoso::Repository::MalformedQuery => e
+      query_result = e.to_s
+    end
+
+    return query_result =~ /^Modify.*done$/ ? true : false
   end
   def add_triple(triple)
     query = "WITH <#{triple.graph}> INSERT { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
-    plugin.virtuoso_client.query(query)
+
+    begin
+      query_result = plugin.virtuoso_client.query(query)[0][:"callret-0"].to_s
+    rescue RDF::Virtuoso::Repository::MalformedQuery => e
+      query_result = e.to_s
+    end
+
+    return query_result =~ /^Insert.*done$/ ? true : false
   end
   def remove_triple(triple)
     query = "WITH <#{triple.graph}> DELETE { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
-    plugin.virtuoso_client.query(query)
+
+    begin
+      query_result = plugin.virtuoso_client.query(query)[0][:"callret-0"].to_s
+    rescue RDF::Virtuoso::Repository::MalformedQuery => e
+      query_result = e.to_s
+    end
+
+    return query_result =~ /^Delete.*done$/ ? true : false
   end
 end
@@ -20,17 +20,14 @@ function update_triple(triple_id) {
     url: '/admin/plugin/virtuoso/update_triple',
     data: formData,
     dataType: 'json',
-    success: function(data, status, ajax){
+    success: function(data, status, ajax) {
       if ( !data.ok ) {
-        display_notice(data.error.message);
+        display_notice(data.message);
       }
       else {
         display_notice(data.message);
         jQuery("input#triples_triple" + triple_id + "_from_object").val(jQuery("input#triples_triple" + triple_id + "_to_object").val());
       }
-    },
-    error: function(ajax, status, errorThrown) {
-      alert('Send request - HTTP '+status+': '+errorThrown);
     }
   });
@@ -50,18 +47,9 @@ function add_triple() {
     url: '/admin/plugin/virtuoso/add_triple',
     data: formData,
     dataType: 'json',
-    success: function(data, status, ajax){
-      if ( !data.ok ) {
-        display_notice(data.error.message);
-        jQuery.colorbox.close();
-      }
-      else {
-        display_notice(data.message);
-        jQuery.colorbox.close();
-      }
-    },
-    error: function(ajax, status, errorThrown) {
-      alert('Send request - HTTP '+status+': '+errorThrown);
+    success: function(data, status, ajax) {
+      display_notice(data.message);
+      jQuery.colorbox.close();
     }
   });
@@ -84,7 +72,7 @@ function remove_triple(triple_id) {
     dataType: 'json',
     success: function(data, status, ajax){
       if ( !data.ok ) {
-        display_notice(data.error.message);
+        display_notice(data.message);
       }
       else {
         display_notice(data.message);
@@ -97,9 +85,6 @@ function remove_triple(triple_id) {
           }
         });
       }
-    },
-    error: function(ajax, status, errorThrown) {
-      alert('Send request - HTTP '+status+': '+errorThrown);
     }
   });
@@ -8,7 +8,6 @@ class VirtuosoPluginAdminControllerTest &lt; ActionController::TestCase
     @environment = Environment.default
     @profile = create_user('profile').person
     login_as(@profile.identifier)
-    post :index, :settings => mock_settings
   end
   def mock_settings
@@ -26,6 +25,7 @@ class VirtuosoPluginAdminControllerTest &lt; ActionController::TestCase
   end
   should 'save virtuoso plugin settings' do
+    post :index, :settings => mock_settings
     @settings = Noosfero::Plugin::Settings.new(environment.reload, VirtuosoPlugin)
     assert_equal 'http://virtuoso.noosfero.com', @settings.settings[:virtuoso_uri]
     assert_equal 'username', @settings.settings[:virtuoso_username]
@@ -38,28 +38,33 @@ class VirtuosoPluginAdminControllerTest &lt; ActionController::TestCase
     assert_redirected_to :action => 'index'
   end
-  
   should 'redirect to index after save' do
     post :index, :settings => mock_settings
     assert_redirected_to :action => 'index'
   end
   should 'create delayed job to start harvest on force action' do
-    harvest = VirtuosoPlugin::DspaceHarvest.new(environment)
+    post :index, :settings => mock_settings
+    harvest = VirtuosoPlugin::DspaceHarvest.new(environment, "http://dspace1.noosfero.com")
     assert !harvest.find_job.present?
     get :force_harvest
     assert harvest.find_job.present?
   end
   should 'force harvest from start' do
+    post :index, :settings => mock_settings
     get :force_harvest, :from_start => true
-    harvest = VirtuosoPlugin::DspaceHarvest.new(environment)
+    harvest = VirtuosoPlugin::DspaceHarvest.new(environment, "http://dspace2.noosfero.com")
     assert harvest.find_job.present?
     assert_equal nil, harvest.settings.last_harvest
   end
-
-  should 'force harvest_all from start' do
-    get :force_harvest, :from_start => true
+ 
+  should 'not create delayed job to start harvest on force action without settings' do
+    post :index, :settings => mock_settings
+    harvest = VirtuosoPlugin::DspaceHarvest.new(environment, "http://dspace8.noosfero.com")
+    assert !harvest.find_job.present?, "testing if no job is running"
+    get :force_harvest
+    assert !harvest.find_job.present?, "testing if no job is running again" 
   end
-  
-end
 \ No newline at end of file
+ 
+end
@@ -23,6 +23,8 @@ class DspaceHarvestTest &lt; ActiveSupport::TestCase
   end
   should 'create delayed job when start' do
+    @settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, mock_settings)
+    @settings.save!
     harvest = VirtuosoPlugin::DspaceHarvest.new(environment, "http://dspace1.noosfero.com")
     assert !harvest.find_job.present?
     harvest.start
@@ -30,16 +32,14 @@ class DspaceHarvestTest &lt; ActiveSupport::TestCase
   end
   should 'not duplicate harvest job' do
+    @settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, mock_settings)
+    @settings.save!
     harvest = VirtuosoPlugin::DspaceHarvest.new(environment, "http://dspace1.noosfero.com")
     assert_difference "harvest.find_job.count", 1 do
       5.times { harvest.start }
     end
   end
-  should 'harvest all dspaces from start' do
-    VirtuosoPlugin::DspaceHarvest.harvest_all(environment, true)
-  end
-
   should 'try to harvest all dspaces from start without any setting' do
     VirtuosoPlugin::DspaceHarvest.harvest_all(environment, true)
   end
	@@ -18,17 +18,37 @@ class VirtuosoPlugin::TriplesManagement		@@ -18,17 +18,37 @@ class VirtuosoPlugin::TriplesManagement
18	def update_triple(from_triple, to_triple)	18	def update_triple(from_triple, to_triple)
19	query = "WITH <#{from_triple.graph}> DELETE { <#{from_triple.subject}> <#{from_triple.predicate}> #{from_triple.object} } INSERT { <#{to_triple.subject}> <#{to_triple.predicate}> #{to_triple.object} }"	19	query = "WITH <#{from_triple.graph}> DELETE { <#{from_triple.subject}> <#{from_triple.predicate}> #{from_triple.object} } INSERT { <#{to_triple.subject}> <#{to_triple.predicate}> #{to_triple.object} }"
20		20
21	- plugin.virtuoso_client.query(query)	21	+ begin
		22	+ query_result = plugin.virtuoso_client.query(query)[0][:"callret-0"].to_s
		23	+ rescue RDF::Virtuoso::Repository::MalformedQuery => e
		24	+ query_result = e.to_s
		25	+ end
		26	+
		27	+ return query_result =~ /^Modify.*done$/ ? true : false
22	end	28	end
23		29
24	def add_triple(triple)	30	def add_triple(triple)
25	query = "WITH <#{triple.graph}> INSERT { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"	31	query = "WITH <#{triple.graph}> INSERT { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
26	- plugin.virtuoso_client.query(query)	32	+
		33	+ begin
		34	+ query_result = plugin.virtuoso_client.query(query)[0][:"callret-0"].to_s
		35	+ rescue RDF::Virtuoso::Repository::MalformedQuery => e
		36	+ query_result = e.to_s
		37	+ end
		38	+
		39	+ return query_result =~ /^Insert.*done$/ ? true : false
27	end	40	end
28		41
29	def remove_triple(triple)	42	def remove_triple(triple)
30	query = "WITH <#{triple.graph}> DELETE { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"	43	query = "WITH <#{triple.graph}> DELETE { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
31	- plugin.virtuoso_client.query(query)	44	+
		45	+ begin
		46	+ query_result = plugin.virtuoso_client.query(query)[0][:"callret-0"].to_s
		47	+ rescue RDF::Virtuoso::Repository::MalformedQuery => e
		48	+ query_result = e.to_s
		49	+ end
		50	+
		51	+ return query_result =~ /^Delete.*done$/ ? true : false
32	end	52	end
33		53
34	end	54	end