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

Evandro Jr
2 parents d1d5c054 8dc62c15
Showing 10 changed files with 101 additions and 8 deletions Show diff stats
plugins/virtuoso/Gemfile
plugins/virtuoso/lib/ext/literal.rb
plugins/virtuoso/lib/ext/solution.rb
plugins/virtuoso/lib/virtuoso_plugin.rb
plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
plugins/virtuoso/lib/virtuoso_plugin/dublin_core_metadata.rb
plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb
plugins/virtuoso/test/unit/virtuoso_plugin_test.rb
plugins/virtuoso/views/cms/virtuoso_plugin/_triples_template.html.erb
plugins/virtuoso/views/content_viewer/triples_template.html.erb
 gem 'rdf'
 gem 'rdf-virtuoso'
 gem 'oai'
+gem 'liquid'
@@ -0,0 +1,7 @@
+class RDF::Literal
+
+  def to_liquid
+    value
+  end
+
+end
@@ -0,0 +1,7 @@
+class RDF::Query::Solution
+
+  def to_liquid
+    HashWithIndifferentAccess.new(to_hash)
+  end
+
+end
@@ -8,4 +8,16 @@ class VirtuosoPlugin &lt; Noosfero::Plugin
     _('Virtuoso integration')
   end
  
+  def content_types
+    [VirtuosoPlugin::TriplesTemplate]
+  end
+
+  def settings
+    @settings ||= Noosfero::Plugin::Settings.new(context.environment, VirtuosoPlugin)
+  end
+
+  def virtuoso_client
+    @virtuoso_client ||= RDF::Virtuoso::Repository.new("#{settings.virtuoso_uri}/sparql", :update_uri => "#{settings.virtuoso_uri}/sparql-auth", :username => settings.virtuoso_username, :password => settings.virtuoso_password, :auth_method => 'digest', :timeout => 30)
+  end
+
 end
@@ -7,18 +7,18 @@ class VirtuosoPlugin::DspaceHarvest
     @environment = environment
   end
  
-  def settings
-    @settings ||= Noosfero::Plugin::Settings.new(@environment, VirtuosoPlugin)
+  attr_reader :environment
+
+  def plugin
+    @plugin ||= VirtuosoPlugin.new(self)
   end
  
+  delegate :settings, :to => :plugin
+
   def dspace_client
     @dspace_client ||= OAI::Client.new("#{settings.dspace_uri}/oai/request")
   end
  
-  def virtuoso_client
-    @virtuoso_client ||= RDF::Virtuoso::Repository.new("#{settings.virtuoso_uri}/sparql", :update_uri => "#{settings.virtuoso_uri}/sparql-auth", :username => settings.virtuoso_username, :password => settings.virtuoso_password, :auth_method => 'digest', :timeout => 30)
-  end
-
   def triplify(record)
     metadata = VirtuosoPlugin::DublinCoreMetadata.new(record.metadata)
     puts "triplify #{record.header.identifier}"
@@ -27,7 +27,7 @@ class VirtuosoPlugin::DspaceHarvest
       values = [metadata.send(c)].flatten.compact
       values.each do |value|
         query = RDF::Virtuoso::Query.insert_data([RDF::URI.new(metadata.identifier), RDF::URI.new("http://purl.org/dc/elements/1.1/#{c}"), value]).graph(RDF::URI.new(settings.dspace_uri))
-        virtuoso_client.insert(query)
+        plugin.virtuoso_client.insert(query)
       end
     end
   end
@@ -9,7 +9,7 @@ class VirtuosoPlugin::DublinCoreMetadata
     @creator = xpath(element, './/dc:creator')
     @subject = xpath_all(element, './/dc:subject').map(&:text)
     @description = xpath(element, './/dc:description')
-    @date = xpath_all(element, './/dc:date').map(&:text)
+    @date = xpath(element, './/dc:date')
     @type = xpath(element, './/dc:type')
     @identifier = xpath(element, './/dc:identifier')
     @language = xpath(element, './/dc:language')
