curriculum_lattes_plugin: Refactoring to use load_plugin_filters hotspot

Arthur Esposte · Daniela Feitosa
1 parent 5c1641f3
Showing 18 changed files with 198 additions and 118 deletions Show diff stats
app/controllers/admin/features_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/models/user.rb
db/schema.rb
features/step_definitions/noosfero_steps.rb
lib/noosfero/plugin.rb
plugins/lattes_curriculum/README.md
plugins/lattes_curriculum/db/migrate/20140814210103_create_academic_infos.rb
plugins/lattes_curriculum/features/lattes_curriculum.feature
plugins/lattes_curriculum/lib/academic_info.rb
plugins/lattes_curriculum/lib/ext/person.rb
plugins/lattes_curriculum/lib/html_parser.rb
plugins/lattes_curriculum/lib/lattes_curriculum_plugin.rb
plugins/lattes_curriculum/public/singup_complement.js
plugins/lattes_curriculum/test/unit/academic_info_test.rb
plugins/lattes_curriculum/test/unit/html_parser_test.rb
plugins/lattes_curriculum/test/unit/lattes_curriculum_test.rb
@@ -17,10 +17,6 @@ class FeaturesController &lt; AdminController
   def manage_fields
     @person_fields = Person.fields
-    @plugins.dispatch(:extra_person_fields).collect do |field|
-      @person_fields << field unless @person_fields.include?(field)
-    end
-
     @enterprise_fields = Enterprise.fields
     @community_fields = Community.fields
   end
@@ -16,21 +16,15 @@ class ProfileEditorController &lt; MyProfileController
     if request.post?
       params[:profile_data][:fields_privacy] ||= {} if profile.person? && params[:profile_data].is_a?(Hash)
       begin
-        @plugins.dispatch(:profile_editor_transaction_extras)
-
         Profile.transaction do
           Image.transaction do
-            if @profile_data.update_attributes(params[:profile_data])
-              redirect_to :action => 'index', :profile => profile.identifier
-            else
-              profile.identifier = params[:profile] if profile.identifier.blank?
-            end
+            @plugins.dispatch(:profile_editor_transaction_extras)
+            @profile_data.update_attributes!(params[:profile_data])
+            redirect_to :action => 'index', :profile => profile.identifier
           end
         end
       rescue Exception => ex
-        if profile.identifier.blank?
-          profile.identifier = params[:profile]
-        end
+        profile.identifier = params[:profile] if profile.identifier.blank?
       end
     end
   end
@@ -93,13 +93,7 @@ class AccountController &lt; ApplicationController
       @user.terms_of_use = environment.terms_of_use
       @user.environment = environment
       @terms_of_use = environment.terms_of_use
-
-      params_profile_data = params[:profile_data]
-      @plugins.dispatch(:extra_person_data_params).each do |data|
-        params_profile_data = params_profile_data.merge(data) unless params[:profile_data].blank?
-      end
-
-      @user.person_data = params_profile_data
+      @user.person_data = params[:profile_data]
       @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
@@ -29,8 +29,6 @@ class User &lt; ActiveRecord::Base
     alias_method_chain :human_attribute_name, :customization
   end
-  include Noosfero::Plugin::HotSpot
-
   before_create do |user|
     if user.environment.nil?
       user.environment = Environment.default
@@ -48,7 +46,6 @@ class User &lt; ActiveRecord::Base
       p.environment = user.environment
       p.name ||= user.name || user.login
       p.visible = false unless user.activated?
-
       p.save!
       user.person = p
 # encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
 #
 # Note that this schema.rb definition is the authoritative source for your
 # database schema. If you need to create the application database on another
@@ -762,3 +762,11 @@ When /^I confirm the &quot;(.*)&quot; dialog$/ do |confirmation|
   assert_equal confirmation, a.text
   a.accept
 end
+
+Given /^the field (.*) is public for all users$/ do |field|
+  Person.all.each do |person|
+    person.fields_privacy = Hash.new if person.fields_privacy.nil?
+    person.fields_privacy[field] = "public"
+    person.save!
+  end
+end
 \ No newline at end of file
