Merge branch 'virtuoso_integration' into stable

Victor Costa
2 parents 864b0f2d 3eef3769
Showing 3 changed files with 78 additions and 22 deletions Show diff stats
plugins/virtuoso/lib/virtuoso_plugin/noosfero_harvest.rb
plugins/virtuoso/public/triples_management.js
plugins/virtuoso/views/virtuoso_plugin_admin/triple_management.html.erb
@@ -43,14 +43,19 @@ class VirtuosoPlugin::NoosferoHarvest
   delegate :settings, :to => :plugin
   include Rails.application.routes.url_helpers
+  include ActionView::Helpers::SanitizeHelper
   def triplify_comments(article)
     total = article.comments.count
     count = 0
     article.comments.each do |comment|
-      subject_identifier = url_for(comment.url)
-      puts "triplify #{subject_identifier} comment (#{count+=1}/#{total})"
-      triplify_mappings(COMMENT_MAPPING, subject_identifier, article, comment)
+      begin
+        subject_identifier = url_for(comment.url)
+        puts "triplify #{subject_identifier} comment (#{count+=1}/#{total})"
+        triplify_mappings(COMMENT_MAPPING, subject_identifier, article, comment)
+      rescue => ex
+        puts "FAILED: #{ex}"
+      end
     end
   end
@@ -58,10 +63,14 @@ class VirtuosoPlugin::NoosferoHarvest
     total = profile.articles.count
     count = 0
     profile.articles.public.each do |article|
-      subject_identifier = url_for(article.url)
-      puts "triplify #{subject_identifier} article (#{count+=1}/#{total})"
-      triplify_mappings(ARTICLE_MAPPING, subject_identifier, profile, article)
-      triplify_comments(article)
+      begin
+        subject_identifier = url_for(article.url)
+        puts "triplify #{subject_identifier} article (#{count+=1}/#{total})"
+        triplify_mappings(ARTICLE_MAPPING, subject_identifier, profile, article)
+        triplify_comments(article)
+      rescue => ex
+        puts "FAILED: #{ex}"
+      end
     end
   end
@@ -69,9 +78,13 @@ class VirtuosoPlugin::NoosferoHarvest
     total = person.friends.count
     count = 0
     person.friends.each do |friend|
-      subject_identifier = url_for(person.url)
-      puts "triplify #{subject_identifier} friendship (#{count+=1}/#{total})"
-      triplify_mappings(FRIENDSHIP_MAPPING, subject_identifier, person, friend)
+      begin
+        subject_identifier = url_for(person.url)
+        puts "triplify #{subject_identifier} friendship (#{count+=1}/#{total})"
+        triplify_mappings(FRIENDSHIP_MAPPING, subject_identifier, person, friend)
+      rescue => ex
+        puts "FAILED: #{ex}"
+      end
     end
   end
@@ -79,11 +92,15 @@ class VirtuosoPlugin::NoosferoHarvest
     total = environment.profiles.count
     count = 0
     environment.profiles.each do |profile|
-      subject_identifier = url_for(profile.url)
-      puts "triplify #{subject_identifier} profile (#{count+=1}/#{total})"
-      triplify_mappings(PROFILE_MAPPING, subject_identifier, environment, profile)
-      triplify_articles(profile) if profile.public?
-      triplify_friendship(profile) if profile.person?
+      begin
+        subject_identifier = url_for(profile.url)
+        puts "triplify #{subject_identifier} profile (#{count+=1}/#{total})"
+        triplify_mappings(PROFILE_MAPPING, subject_identifier, environment, profile)
+        triplify_articles(profile) if profile.public?
+        triplify_friendship(profile) if profile.person?
+      rescue => ex
+        puts "FAILED: #{ex}"
+      end
     end
   end
@@ -106,12 +123,20 @@ class VirtuosoPlugin::NoosferoHarvest
     end
   end
-  def insert_triple(subject, predicate, value)
-    value = RDF::URI.new(value) if value.kind_of?(String) && /https?:\/\//.match(value)
-    value = RDF::Literal::DateTime.new(value) if value.kind_of?(ActiveSupport::TimeWithZone)
-    value = RDF::Literal::Boolean.new(value) if !!value == value
+  def process_value(value)
+    if value.kind_of?(String)
+      value = /https?:\/\//.match(value) ? RDF::URI.new(value) : strip_tags(value)
+    elsif value.kind_of?(ActiveSupport::TimeWithZone)
+      value = RDF::Literal::DateTime.new(value)
+    elsif !!value == value
+      value = RDF::Literal::Boolean.new(value)
+    end
+  end
-    query = RDF::Virtuoso::Query.insert_data([RDF::URI.new(subject), RDF::URI.new(predicate), value]).graph(RDF::URI.new(@graph))
+  def insert_triple(subject, predicate, value)
+    query = RDF::Virtuoso::Query.insert_data([RDF::URI.new(subject),
+                                              RDF::URI.new(predicate),
+                                              process_value(value)]).graph(RDF::URI.new(@graph))
     plugin.virtuoso_client.insert(query)
   end