@@ -0,0 +1,33 @@
+class VirtuosoPlugin::TriplesTemplate < Article
+
+  def self.short_description
+    _('Triples template')
+  end
+
+  def self.description
+    _('Triples template')
+  end
+
+  settings_items :query, :type => :string
+  settings_items :template, :type => :string
+
+  attr_accessible :query, :template
+
+  def to_html(options = {})
+    article = self
+    proc do
+      render :file => 'content_viewer/triples_template', :locals => {:article => article}
+    end
+  end
+
+  def plugin
+    @plugin ||= VirtuosoPlugin.new(self)
+  end
+
+  def template_content
+    results = plugin.virtuoso_client.query(query)
+    liquid_template = Liquid::Template.parse("{% for row in results %}#{template}{% endfor %}")
+    liquid_template.render('results' => results)
+  end
+
+end
@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class VirtuosoPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+    @plugin = VirtuosoPlugin.new
+  end
+
+  attr_reader :plugin
+
+  should 'define a new content' do
+    assert_equal [VirtuosoPlugin::TriplesTemplate], plugin.content_types
+  end
+
+end
@@ -0,0 +1,10 @@
+<%= required_fields_message %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
+<%= labelled_form_field(_('SPARQL Query'), text_area(:article, :query, :style => 'width: 98%; height: 120px;')) %>
+<%= labelled_form_field(_('Template'), text_area(:article, :template, :style => 'width: 98%; height: 200px;', :class => 'mceEditor')) %>
+
+<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
+<%= render :partial => 'general_fields' %>
@@ -0,0 +1,7 @@
+<div class="body">
+  <%= article.body %>
+</div>
+
+<div class="results">
+  <%= article.template_content %>
+</div>
1	1	gem 'rdf'
2	2	gem 'rdf-virtuoso'
3	3	gem 'oai'
	4	+gem 'liquid'
...	...
...	...	@@ -0,0 +1,7 @@
	1	+class RDF::Literal
	2	+
	3	+ def to_liquid
	4	+ value
	5	+ end
	6	+
	7	+end
...	...
...	...	@@ -0,0 +1,7 @@
	1	+class RDF::Query::Solution
	2	+
	3	+ def to_liquid
	4	+ HashWithIndifferentAccess.new(to_hash)
	5	+ end
	6	+
	7	+end
...	...
...	...	@@ -8,4 +8,16 @@ class VirtuosoPlugin < Noosfero::Plugin
8	8	_('Virtuoso integration')
9	9	end
10	10
	11	+ def content_types
	12	+ [VirtuosoPlugin::TriplesTemplate]
	13	+ end
	14	+
	15	+ def settings
	16	+ @settings \|\|= Noosfero::Plugin::Settings.new(context.environment, VirtuosoPlugin)
	17	+ end
	18	+
	19	+ def virtuoso_client
	20	+ @virtuoso_client \|\|= RDF::Virtuoso::Repository.new("#{settings.virtuoso_uri}/sparql", :update_uri => "#{settings.virtuoso_uri}/sparql-auth", :username => settings.virtuoso_username, :password => settings.virtuoso_password, :auth_method => 'digest', :timeout => 30)
	21	+ end
	22	+
11	23	end
...	...
...	...	@@ -7,18 +7,18 @@ class VirtuosoPlugin::DspaceHarvest
7	7	@environment = environment
8	8	end
9	9
10		- def settings
11		- @settings \|\|= Noosfero::Plugin::Settings.new(@environment, VirtuosoPlugin)
	10	+ attr_reader :environment
	11	+
	12	+ def plugin
	13	+ @plugin \|\|= VirtuosoPlugin.new(self)
12	14	end
13	15
	16	+ delegate :settings, :to => :plugin
	17	+