@@ -537,23 +537,12 @@ class Noosfero::Plugin
     nil
   end
-  # -> Return a list of extra person fields
-  # returns = a list of strings with fields' name
-  def extra_person_fields
-    []
-  end
-
   # -> Return a list of hashs with the needed information to create optional fields
   # returns = a list of hashs as {:name => "string", :label => "string", :object_name => :key, :method => :key}
   def extra_optional_fields
     []
   end
-  # -> Return a hash with another object's params
-  def extra_person_data_params
-    {}
-  end
-
   # -> Adds additional blocks to profiles and environments.
   # Your plugin must implements a class method called 'extra_blocks'
   # that returns a hash with the following syntax.
@@ -0,0 +1,45 @@
+README - Lattes Curriculum (LattesCurriculum Plugin)
+================================
+
+Lattes Curriculum is a plugin that allow users to show their academic informations in the wall, extracted from CNPQ's lattes plataform
+
+INSTALL
+=======
+
+Enable Plugin
+-------------
+
+Also, you need to enable LattesCurriculum Plugin on your Noosfero:
+
+cd <your_noosfero_dir>
+./script/noosfero-plugins enable lattes_curriculum
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "LattesCurriculumPlugin" check-box
+
+Running LattesCurriculum tests
+--------------------
+
+$ rake test:noosfero_plugins:lattes_curriculum
+
+LICENSE
+=======
+
+Copyright (c) The Author developers.
+
+See Noosfero license.
+
+
+AUTHORS
+=======
+
+Jose Pedro (1jpsneto at gmail.com)
+Thiago Kairala (thiagor.kairala at gmail.com)
+Ana Paula Vargas (anapaulavnoronha at gmail.com)
+Leandro Veloso (leandrovelosorodrigues at gmail.com)
+Arthur Del Esposte (arthurmde at gmail.com)
 \ No newline at end of file
 class CreateAcademicInfos < ActiveRecord::Migration
   def self.up
-  	create_table :academic_infos do |t|
-  	  t.references :person
+    create_table :academic_infos do |t|
+      t.references :person
       t.column :lattes_url, :string
     end
-  end
+   end
   def self.down
     drop_table :academic_infos
@@ -7,55 +7,43 @@ Feature: import lattes information
     Given "LattesCurriculumPlugin" plugin is enabled
     And I am logged in as admin
     And I go to /admin/plugins
-    And I check "LattesCurriculumPlugin"
+    And I check "Lattes Curriculum Plugin"
     And I press "Save changes"
     And I go to /admin/features/manage_fields
     Given I follow "Person's fields"
     And I check "person_fields_lattes_url_active"
     And I check "person_fields_lattes_url_signup"
     And I press "save_person_fields"
-    And feature "skip_new_user_email_confirmation" is enabled on environment
-    And I am not logged in 
-  @selenium
-  Scenario: Import lattes informations after singup
-    Given I am on signup page
-    When I fill in "e-Mail" with "josesilva@example.com"
-    And I fill in "Username" with "josesilva"
-    And I fill in "Full name" with "João Silva"
-    And I fill in "Password" with "secret"
-    And I fill in "Password confirmation" with "secret"
+  Scenario: Don't accept edit the profile with invalid lattes url
+    Given I am on admin_user's control panel
+    When I follow "Edit Profile"
+    And I fill in "Lattes URL" with "http://youtube.com.br/"
+    And I press "Save"
+    Then I should see "Academic info lattes url is invalid"
+
+  Scenario: Import lattes informations
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
     And I fill in "Lattes URL" with "http://lattes.cnpq.br/2864976228727880"
-    And wait for the captcha signup time
-    And I press "Create my account"
-    And I go to /profile/josesilva
-    And I follow "Lattes" within "#ui-tabs-anchor"
+    And I press "Save"
+    And I go to /profile/admin_user#lattes_tab
     Then I should see "Endereço para acessar este CV: http://lattes.cnpq.br/2864976228727880"
