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

Francisco Júnior
2 parents e517e511 489b677e
Showing 8 changed files with 36 additions and 28 deletions Show diff stats
plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb
plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb
plugins/virtuoso/public/ontology_mapping.js
plugins/virtuoso/test/functional/virtuoso_plugin_admin_controller_test.rb
plugins/virtuoso/views/virtuoso_plugin_admin/_server_list_item.html.erb
plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb
plugins/virtuoso/views/virtuoso_plugin_ontology_mapping/index.html.erb
 class VirtuosoPluginAdminController < AdminController
-  #validates :dspace_servers, presence: true
-  
   def index
-    settings = params[:settings] 
+    settings = params[:settings]
     settings ||= {}
     @settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, settings)
     @harvest_running = VirtuosoPlugin::DspaceHarvest.new(environment).find_job.present?
     if request.post?
-      settings[:dspace_servers].delete_if do | server | 
+      settings[:dspace_servers].delete_if do | server |
         server[:dspace_uri].empty?
       end
       @settings.save!
 #inspired by https://github.com/code4lib/ruby-oai/blob/master/lib/oai/harvester/harvest.rb
 class VirtuosoPlugin::DspaceHarvest
-  DC_CONVERSION = [:title, :creator, :subject, :description, :date, :type, :identifier, :language, :rights, :format]
- 
-  def initialize(environment, dspace_uri = "")
+  def initialize(environment, dspace_uri = nil)
     @environment = environment
     @dspace_uri = dspace_uri
   end
@@ -69,19 +67,19 @@ class VirtuosoPlugin::DspaceHarvest
         settings.last_harvest = nil
         settings.save!
       end
-      job = VirtuosoPlugin::DspaceHarvest::Job.new(@environment.id)
+      job = VirtuosoPlugin::DspaceHarvest::Job.new(@environment.id, @dspace_uri)
       Delayed::Job.enqueue(job)
     end
   end
   def find_job
-    Delayed::Job.where(:handler => "--- !ruby/struct:VirtuosoPlugin::DspaceHarvest::Job\nenvironment_id: #{@environment.id}\n")
+    Delayed::Job.where(:handler => "--- !ruby/struct:VirtuosoPlugin::DspaceHarvest::Job\nenvironment_id: #{@environment.id}\ndspace_uri: #{@dspace_uri}\n")
   end
-  class Job < Struct.new(:environment_id)
+  class Job < Struct.new(:environment_id, :dspace_uri)
     def perform
       environment = Environment.find(environment_id)
-      harvest = VirtuosoPlugin::DspaceHarvest.new(environment)
+      harvest = VirtuosoPlugin::DspaceHarvest.new(environment, dspace_uri)
       harvest.run
     end
   end
@@ -21,6 +21,7 @@ class VirtuosoPlugin::TriplesTemplate &lt; Article
   settings_items :query, :type => :string
   settings_items :template, :type => :string, :default => initial_template
   settings_items :stylesheet, :type => :string
+  settings_items :per_page, :type => :integer, :default => 50
   attr_accessible :query, :template, :stylesheet
@@ -35,12 +36,12 @@ class VirtuosoPlugin::TriplesTemplate &lt; Article
     @plugin ||= VirtuosoPlugin.new(self)
   end
-  def template_content
+  def template_content(page=1)
     begin
-      results = plugin.virtuoso_readonly_client.query(query)
+      results = plugin.virtuoso_readonly_client.query(query).paginate({:per_page => per_page, :page => page})
       liquid_template = Liquid::Template.parse(template)
-      page = liquid_template.render('results' => results)
-      transform_html(page)
+      rendered_template = liquid_template.render('results' => results)
+      transform_html(rendered_template)
     rescue => ex
       logger.info ex.to_s
       "Failed to process the template"
@@ -2,10 +2,12 @@ jQuery(document).ready(function($) {
   $('#new-ontology-button').on('click', function() {
     $('#ontology-table').append($('#ontology-item-template tr').clone());
+    return false;
   });
   $('#ontology-table').on('click', '.remove-ontology-button', function() {
     $(this).parents('tr').remove();
+    return false;
   });
 });
@@ -9,17 +9,26 @@ class VirtuosoPluginAdminControllerTest &lt; ActionController::TestCase
   end
   attr_reader :environment
-
+ 
   should 'save virtuoso plugin settings' do