14	18	def dspace_client
15	19	@dspace_client \|\|= OAI::Client.new("#{settings.dspace_uri}/oai/request")
16	20	end
17	21
18		- def virtuoso_client
19		- @virtuoso_client \|\|= RDF::Virtuoso::Repository.new("#{settings.virtuoso_uri}/sparql", :update_uri => "#{settings.virtuoso_uri}/sparql-auth", :username => settings.virtuoso_username, :password => settings.virtuoso_password, :auth_method => 'digest', :timeout => 30)
20		- end
21		-
22	22	def triplify(record)
23	23	metadata = VirtuosoPlugin::DublinCoreMetadata.new(record.metadata)
24	24	puts "triplify #{record.header.identifier}"
...	...	@@ -27,7 +27,7 @@ class VirtuosoPlugin::DspaceHarvest
27	27	values = [metadata.send(c)].flatten.compact
28	28	values.each do \|value\|
29	29	query = RDF::Virtuoso::Query.insert_data([RDF::URI.new(metadata.identifier), RDF::URI.new("http://purl.org/dc/elements/1.1/#{c}"), value]).graph(RDF::URI.new(settings.dspace_uri))
30		- virtuoso_client.insert(query)
	30	+ plugin.virtuoso_client.insert(query)
31	31	end
32	32	end
33	33	end
...	...
...	...	@@ -9,7 +9,7 @@ class VirtuosoPlugin::DublinCoreMetadata
9	9	@creator = xpath(element, './/dc:creator')
10	10	@subject = xpath_all(element, './/dc:subject').map(&:text)
11	11	@description = xpath(element, './/dc:description')
12		- @date = xpath_all(element, './/dc:date').map(&:text)
	12	+ @date = xpath(element, './/dc:date')
13	13	@type = xpath(element, './/dc:type')
14	14	@identifier = xpath(element, './/dc:identifier')
15	15	@language = xpath(element, './/dc:language')
...	...
...	...	@@ -0,0 +1,33 @@
	1	+class VirtuosoPlugin::TriplesTemplate < Article
	2	+
	3	+ def self.short_description
	4	+ _('Triples template')
	5	+ end
	6	+
	7	+ def self.description
	8	+ _('Triples template')
	9	+ end
	10	+
	11	+ settings_items :query, :type => :string
	12	+ settings_items :template, :type => :string
	13	+
	14	+ attr_accessible :query, :template
	15	+
	16	+ def to_html(options = {})
	17	+ article = self
	18	+ proc do
	19	+ render :file => 'content_viewer/triples_template', :locals => {:article => article}
	20	+ end
	21	+ end
	22	+
	23	+ def plugin
	24	+ @plugin \|\|= VirtuosoPlugin.new(self)
	25	+ end
	26	+
	27	+ def template_content
	28	+ results = plugin.virtuoso_client.query(query)
	29	+ liquid_template = Liquid::Template.parse("{% for row in results %}#{template}{% endfor %}")
	30	+ liquid_template.render('results' => results)
	31	+ end
	32	+
	33	+end
...	...
...	...	@@ -0,0 +1,16 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class VirtuosoPluginTest < ActiveSupport::TestCase
	4	+
	5	+ def setup
	6	+ @environment = Environment.default
	7	+ @plugin = VirtuosoPlugin.new
	8	+ end
	9	+
	10	+ attr_reader :plugin
	11	+
	12	+ should 'define a new content' do
	13	+ assert_equal [VirtuosoPlugin::TriplesTemplate], plugin.content_types
	14	+ end
	15	+
	16	+end
...	...
...	...	@@ -0,0 +1,10 @@
	1	+<%= required_fields_message %>
	2	+
	3	+<%= render :file => 'shared/tiny_mce' %>
	4	+
	5	+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
	6	+<%= labelled_form_field(_('SPARQL Query'), text_area(:article, :query, :style => 'width: 98%; height: 120px;')) %>
	7	+<%= labelled_form_field(_('Template'), text_area(:article, :template, :style => 'width: 98%; height: 200px;', :class => 'mceEditor')) %>
	8	+
	9	+<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
	10	+<%= render :partial => 'general_fields' %>
...	...
...	...	@@ -0,0 +1,7 @@
	1	+<div class="body">
	2	+ <%= article.body %>
	3	+</div>
	4	+
	5	+<div class="results">
	6	+ <%= article.template_content %>
	7	+</div>
...	...