-  @selenium
   Scenario: Don't show lattes informations for blank lattes urls
-    Given I am on signup page
-    When I fill in "e-Mail" with "josesilva@example.com"
-    And I fill in "Username" with "josesilva"
-    And I fill in "Full name" with "João Silva"
-    And I fill in "Password" with "secret"
-    And I fill in "Password confirmation" with "secret"
-    And wait for the captcha signup time
-    And I press "Create my account"
-    And I go to /profile/josesilva
-    Then I should not see "Lattes" within "#ui-tabs-anchor"
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
+    And I press "Save"
+    And I go to /profile/admin_user
+    Then I should not see "Lattes"
-  @selenium
   Scenario: Inform problem if the informed lattes doesn't exist
-    Given I am on signup page
-    When I fill in "e-Mail" with "josesilva@example.com"
-    And I fill in "Username" with "josesilva"
-    And I fill in "Full name" with "João Silva"
-    And I fill in "Password" with "secret"
-    And I fill in "Password confirmation" with "secret"
+    Given I am on admin_user's control panel
+    And the field lattes_url is public for all users
+    When I follow "Edit Profile"
     And I fill in "Lattes URL" with "http://lattes.cnpq.br/123456"
-    And wait for the captcha signup time
-    And I press "Create my account"
-    And I go to /profile/josesilva
-    And I follow "Lattes" within "#ui-tabs-anchor"
+    And I press "Save"
+    And I go to /profile/admin_user#lattes_tab
     Then I should see "Lattes not found. Please, make sure the informed URL is correct."
 \ No newline at end of file
 class AcademicInfo < ActiveRecord::Base
-	belongs_to :person
+  belongs_to :person
-	attr_accessible :lattes_url
+  attr_accessible :lattes_url
   validate :lattes_url_validate?
   def lattes_url_validate?
-    valid_url_start = 'http://lattes.cnpq.br/'
-    unless self.lattes_url.blank? || self.lattes_url =~ /http:\/\/lattes.cnpq.br\/\d+/ 
-      self.errors.add(:lattes_url, _("Sorry, the lattes url is not valid."))
+    unless AcademicInfo.matches?(self.lattes_url)
+      self.errors.add(:lattes_url, _(" is invalid."))
     end
   end
+
+  def self.matches?(info)
+    lattes = nil
+    if info.class == String
+      lattes = info
+    elsif info.class == Hash
+      lattes = info[:lattes_url]
+    end
+    return lattes.blank? || lattes =~ /^http:\/\/lattes.cnpq.br\/\d+$/
+  end
 end
@@ -15,4 +15,6 @@ class Person
   def lattes_url= value
     self.academic_info.lattes_url = value unless self.academic_info.nil?
   end
+
+  FIELDS << "lattes_url"
 end
@@ -6,8 +6,8 @@ Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 class Html_parser
-	def get_html(lattes_link = "")
-		begin
+  def get_html(lattes_link = "")
+    begin
       page = Nokogiri::HTML(open(lattes_link), nil, "UTF-8")
       page = page.css(".main-content").to_s()
       page = remove_class_tooltip(page)
@@ -17,8 +17,10 @@ class Html_parser
       page = remove_further_informations(page)
 		rescue OpenURI::HTTPError => e
       page = _("Lattes not found. Please, make sure the informed URL is correct.")
-		end
-	end
+    rescue Timeout::Error => e
+      page = _("Lattes Platform is unreachable. Please, try it later.")
+    end
+  end
   def remove_class_tooltip(page = "")
     while page.include? 'class="tooltip"' do
 class LattesCurriculumPlugin < Noosfero::Plugin
   def self.plugin_name
-    "LattesCurriculumPlugin"
+    "Lattes Curriculum Plugin"
   end
   def self.plugin_description
@@ -17,10 +17,6 @@ class LattesCurriculumPlugin &lt; Noosfero::Plugin
   end
   def extra_optional_fields