+function is_valid_url(url) {
+  var pattern =/^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/i;
+  return pattern.test(url);
+}
+
+function validate_search_form() {
+  graph_uri = jQuery("input#graph_uri");
+  query = jQuery("textarea#query");
+
+  if ( !is_valid_url(graph_uri.val())) {
+    alert( TRIPLES_MANAGEMENT_GRAPH_URI_REQUIRED_MESSAGE );
+    graph_uri.focus();
+    return false;
+  }
+
+  pattern = /.*select\s.*/i
+  if (!pattern.test(query.val())) {
+    alert( TRIPLES_MANAGEMENT_QUERY_REQUIRED_MESSAGE );
+    query.focus();
+    return false;
+  }
+
+  jQuery("#form-triples-search").submit();
+
+}
+
 function update_triple(triple_id) {
   graph = jQuery("input#graph_uri").val();
 <div id="virtuoso-triples-management">
   <h1><%= _('Virtuoso settings &raquo; Triples Management')%></h1>
-  <%= form_tag('/admin/plugin/virtuoso/triples_management', :method => 'post') do %>
+  <%= form_tag('/admin/plugin/virtuoso/triples_management', :method => 'post', :id => 'form-triples-search') do %>
     <%= labelled_form_field(_('Graph URI:'), text_field_tag(:graph_uri, @graph_uri) ) %>
     <%= labelled_form_field(_('Query SPARQL:'), text_area_tag(:query, @query, :rows => 7)) %>
     <% button_bar do %>
-      <%= submit_button(:search, _('Search triples')) %>
+      <%= submit_button(:search, _('Search triples'), :onclick => "validate_search_form(); return false;") %>
       <%= colorbox_button('add', _('Add a triple'), { :action => 'add_triple' }) %>
     <% end %>
   <% end %>
@@ -54,4 +54,9 @@
 </div>
+<script type="text/javascript">
+  TRIPLES_MANAGEMENT_GRAPH_URI_REQUIRED_MESSAGE = '<%= _('A valid GRAPH URI is required') %>';
+  TRIPLES_MANAGEMENT_QUERY_REQUIRED_MESSAGE = '<%= _('A valid QUERY is required') %>';
+</script>
+
 <%= javascript_include_tag '/plugins/virtuoso/triples_management.js' %>
		1	+function is_valid_url(url) {
		2	+ var pattern =/^(?:(?:https?\|ftp):\/\/)(?:\S+(?::\S)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]\|2\d\|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?\|1\d\d\|2[01]\d\|22[0-3])(?:\.(?:1?\d{1,2}\|2[0-4]\d\|25[0-5])){2}(?:\.(?:[1-9]\d?\|1\d\d\|2[0-4]\d\|25[0-4]))\|(?:(?:[a-z\u00a1-\uffff0-9]+-?)[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/i;
		3	+ return pattern.test(url);
		4	+}
		5	+
		6	+function validate_search_form() {
		7	+ graph_uri = jQuery("input#graph_uri");
		8	+ query = jQuery("textarea#query");
		9	+
		10	+ if ( !is_valid_url(graph_uri.val())) {
		11	+ alert( TRIPLES_MANAGEMENT_GRAPH_URI_REQUIRED_MESSAGE );
		12	+ graph_uri.focus();
		13	+ return false;
		14	+ }
		15	+
		16	+ pattern = /.select\s./i
		17	+ if (!pattern.test(query.val())) {
		18	+ alert( TRIPLES_MANAGEMENT_QUERY_REQUIRED_MESSAGE );
		19	+ query.focus();
		20	+ return false;
		21	+ }
		22	+
		23	+ jQuery("#form-triples-search").submit();
		24	+
		25	+}
		26	+
1	function update_triple(triple_id) {	27	function update_triple(triple_id) {
2	graph = jQuery("input#graph_uri").val();	28	graph = jQuery("input#graph_uri").val();
3		29