-    post :index, :settings => {'virtuoso_uri' => 'http://virtuoso.noosfero.com',
-                               'virtuoso_username' => 'username',
-                               'virtuoso_password' => 'password',
-                               'dspace_uri' => 'http://dspace.noosfero.com'}
+    post :index, :settings =>
+          {:virtuoso_uri=>"http://virtuoso.noosfero.com",
+           :virtuoso_username=>"username", :virtuoso_password=>"password",
+           :virtuoso_readonly_username=>"password",
+           :virtuoso_readonly_password=>"password",
+           :dspace_servers=>[ 
+                              {"dspace_uri"=>"http://dspace1.noosfero.com"},
+                              {"dspace_uri"=>"http://dspace2.noosfero.com"},
+                              {"dspace_uri"=>"http://dspace3.noosfero.com"}
+                            ]
+          }
     @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]
     assert_equal 'password', @settings.settings[:virtuoso_password]
-    assert_equal 'http://dspace.noosfero.com', @settings.settings[:dspace_uri]
+    assert_equal 'http://dspace1.noosfero.com', @settings.settings[:dspace_servers][0][:dspace_uri]
+    assert_equal 'http://dspace2.noosfero.com', @settings.settings[:dspace_servers][1][:dspace_uri]
+    assert_equal 'http://dspace3.noosfero.com', @settings.settings[:dspace_servers][2][:dspace_uri]    
     assert_redirected_to :action => 'index'
   end
 <div>
   <% value = server_list_item[:dspace_uri] if server_list_item %>
-  <%= text_field_tag 'settings[dspace_servers][][dspace_uri]', value, { :class => 'link-name', :maxlength => 60 } %>
+  <%= text_field_tag 'settings[dspace_servers][][dspace_uri]', value, { :class => 'link-name', :maxlength => 60, :size=> 58 } %>
   <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-server-list-row") %>
   <BR><BR>  
 </div>
@@ -5,12 +5,11 @@
 <%= form_for(:settings) do |f| %>
   <strong>
-    <%= labelled_form_field _('Virtuoso URL:'), f.text_field(:virtuoso_uri) %>
-    <%= labelled_form_field _('Virtuoso Admin Username:'), f.text_field(:virtuoso_username) %>
-    <%= labelled_form_field _('Virtuoso Admin Password:'), f.password_field(:virtuoso_password) %>
-    <%= labelled_form_field _('Virtuoso Read-Only Username:'), f.text_field(:virtuoso_readonly_username) %>
-    <%= labelled_form_field _('Virtuoso Read-Only Password:'), f.password_field(:virtuoso_readonly_password) %>
-    <%= labelled_form_field _('DSpace URL:'), f.text_field(:dspace_uri) %>
+    <%= labelled_form_field _('Virtuoso URL:'), f.text_field(:virtuoso_uri, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Admin Username:'), f.text_field(:virtuoso_username, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Admin Password:'), f.password_field(:virtuoso_password, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Read-Only Username:'), f.text_field(:virtuoso_readonly_username, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Read-Only Password:'), f.password_field(:virtuoso_readonly_password, :size=> 60) %>
   </strong>
   <BR> 
 <div class="dspace-servers-config-box" >
@@ -12,6 +12,7 @@
 <div class="actions">
   <%= button :new, _('New'), '#', :id => 'new-ontology-button' %>
   <%= submit_button :save, _('Save') %>
+  <%= button 'cancel', _('Cancel'), :controller => 'virtuoso_plugin_admin', :action => 'index' %>
 </div>
 <% end %>
1	<div>	1	<div>
2	<% value = server_list_item[:dspace_uri] if server_list_item %>	2	<% value = server_list_item[:dspace_uri] if server_list_item %>
3	- <%= text_field_tag 'settings[dspace_servers][][dspace_uri]', value, { :class => 'link-name', :maxlength => 60 } %>	3	+ <%= text_field_tag 'settings[dspace_servers][][dspace_uri]', value, { :class => 'link-name', :maxlength => 60, :size=> 58 } %>
4	<%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-server-list-row") %>	4	<%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-server-list-row") %>
5	<BR><BR>	5	<BR><BR>
6	</div>	6	</div>
	@@ -12,6 +12,7 @@		@@ -12,6 +12,7 @@
12	<div class="actions">	12	<div class="actions">
13	<%= button :new, _('New'), '#', :id => 'new-ontology-button' %>	13	<%= button :new, _('New'), '#', :id => 'new-ontology-button' %>
14	<%= submit_button :save, _('Save') %>	14	<%= submit_button :save, _('Save') %>
		15	+ <%= button 'cancel', _('Cancel'), :controller => 'virtuoso_plugin_admin', :action => 'index' %>
15	</div>	16	</div>
16	<% end %>	17	<% end %>
17		18