-    if context.profile && context.profile.person? && context.profile.academic_info.nil?
-      context.profile.academic_info = AcademicInfo.new
-    end
-
     fields = []
     lattes_url = {
@@ -36,20 +32,8 @@ class LattesCurriculumPlugin &lt; Noosfero::Plugin
     return fields
   end
-  def extra_person_fields
-    fields = []
-
-    fields << "lattes_url"
-
-    return fields
-  end
-
-  def extra_person_data_params
-    {"academic_info_attributes" => context.params[:academic_infos]}
-  end
-
   def profile_tabs
-    unless context.profile.academic_info.nil? || context.profile.academic_info.lattes_url.blank?
+    if show_lattes_tab?
       href = context.profile.academic_info.lattes_url
       html_parser = Html_parser.new
       {
@@ -69,6 +53,78 @@ class LattesCurriculumPlugin &lt; Noosfero::Plugin
     end
   end
+  def profile_editor_controller_filters
+    validate_lattes_url_block = proc do
+      if request.post?
+        if !params[:academic_infos].blank?
+          @profile_data = profile
+
+          academic_infos = {"academic_info_attributes" => params[:academic_infos]}
+
+          params_profile_data = params[:profile_data]
+          params_profile_data = params_profile_data.merge(academic_infos)
+
+          @profile_data.attributes = params_profile_data
+          @profile_data.valid?
+
+          @possible_domains = profile.possible_domains
+
+          unless AcademicInfo.matches?(params[:academic_infos])
+            @profile_data.errors.add(:lattes_url, _(' Invalid lattes url'))
+            render :action => :edit, :profile => profile.identifier
+          end
+        end
+      end
+    end
+
+    create_academic_info_block = proc do
+      if profile && profile.person? && profile.academic_info.nil?
+        profile.academic_info = AcademicInfo.new
+      end
+    end
+
+    [{:type => 'before_filter',
+      :method_name => 'validate_lattes_url',
+      :options => {:only => 'edit'},
+      :block => validate_lattes_url_block },
+    {:type => 'before_filter',
+      :method_name => 'create_academic_info',
+      :options => {:only => 'edit'},
+      :block => create_academic_info_block }]
+  end
+
+  def account_controller_filters
+    validate_lattes_url_block = proc do
+      if request.post?
+        params[:profile_data] ||= {}
+        params[:profile_data][:academic_info_attributes] = params[:academic_infos]
+
+        if !params[:academic_infos].blank? && !AcademicInfo.matches?(params[:academic_infos])
+          @person = Person.new(params[:profile_data])
+          @person.environment = environment
+          @user = User.new(params[:user])
+          @person.errors.add(:lattes_url, _(' Invalid lattes url'))
+          render :action => :signup
+        end
+      end
+    end
+
+    create_academic_info_block = proc do
+      if profile && profile.person? && profile.academic_info.nil?
+        profile.academic_info = AcademicInfo.new
+      end
+    end
+
+    [{:type => 'before_filter',
+      :method_name => 'validate_lattes_url',
+      :options => {:only => 'signup'},
+      :block => validate_lattes_url_block },
+    {:type => 'before_filter',
+      :method_name => 'create_academic_info',
+      :options => {:only => 'edit'},
+      :block => create_academic_info_block }]
+  end
+
   protected
   def academic_info_transaction
@@ -77,4 +133,7 @@ class LattesCurriculumPlugin &lt; Noosfero::Plugin
     end
   end
+  def show_lattes_tab?
+    return context.profile.person? && !context.profile.academic_info.nil? && !context.profile.academic_info.lattes_url.blank? && context.profile.public_fields.include?("lattes_url")
+  end
 end
 jQuery(function($){
-	$(document).ready(function(){
-		$('#lattes_id_field').blur(function(){
-			var value = this.value
-		})
+  $(document).ready(function(){
+    $('#lattes_id_field').blur(function(){
+      var value = this.value
+    })
-		$('#lattes_id_field').focus(function(){
-			$('#lattes-id-balloon').fadeIn('slow')
-		})
+    $('#lattes_id_field').focus(function(){
+      $('#lattes-id-balloon').fadeIn('slow')
+    })
-		$('#lattes_id_field').blur(function(){
-			$('#lattes-id-balloon').fadeOut('slow')
-		})
-	})
+    $('#lattes_id_field').blur(function(){
+      $('#lattes-id-balloon').fadeOut('slow')
+    })
+  })
 })
 \ No newline at end of file
@@ -20,6 +20,4 @@ class AcademicInfoTest &lt; ActiveSupport::TestCase
     @academic_info.lattes_url = "http://lattes.cnpq.br/2193972715230641"
     assert @academic_info.save
   end
-
-
 end
@@ -21,5 +21,4 @@ class HtmlParserTest &lt; ActiveSupport::TestCase
   should 'inform that lattes was not found' do
     assert_equal "Lattes not found. Please, make sure the informed URL is correct.", @parser.get_html("http://lattes.cnpq.br/123")
   end
-
 end
@@ -11,7 +11,7 @@ class LattesCurriculumPluginTest &lt; ActiveSupport::TestCase
   end
   should 'have name' do
-    assert_equal 'LattesCurriculumPlugin', LattesCurriculumPlugin.plugin_name
+    assert_equal 'Lattes Curriculum Plugin', LattesCurriculumPlugin.plugin_name
   end
   should 'have description' do
@@ -21,5 +21,4 @@ class LattesCurriculumPluginTest &lt; ActiveSupport::TestCase
   should 'have stylesheet' do
     assert @plugin.stylesheet?
   end
-
 end
1	# encoding: UTF-8	1	# encoding: UTF-8
2	# This file is auto-generated from the current state of the database. Instead	2	# This file is auto-generated from the current state of the database. Instead
3	# of editing this file, please use the migrations feature of Active Record to	3	# of editing this file, please use the migrations feature of Active Record to
		4	+# incrementally modify your database, and then regenerate this schema definition.
4	#	5	#
5	# Note that this schema.rb definition is the authoritative source for your	6	# Note that this schema.rb definition is the authoritative source for your
6	# database schema. If you need to create the application database on another	7	# database schema. If you need to create the application database on another
	@@ -762,3 +762,11 @@ When /^I confirm the "(.*)" dialog$/ do \|confirmation\|		@@ -762,3 +762,11 @@ When /^I confirm the "(.*)" dialog$/ do \|confirmation\|
762	assert_equal confirmation, a.text	762	assert_equal confirmation, a.text
763	a.accept	763	a.accept
764	end	764	end
		765	+
		766	+Given /^the field (.*) is public for all users$/ do \|field\|
		767	+ Person.all.each do \|person\|
		768	+ person.fields_privacy = Hash.new if person.fields_privacy.nil?
		769	+ person.fields_privacy[field] = "public"
		770	+ person.save!
		771	+ end
		772	+end
765	\ No newline at end of file	773	\ No newline at end of file
	@@ -0,0 +1,45 @@		@@ -0,0 +1,45 @@
		1	+README - Lattes Curriculum (LattesCurriculum Plugin)
		2	+================================
		3	+
		4	+Lattes Curriculum is a plugin that allow users to show their academic informations in the wall, extracted from CNPQ's lattes plataform
		5	+
		6	+INSTALL
		7	+=======
		8	+
		9	+Enable Plugin
		10	+-------------
		11	+
		12	+Also, you need to enable LattesCurriculum Plugin on your Noosfero:
		13	+
		14	+cd <your_noosfero_dir>
		15	+./script/noosfero-plugins enable lattes_curriculum
		16	+
		17	+Active Plugin
		18	+-------------
		19	+
		20	+As a Noosfero administrator user, go to administrator panel:
		21	+
		22	+- Click on "Enable/disable plugins" option
		23	+- Click on "LattesCurriculumPlugin" check-box
		24	+
		25	+Running LattesCurriculum tests
		26	+--------------------
		27	+
		28	+$ rake test:noosfero_plugins:lattes_curriculum
		29	+
		30	+LICENSE
		31	+=======
		32	+
		33	+Copyright (c) The Author developers.
		34	+
		35	+See Noosfero license.
		36	+
		37	+
		38	+AUTHORS
		39	+=======
		40	+
		41	+Jose Pedro (1jpsneto at gmail.com)
		42	+Thiago Kairala (thiagor.kairala at gmail.com)
		43	+Ana Paula Vargas (anapaulavnoronha at gmail.com)
		44	+Leandro Veloso (leandrovelosorodrigues at gmail.com)
		45	+Arthur Del Esposte (arthurmde at gmail.com)
0	\ No newline at end of file	46	\ No newline at end of file
	@@ -15,4 +15,6 @@ class Person		@@ -15,4 +15,6 @@ class Person
15	def lattes_url= value	15	def lattes_url= value
16	self.academic_info.lattes_url = value unless self.academic_info.nil?	16	self.academic_info.lattes_url = value unless self.academic_info.nil?
17	end	17	end
		18	+
		19	+ FIELDS << "lattes_url"
18	end	20	end
1	class LattesCurriculumPlugin < Noosfero::Plugin	1	class LattesCurriculumPlugin < Noosfero::Plugin
2		2
3	def self.plugin_name	3	def self.plugin_name
4	- "LattesCurriculumPlugin"	4	+ "Lattes Curriculum Plugin"
5	end	5	end
6		6
7	def self.plugin_description	7	def self.plugin_description
	@@ -17,10 +17,6 @@ class LattesCurriculumPlugin < Noosfero::Plugin		@@ -17,10 +17,6 @@ class LattesCurriculumPlugin < Noosfero::Plugin
17	end	17	end
18		18
19	def extra_optional_fields	19	def extra_optional_fields
20	- if context.profile && context.profile.person? && context.profile.academic_info.nil?
21	- context.profile.academic_info = AcademicInfo.new
22	- end
23	-
24	fields = []	20	fields = []
25		21
26	lattes_url = {	22	lattes_url = {
	@@ -36,20 +32,8 @@ class LattesCurriculumPlugin < Noosfero::Plugin		@@ -36,20 +32,8 @@ class LattesCurriculumPlugin < Noosfero::Plugin
36	return fields	32	return fields
37	end	33	end
38		34
39	- def extra_person_fields
40	- fields = []
41	-
42	- fields << "lattes_url"
43	-
44	- return fields
45	- end
46	-
47	- def extra_person_data_params
48	- {"academic_info_attributes" => context.params[:academic_infos]}
49	- end
50	-
51	def profile_tabs	35	def profile_tabs
52	- unless context.profile.academic_info.nil? \|\| context.profile.academic_info.lattes_url.blank?	36	+ if show_lattes_tab?
53	href = context.profile.academic_info.lattes_url	37	href = context.profile.academic_info.lattes_url
54	html_parser = Html_parser.new	38	html_parser = Html_parser.new
55	{	39	{
	@@ -69,6 +53,78 @@ class LattesCurriculumPlugin < Noosfero::Plugin		@@ -69,6 +53,78 @@ class LattesCurriculumPlugin < Noosfero::Plugin
69	end	53	end
70	end	54	end
71		55
		56	+ def profile_editor_controller_filters
		57	+ validate_lattes_url_block = proc do
		58	+ if request.post?
		59	+ if !params[:academic_infos].blank?
		60	+ @profile_data = profile
		61	+
		62	+ academic_infos = {"academic_info_attributes" => params[:academic_infos]}
		63	+
		64	+ params_profile_data = params[:profile_data]
		65	+ params_profile_data = params_profile_data.merge(academic_infos)
		66	+
		67	+ @profile_data.attributes = params_profile_data
		68	+ @profile_data.valid?
		69	+
		70	+ @possible_domains = profile.possible_domains
		71	+
		72	+ unless AcademicInfo.matches?(params[:academic_infos])
		73	+ @profile_data.errors.add(:lattes_url, _(' Invalid lattes url'))
		74	+ render :action => :edit, :profile => profile.identifier
		75	+ end
		76	+ end
		77	+ end
		78	+ end
		79	+
		80	+ create_academic_info_block = proc do
		81	+ if profile && profile.person? && profile.academic_info.nil?
		82	+ profile.academic_info = AcademicInfo.new
		83	+ end
		84	+ end
		85	+
		86	+ [{:type => 'before_filter',
		87	+ :method_name => 'validate_lattes_url',
		88	+ :options => {:only => 'edit'},
		89	+ :block => validate_lattes_url_block },
		90	+ {:type => 'before_filter',
		91	+ :method_name => 'create_academic_info',
		92	+ :options => {:only => 'edit'},
		93	+ :block => create_academic_info_block }]
		94	+ end
		95	+
		96	+ def account_controller_filters
		97	+ validate_lattes_url_block = proc do
		98	+ if request.post?
		99	+ params[:profile_data] \|\|= {}
		100	+ params[:profile_data][:academic_info_attributes] = params[:academic_infos]
		101	+
		102	+ if !params[:academic_infos].blank? && !AcademicInfo.matches?(params[:academic_infos])
		103	+ @person = Person.new(params[:profile_data])
		104	+ @person.environment = environment
		105	+ @user = User.new(params[:user])
		106	+ @person.errors.add(:lattes_url, _(' Invalid lattes url'))
		107	+ render :action => :signup
		108	+ end
		109	+ end
		110	+ end
		111	+
		112	+ create_academic_info_block = proc do
		113	+ if profile && profile.person? && profile.academic_info.nil?
		114	+ profile.academic_info = AcademicInfo.new
		115	+ end
		116	+ end
		117	+
		118	+ [{:type => 'before_filter',
		119	+ :method_name => 'validate_lattes_url',
		120	+ :options => {:only => 'signup'},
		121	+ :block => validate_lattes_url_block },
		122	+ {:type => 'before_filter',
		123	+ :method_name => 'create_academic_info',
		124	+ :options => {:only => 'edit'},
		125	+ :block => create_academic_info_block }]
		126	+ end
		127	+
72	protected	128	protected
73		129
74	def academic_info_transaction	130	def academic_info_transaction
	@@ -77,4 +133,7 @@ class LattesCurriculumPlugin < Noosfero::Plugin		@@ -77,4 +133,7 @@ class LattesCurriculumPlugin < Noosfero::Plugin
77	end	133	end
78	end	134	end
79		135
		136	+ def show_lattes_tab?
		137	+ return context.profile.person? && !context.profile.academic_info.nil? && !context.profile.academic_info.lattes_url.blank? && context.profile.public_fields.include?("lattes_url")
		138	+ end
80	end	139	end
	@@ -20,6 +20,4 @@ class AcademicInfoTest < ActiveSupport::TestCase		@@ -20,6 +20,4 @@ class AcademicInfoTest < ActiveSupport::TestCase
20	@academic_info.lattes_url = "http://lattes.cnpq.br/2193972715230641"	20	@academic_info.lattes_url = "http://lattes.cnpq.br/2193972715230641"
21	assert @academic_info.save	21	assert @academic_info.save
22	end	22	end
23	-
24	-
25	end	23	end
	@@ -21,5 +21,4 @@ class HtmlParserTest < ActiveSupport::TestCase		@@ -21,5 +21,4 @@ class HtmlParserTest < ActiveSupport::TestCase
21	should 'inform that lattes was not found' do	21	should 'inform that lattes was not found' do
22	assert_equal "Lattes not found. Please, make sure the informed URL is correct.", @parser.get_html("http://lattes.cnpq.br/123")	22	assert_equal "Lattes not found. Please, make sure the informed URL is correct.", @parser.get_html("http://lattes.cnpq.br/123")
23	end	23	end
24	-
25	end	24	end