gov-user: adequate models with proper namespacese

Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Closes #323

gov-user: adequate models with proper namespacese
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com> Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br> Closes #323
Rodrigo Souto
1 parent 6ead4aee
Showing 58 changed files with 902 additions and 915 deletions Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb
src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb
src/noosfero-spb/gov_user/db/migrate/20151019174219_rename_tables_with_plugin_namespace.rb
src/noosfero-spb/gov_user/features/institution_registration.feature
src/noosfero-spb/gov_user/features/step_definitions/gov_user_steps.rb
src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps.rb
src/noosfero-spb/gov_user/features/user_profile_edition.feature
src/noosfero-spb/gov_user/lib/ext/community.rb
src/noosfero-spb/gov_user/lib/ext/organization_rating.rb
src/noosfero-spb/gov_user/lib/ext/search_controller.rb
src/noosfero-spb/gov_user/lib/ext/search_helper.rb
src/noosfero-spb/gov_user/lib/ext/user.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_power.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/governmental_sphere.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/institution.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_block.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/institutions_users.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/juridical_nature.rb
src/noosfero-spb/gov_user/lib/gov_user_plugin/private_institution.rb
@@ -18,7 +18,6 @@ class GovUserPluginController &lt; ApplicationController
   def create_institution
     create_institution_view_variables
-
     if request.xhr?
       render :layout=>false
     else
@@ -57,7 +56,7 @@ class GovUserPluginController &lt; ApplicationController
   def institution_already_exists
     redirect_to "/" if !request.xhr? || params[:name].blank?
-    already_exists = !Institution.find_by_name(params[:name]).nil?
+    already_exists = !GovUserPlugin::Institution.find_by_name(params[:name]).nil?
     render :json=>already_exists.to_json
   end
@@ -65,7 +64,7 @@ class GovUserPluginController &lt; ApplicationController
   def get_institutions
     redirect_to "/" if !request.xhr? || params[:query].blank?
-    institutions = Institution.search_institution(params[:query]).select([:id, :name])
+    institutions = GovUserPlugin::Institution.search_institution(params[:query]).select([:id, :name])
     institutions_list = institutions.map { |institution|
       {:value=>institution.name, :id=>institution.id}
     }
@@ -135,17 +134,17 @@ class GovUserPluginController &lt; ApplicationController
   def get_governmental_spheres
     spheres = [[_("Select a Governmental Sphere"), 0]]
-    spheres.concat get_model_as_option_list(GovernmentalSphere)
+    spheres.concat get_model_as_option_list(GovUserPlugin::GovernmentalSphere)
   end
   def get_governmental_powers
     powers = [[_("Select a Governmental Power"), 0]]
-    powers.concat get_model_as_option_list(GovernmentalPower)
+    powers.concat get_model_as_option_list(GovUserPlugin::GovernmentalPower)
   end
   def get_juridical_natures
     natures = [[_("Select a Juridical Nature"), 0]]
-    natures.concat get_model_as_option_list(JuridicalNature)
+    natures.concat get_model_as_option_list(GovUserPlugin::JuridicalNature)
   end
   def get_model_as_option_list model
@@ -157,10 +156,10 @@ class GovUserPluginController &lt; ApplicationController
                                                       :governmental_sphere,
                                                       :juridical_nature
                                                      )
-    if params[:institutions][:type] == "PublicInstitution"
-      PublicInstitution::new institution_params
+    if params[:institutions][:type] == "GovUserPlugin::PublicInstitution"
+      GovUserPlugin::PublicInstitution::new institution_params
     else
-      PrivateInstitution::new institution_params
+      GovUserPlugin::PrivateInstitution::new institution_params
     end
   end
@@ -168,9 +167,9 @@ class GovUserPluginController &lt; ApplicationController
     inst_fields = params[:institutions]
     begin
-      gov_power = GovernmentalPower.find inst_fields[:governmental_power]
-      gov_sphere = GovernmentalSphere.find inst_fields[:governmental_sphere]
-      jur_nature = JuridicalNature.find inst_fields[:juridical_nature]
+      gov_power = GovUserPlugin::GovernmentalPower.find inst_fields[:governmental_power]
+      gov_sphere = GovUserPlugin::GovernmentalSphere.find inst_fields[:governmental_sphere]
+      jur_nature = GovUserPlugin::JuridicalNature.find inst_fields[:juridical_nature]
       institution.juridical_nature = jur_nature
       institution.governmental_power = gov_power
@@ -191,7 +190,7 @@ class GovUserPluginController &lt; ApplicationController
     institution.name = community[:name]
     institution.community = community
-    if institution.type == "PublicInstitution"
+    if institution.type == "GovUserPlugin::PublicInstitution"
       set_public_institution_fields institution
     end
@@ -20,7 +20,7 @@ class GovUserPluginMyprofileController &lt; MyProfileController
   def update_institution
     @institution.community.update_attributes(params[:community])
     @institution.update_attributes(params[:institutions].except(:governmental_power, :governmental_sphere, :juridical_nature))
-    if @institution.type == "PublicInstitution"
+    if @institution.type == "GovUserPlugin::PublicInstitution"
       begin
         governmental_updates
       rescue
@@ -36,15 +36,13 @@ class GovUserPluginMyprofileController &lt; MyProfileController
   end
   def governmental_updates
-    gov_power = GovernmentalPower.find params[:institutions][:governmental_power]
-    gov_sphere = GovernmentalSphere.find params[:institutions][:governmental_sphere]
-    jur_nature = JuridicalNature.find params[:institutions][:juridical_nature]
+    gov_power = GovUserPlugin::GovernmentalPower.find params[:institutions][:governmental_power]
+    gov_sphere = GovUserPlugin::GovernmentalSphere.find params[:institutions][:governmental_sphere]
+    jur_nature = GovUserPlugin::JuridicalNature.find params[:institutions][:juridical_nature]
     @institution.juridical_nature = jur_nature
     @institution.governmental_power = gov_power
     @institution.governmental_sphere = gov_sphere
     @institution.save
   end
-
-
 end
@@ -0,0 +1,9 @@
+class RenameTablesWithPluginNamespace < ActiveRecord::Migration
+  def change
+    rename_table :institutions, :gov_user_plugin_institutions
+    rename_table :governmental_spheres, :gov_user_plugin_governmental_spheres
+    rename_table :governmental_powers, :gov_user_plugin_governmental_powers
+    rename_table :juridical_natures, :gov_user_plugin_juridical_natures
+    rename_table :institutions_users, :gov_user_plugin_institutions_users
+  end
+end
@@ -4,13 +4,9 @@ Feature: Institution Field
   So others users can use it
   Background:
-    Given "GovUserPlugin" plugin is enabled
+    Given plugin GovUser is enabled on environment
     And I am logged in as mpog_admin
-    And I go to /admin/plugins
-    And I check "GovUserPlugin"
-    And I press "Save changes"
     And Institutions has initial default values on database
-    And I am logged in as mpog_admin
   @selenium
   Scenario: Show new institution fields when clicked in create new institution
@@ -0,0 +1,90 @@
+Given /^Institutions has initial default values on database$/ do
+  GovUserPlugin::GovernmentalPower.create(:name => "Executivo")
+  GovUserPlugin::GovernmentalPower.create(:name => "Legislativo")
+  GovUserPlugin::GovernmentalPower.create(:name => "Judiciario")
+
+  GovUserPlugin::GovernmentalSphere.create(:name => "Federal")
+
+  GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+  GovUserPlugin::JuridicalNature.create(:name => "Administracao Direta")
+  GovUserPlugin::JuridicalNature.create(:name => "Empresa Publica")
+  GovUserPlugin::JuridicalNature.create(:name => "Fundacao")
+  GovUserPlugin::JuridicalNature.create(:name => "Orgao Autonomo")
+  GovUserPlugin::JuridicalNature.create(:name => "Sociedade")
+  GovUserPlugin::JuridicalNature.create(:name => "Sociedade Civil")
+  GovUserPlugin::JuridicalNature.create(:name => "Sociedade de Economia Mista")
+
+  national_region = NationalRegion.new
+  national_region.name = "Distrito Federal"
+  national_region.national_region_code = '35'
+  national_region.national_region_type_id = NationalRegionType::STATE
+  national_region.save
+end
+
+Given /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*)"$/ do |typed, input_field_selector, should_select|
+# Wait the page javascript load
+sleep 1
+# Basicaly it, search for the input field, type something, wait for ajax end select an item
+page.driver.browser.execute_script %Q{
+  var search_query = "#{input_field_selector}.ui-autocomplete-input";
+  var input = jQuery(search_query).first();
+
+  input.trigger('click');
+  input.val('#{typed}');
+  input.trigger('keydown');
+
+  window.setTimeout(function(){
+    search_query = ".ui-menu-item a:contains('#{should_select}')";
+    var typed = jQuery(search_query).first();
+
+    typed.trigger('mouseenter').trigger('click');
+    console.log(jQuery('#license_info_id'));
+    }, 1000);
+  }
+  sleep 1
+end
+
+Given /^the following public institutions?$/ do |table|
+  # table is a Cucumber::Ast::Table
+  table.hashes.each do |item|
+    community = Community.new
+    community.name = item[:name]
+    community.country = item[:country]
+    community.state = item[:state]
+    community.city = item[:city]
+    community.save!
+
+    governmental_power = GovUserPlugin::GovernmentalPower.where(:name => item[:governmental_power]).first
+    governmental_sphere = GovUserPlugin::GovernmentalSphere.where(:name => item[:governmental_sphere]).first
+
+    juridical_nature = GovUserPlugin::JuridicalNature.create(:name => item[:juridical_nature])
+
+    institution = GovUserPlugin::PublicInstitution.new(:name => item[:name], :type => "GovUserPlugin::PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere)
+    institution.community = community
+    institution.corporate_name = item[:corporate_name]
+    institution.save!
+  end
+end
+
+Given /^I sleep for (\d+) seconds$/ do |time|
+  sleep time.to_i
+end
+
+Given /^I am logged in as mpog_admin$/ do
+  visit('/account/logout')
+
+  user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
+  person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
+  user.person = person
+  user.save!
+
+  user.activate
+  e = Environment.default
+  e.add_admin(user.person)
+
+  visit('/account/login')
+  fill_in("Username", :with => user.login)
+  fill_in("Password", :with => '123456')
+  click_button("Log in")
+end
+
@@ -1,90 +0,0 @@
-Given /^Institutions has initial default values on database$/ do
-  GovernmentalPower.create(:name => "Executivo")
-  GovernmentalPower.create(:name => "Legislativo")
-  GovernmentalPower.create(:name => "Judiciario")
-
-  GovernmentalSphere.create(:name => "Federal")
-
-  JuridicalNature.create(:name => "Autarquia")
-  JuridicalNature.create(:name => "Administracao Direta")
-  JuridicalNature.create(:name => "Empresa Publica")
-  JuridicalNature.create(:name => "Fundacao")
-  JuridicalNature.create(:name => "Orgao Autonomo")
-  JuridicalNature.create(:name => "Sociedade")
-  JuridicalNature.create(:name => "Sociedade Civil")
-  JuridicalNature.create(:name => "Sociedade de Economia Mista")
-
-  national_region = NationalRegion.new
-  national_region.name = "Distrito Federal"
-  national_region.national_region_code = '35'
-  national_region.national_region_type_id = NationalRegionType::STATE
-  national_region.save
-end
-
-Given /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*)"$/ do |typed, input_field_selector, should_select|
-# Wait the page javascript load
-sleep 1
-# Basicaly it, search for the input field, type something, wait for ajax end select an item
-page.driver.browser.execute_script %Q{
-  var search_query = "#{input_field_selector}.ui-autocomplete-input";
-  var input = jQuery(search_query).first();
-
-  input.trigger('click');
-  input.val('#{typed}');
-  input.trigger('keydown');
-
-  window.setTimeout(function(){
-    search_query = ".ui-menu-item a:contains('#{should_select}')";
-    var typed = jQuery(search_query).first();
-
-    typed.trigger('mouseenter').trigger('click');
-    console.log(jQuery('#license_info_id'));
-    }, 1000);
-  }
-  sleep 1
-end
-
-Given /^the following public institutions?$/ do |table|
-  # table is a Cucumber::Ast::Table
-  table.hashes.each do |item|
-    community = Community.new
-    community.name = item[:name]
-    community.country = item[:country]
-    community.state = item[:state]
-    community.city = item[:city]
-    community.save!
-
-    governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first
-    governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first
-
-    juridical_nature = JuridicalNature.create(:name => item[:juridical_nature])
-
-    institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere)
-    institution.community = community
-    institution.corporate_name = item[:corporate_name]
-    institution.save!
-  end
-end
-
-Given /^I sleep for (\d+) seconds$/ do |time|
-  sleep time.to_i
-end
-
-Given /^I am logged in as mpog_admin$/ do
-  visit('/account/logout')
-
-  user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
-  person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
-  user.person = person
-  user.save!
-
-  user.activate
-  e = Environment.default
-  e.add_admin(user.person)
-
-  visit('/account/login')
-  fill_in("Username", :with => user.login)
-  fill_in("Password", :with => '123456')
-  click_button("Log in")
-end
-
@@ -4,14 +4,11 @@ Feature: Institution Field
   So I can maintain my personal data updated
   Background:
-    Given "GovUserPlugin" plugin is enabled
+    Given plugin GovUser is enabled on environment
     And the following users
       | login | name        |
       | joao  | Joao Silva  |
     And I am logged in as admin
-    And I go to /admin/plugins
-    And I check "GovUserPlugin"
-    And I press "Save changes"
     And feature "skip_new_user_email_confirmation" is enabled on environment
     And I go to /admin/features/manage_fields
     And I check "person_fields_country_active"
@@ -44,11 +41,8 @@ Feature: Institution Field
     Given I am logged in as "joao"
     And I am on joao's control panel
     When I follow "Edit Profile"
-    And I follow "Add new institution"
     And I type in "Minis" in autocomplete list "#input_institution" and I choose "Ministerio do Planejamento"
-    And I follow "Add new institution"
     And I type in "Gover" in autocomplete list "#input_institution" and I choose "Governo do DF"
-    And I follow "Add new institution"
     Then I should see "Ministerio do Planejamento" within ".institutions_added"
     And I should see "Governo do DF" within ".institutions_added"
 require_dependency 'community'
 class Community
-  has_one :institution, :dependent=>:destroy
+  has_one :institution, :class_name => 'GovUserPlugin::Institution', :dependent=>:destroy
   def institution?
     return !institution.nil?
@@ -2,7 +2,7 @@ require_dependency &quot;organization_rating&quot;
 OrganizationRating.class_eval do
-  belongs_to :institution
+  belongs_to :institution, :class_name => 'GovUserPlugin::Institution'
   attr_accessible :institution, :institution_id
@@ -12,7 +12,7 @@ OrganizationRating.class_eval do
   def verify_institution
     if self.institution != nil
-      institution = Institution.find_by_id self.institution.id
+      institution = GovUserPlugin::Institution.find_by_id self.institution.id
       self.errors.add :institution, _("not found") unless institution
     end
   end
@@ -14,7 +14,9 @@ class SearchController
   end
   def institutions
-    @titles[:institutions] = _("Institution Catalog")
+    @asset = "gov_user_plugin/institutions"
+    @assets = [@asset]
+    @titles["gov_user_plugin/institutions"] = _("Institution Catalog")
     results = filter_communities_list{|community| community.institution?}
     results = results.paginate(:per_page => 24, :page => params[:page])
     @searches[@asset] = {:results => results}
@@ -3,6 +3,6 @@ require_dependency &#39;search_helper&#39;
 module SearchHelper
   COMMON_PROFILE_LIST_BLOCK ||= []
-  COMMON_PROFILE_LIST_BLOCK << :institutions
+  COMMON_PROFILE_LIST_BLOCK << "gov_user_plugin/institution"
 end
@@ -4,7 +4,7 @@ class User
   GOV_SUFFIX = /^.*@[gov.br|jus.br|leg.br|mp.br]+$/
-  has_and_belongs_to_many :institutions
+  has_and_belongs_to_many :institutions, :class_name => 'GovUserPlugin::Institution', :join_table => 'gov_user_plugin_institutions_users'
   validate :email_different_secondary?, :email_has_already_been_used?,
   :secondary_email_format
@@ -86,7 +86,7 @@ class GovUserPlugin &lt; Noosfero::Plugin
   def self.extra_blocks
     {
-      InstitutionsBlock => {  :type => [Environment, Person] }
+      GovUserPlugin::InstitutionsBlock => {  :type => [Environment, Person] }
     }
   end
@@ -223,7 +223,7 @@ class GovUserPlugin &lt; Noosfero::Plugin
     end
     if context.params.has_key?(:institution)
-      Institution.transaction do
+      GovUserPlugin::Institution.transaction do
         context.profile.
         institution.
         update_attributes!(context.params[:institution])
@@ -277,7 +277,7 @@ class GovUserPlugin &lt; Noosfero::Plugin
       context.params[:user][:institution_ids].delete('')
       context.params[:user][:institution_ids].each do |id|
-        new_communities << Institution.find(id).community
+        new_communities << GovUserPlugin::Institution.find(id).community
       end
     end
@@ -320,7 +320,7 @@ class GovUserPlugin &lt; Noosfero::Plugin
     def update_user_institutions(user)
       context.params[:user][:institution_ids].each do |institution_id|
-        institution = Institution.find institution_id
+        institution = GovUserPlugin::Institution.find institution_id
         user.institutions << institution
         if institution.community.admins.blank?
@@ -0,0 +1,6 @@
+class GovUserPlugin::GovernmentalPower < Noosfero::Plugin::ActiveRecord
+  attr_accessible :name
+
+  validates :name, :presence=>true, :uniqueness=>true
+  has_many :institutions, :class_name => 'GovUserPlugin::Institution'
+end
@@ -0,0 +1,7 @@
+class GovUserPlugin::GovernmentalSphere < Noosfero::Plugin::ActiveRecord
+  attr_accessible :name
+
+  validates :name, :presence=>true, :uniqueness=>true
+
+  has_many :institutions, :class_name => 'GovUserPlugin::Institution'
+end
@@ -0,0 +1,109 @@
+class GovUserPlugin::Institution < Noosfero::Plugin::ActiveRecord
+  has_many :comments
+
+  SEARCH_FILTERS = {
+    :order => %w[],
+    :display => %w[compact]
+  }
+
+  def self.default_search_display
+    'compact'
+  end
+
+  belongs_to :governmental_power, :class_name => 'GovUserPlugin::GovernmentalPower'
+  belongs_to :governmental_sphere, :class_name => 'GovUserPlugin::GovernmentalSphere'
+  belongs_to :juridical_nature, :class_name => 'GovUserPlugin::JuridicalNature'
+
+  has_and_belongs_to_many :users, :join_table => 'gov_user_plugin_institutions_users'
+
+  attr_accessible :name, :acronym, :unit_code, :parent_code, :unit_type,
+                  :sub_juridical_nature, :normalization_level,
+                  :version, :cnpj, :type, :governmental_power,
+                  :governmental_sphere, :sisp, :juridical_nature,
+                  :corporate_name, :siorg_code, :community
+
+  validates :name, :presence=>true, :uniqueness=>true
+
+  before_save :verify_institution_type
+
+  belongs_to :community
+
+  scope :public, :conditions => { :type => "GovUserPlugin::PublicInstitution" }
+  scope :private, :conditions => { :type => "GovUserPlugin::PrivateInstitution" }
+  scope :search_institution, lambda{ |value|
+    where("name ilike ? OR acronym ilike ?", "%#{value}%", "%#{value}%" )
+  }
+
+  validate :validate_country, :validate_state, :validate_city,
+           :verify_institution_type, :validate_format_cnpj
+
+
+  protected
+
+  def verify_institution_type
+    valid_institutions_type = ["GovUserPlugin::PublicInstitution", "GovUserPlugin::PrivateInstitution"]
+
+    unless valid_institutions_type.include? self.type
+      self.errors.add(
+        :type,
+        _("invalid, only public and private institutions are allowed.")
+      )
+
+      return false
+    end
+
+    return true
+  end
+
+  def validate_country
+    unless self.community.blank?
+      if self.community.country.blank? && self.errors[:country].blank?
+        self.errors.add(:country, _("can't be blank"))
+        return false
+      end
+    end
+
+    return true
+  end
+
+  def validate_state
+    unless self.community.blank?
+      if self.community.country == "BR" &&
+        (self.community.state.blank? || self.community.state == "-1") &&
+        self.errors[:state].blank?
+
+        self.errors.add(:state, _("can't be blank"))
+        return false
+      end
+    end
+
+    return true
+  end
+
+  def validate_city
+    unless self.community.blank?
+      if self.community.country == "BR" && self.community.city.blank? &&
+        self.errors[:city].blank?
+
+        self.errors.add(:city, _("can't be blank"))
+        return false
+      end
+    end
+
+    return true
+  end
+
+  def validate_format_cnpj
+    return true if self.community.blank? && self.community.country != "BR"
+    return true if self.cnpj.blank?
+
+    format =  /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/
+
+    if !self.cnpj.blank? && format.match(self.cnpj)
+      return true
+    else
+      self.errors.add(:cnpj, _("invalid format"))
+      return false
+    end
+  end
+end
@@ -0,0 +1,70 @@
+class GovUserPlugin::InstitutionsBlock < CommunitiesBlock
+  def self.description
+    _('Institutions')
+  end
+
+  def profile_count
+    profile_list.count
+  end
+
+  def default_title
+    n_('{#} institution', '{#} institutions', profile_count)
+  end
+
+  def help
+    _('This block displays the institutions in which the user is a member.')
+  end
+
+  def footer
+    owner = self.owner
+    case owner
+    when Profile
+      lambda do |context|
+        link_to s_('institutions|View all'), :profile => owner.identifier,
+                :controller => 'profile', :action => 'communities',
+                :type => 'GovUserPlugin::Institution'
+      end
+    when Environment
+      lambda do |context|
+        link_to s_('institutions|View all'), :controller => 'search',
+                :action => 'communities', :type => 'GovUserPlugin::Institution'
+      end
+    else
+      ''
+    end
+  end
+
+  def profile_list
+    result = get_visible_profiles
+
+    result = result.select { |p| p.class == Community && p.institution? }
+
+    result.slice(0..get_limit-1)
+  end
+
+  def profiles
+    owner.communities
+  end
+
+  private
+
+  def get_visible_profiles
+    include_list = [:image,:domains,:preferred_domain,:environment]
+    visible_profiles = profiles.visible.includes(include_list)
+
+    if !prioritize_profiles_with_image
+      visible_profiles.all(:limit => get_limit,
+                           :order => 'profiles.updated_at DESC'
+                          ).sort_by{ rand }
+    elsif profiles.visible.with_image.count >= get_limit
+      visible_profiles.with_image.all(:limit => get_limit * 5,
+                                      :order => 'profiles.updated_at DESC'
+                                     ).sort_by{ rand }
+    else
+      visible_profiles.with_image.sort_by{ rand } +
+      visible_profiles.without_image.all(:limit => get_limit * 5,
+                                         :order => 'profiles.updated_at DESC'
+                                        ).sort_by{ rand }
+    end
+  end
+end
@@ -0,0 +1,4 @@
+class GovUserPlugin::InstitutionsUsers < Noosfero::Plugin::ActiveRecord
+  belongs_to :user
+  belongs_to :institution, :class_name => 'GovUserPlugin::Institution'
+end
@@ -0,0 +1,10 @@
+class GovUserPlugin::JuridicalNature < Noosfero::Plugin::ActiveRecord
+  self.record_timestamps = false
+
+  attr_accessible :name
+
+  has_many :institutions, :class_name => 'GovUserPlugin::Institution'
+
+  validates_presence_of :name
+  validates_uniqueness_of :name
+end
@@ -0,0 +1,2 @@
+class GovUserPlugin::PrivateInstitution < GovUserPlugin::Institution
+end
@@ -0,0 +1,13 @@
+class GovUserPlugin::PublicInstitution < GovUserPlugin::Institution
+  validates :governmental_power, :governmental_sphere, :juridical_nature,
+            :presence=>true
+
+  validates :acronym, :allow_blank => true, :allow_nil => true,
+            :uniqueness=>true
+
+  validates_format_of(
+    :cnpj,
+    :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/,
+    :allow_nil => true, :allow_blank => true
+  )
+end
@@ -1,13 +0,0 @@
-class GovernmentalPower < ActiveRecord::Base
-  attr_accessible :name
-
-  validates :name, :presence=>true, :uniqueness=>true
-  has_many :institutions
-
-  def public_institutions
-    Institution.where(
-      :type=>"PublicInstitution",
-      :governmental_power_id=>self.id
-    )
-  end
-end
@@ -1,7 +0,0 @@
-class GovernmentalSphere < ActiveRecord::Base
-  attr_accessible :name
-
-  validates :name, :presence=>true, :uniqueness=>true
-
-  has_many :institutions
-end
@@ -1,107 +0,0 @@
-class Institution < ActiveRecord::Base
-  has_many :comments
-
-  SEARCH_FILTERS = {
-    :order => %w[],
-    :display => %w[compact]
-  }
-
-  def self.default_search_display
-    'compact'
-  end
-
-  belongs_to :governmental_power
-  belongs_to :governmental_sphere
-  belongs_to :juridical_nature
-
-  has_and_belongs_to_many :users
-
-  attr_accessible :name, :acronym, :unit_code, :parent_code, :unit_type,
-                  :sub_juridical_nature, :normalization_level,
-                  :version, :cnpj, :type, :governmental_power,
-                  :governmental_sphere, :sisp, :juridical_nature,
-                  :corporate_name, :siorg_code, :community
-
-  validates :name, :presence=>true, :uniqueness=>true
-
-  before_save :verify_institution_type
-
-  belongs_to :community
-
-  scope :search_institution, lambda{ |value|
-    where("name ilike ? OR acronym ilike ?", "%#{value}%", "%#{value}%" )
-  }
-
-  validate :validate_country, :validate_state, :validate_city,
-           :verify_institution_type, :validate_format_cnpj
-
-
-  protected
-
-  def verify_institution_type
-    valid_institutions_type = ["PublicInstitution", "PrivateInstitution"]
-
-    unless valid_institutions_type.include? self.type
-      self.errors.add(
-        :type,
-        _("invalid, only public and private institutions are allowed.")
-      )
-
-      return false
-    end
-
-    return true
-  end
-
-  def validate_country
-    unless self.community.blank?
-      if self.community.country.blank? && self.errors[:country].blank?
-        self.errors.add(:country, _("can't be blank"))
-        return false
-      end
-    end
-
-    return true
-  end
-
-  def validate_state
-    unless self.community.blank?
-      if self.community.country == "BR" &&
-        (self.community.state.blank? || self.community.state == "-1") &&
-        self.errors[:state].blank?
-
-        self.errors.add(:state, _("can't be blank"))
-        return false
-      end
-    end
-
-    return true
-  end
-
-  def validate_city
-    unless self.community.blank?
-      if self.community.country == "BR" && self.community.city.blank? &&
-        self.errors[:city].blank?
-
-        self.errors.add(:city, _("can't be blank"))
-        return false
-      end
-    end
-
-    return true
-  end
-
-  def validate_format_cnpj
-    return true if self.community.blank? && self.community.country != "BR"
-    return true if self.cnpj.blank?
-
-    format =  /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/
-
-    if !self.cnpj.blank? && format.match(self.cnpj)
-      return true
-    else
-      self.errors.add(:cnpj, _("invalid format"))
-      return false
-    end
-  end
-end
@@ -1,71 +0,0 @@
-class InstitutionsBlock < CommunitiesBlock
-
-  def self.description
-    _('Institutions')
-  end
-
-  def profile_count
-    profile_list.count
-  end
-
-  def default_title
-    n_('{#} institution', '{#} institutions', profile_count)
-  end
-
-  def help
-    _('This block displays the institutions in which the user is a member.')
-  end
-
-  def footer
-    owner = self.owner
-    case owner
-    when Profile
-      lambda do |context|
-        link_to s_('institutions|View all'), :profile => owner.identifier,
-                :controller => 'profile', :action => 'communities',
-                :type => 'Institution'
-      end
-    when Environment
-      lambda do |context|
-        link_to s_('institutions|View all'), :controller => 'search',
-                :action => 'communities', :type => 'Institution'
-      end
-    else
-      ''
-    end
-  end
-
-  def profile_list
-    result = get_visible_profiles
-
-    result = result.select { |p| p.class == Community && p.institution? }
-
-    result.slice(0..get_limit-1)
-  end
-
-  def profiles
-    owner.communities
-  end
-
-  private
-
-  def get_visible_profiles
-    include_list = [:image,:domains,:preferred_domain,:environment]
-    visible_profiles = profiles.visible.includes(include_list)
-
-    if !prioritize_profiles_with_image
-      visible_profiles.all(:limit => get_limit,
-                           :order => 'profiles.updated_at DESC'
-                          ).sort_by{ rand }
-    elsif profiles.visible.with_image.count >= get_limit
-      visible_profiles.with_image.all(:limit => get_limit * 5,
-                                      :order => 'profiles.updated_at DESC'
-                                     ).sort_by{ rand }
-    else
-      visible_profiles.with_image.sort_by{ rand } +
-      visible_profiles.without_image.all(:limit => get_limit * 5,
-                                         :order => 'profiles.updated_at DESC'
-                                        ).sort_by{ rand }
-    end
-  end
-end
@@ -1,4 +0,0 @@
-class InstitutionUser < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :institution
-end
@@ -1,15 +0,0 @@
-class JuridicalNature < ActiveRecord::Base
-  attr_accessible :name
-
-  has_many :institutions
-
-  validates_presence_of :name
-  validates_uniqueness_of :name
-
-  def public_institutions
-    Institution.where(
-      :type=>"PublicInstitution",
-      :juridical_nature_id=>self.id
-    )
-  end
-end
@@ -1,2 +0,0 @@
-class PrivateInstitution < Institution
-end
@@ -1,13 +0,0 @@
-class PublicInstitution < Institution
-  validates :governmental_power, :governmental_sphere, :juridical_nature,
-            :presence=>true
-
-  validates :acronym, :allow_blank => true, :allow_nil => true,
-            :uniqueness=>true
-
-  validates_format_of(
-    :cnpj,
-    :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/,
-    :allow_nil => true, :allow_blank => true
-  )
-end
@@ -300,7 +300,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function institution_type_actions(type) {
     var country = $("#community_country").val();
-    if( type === "PublicInstitution" && country == "BR") {
+    if( type === "GovUserPlugin::PublicInstitution" && country == "BR") {
       show_public_institutions_fields();
     } else {
       show_private_institutions_fields();
@@ -16,9 +16,9 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     @environment.add_admin(@admin)
     @environment.save
-    @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
-    @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = JuridicalNature.create(:name => "Autarquia")
+    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
     @response = ActionController::TestResponse.new
     @institution_list = []
@@ -87,7 +87,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "DF",
       "Brasilia",
       "12.234.567/8900-10",
-      "PublicInstitution"
+      "GovUserPlugin::PublicInstitution"
     )
     fields[:institutions][:governmental_power] = @gov_power.id
     fields[:institutions][:governmental_sphere] = @gov_sphere.id
@@ -109,7 +109,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "DF",
       "Brasilia",
       "",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     fields[:institutions][:acronym] = "SPI"
@@ -147,7 +147,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "DF",
       "Brasilia",
       "12.345.567/8900-10",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     fields[:institutions][:acronym] = "SPI"
@@ -165,7 +165,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "DF",
       "Brasilia",
       "56.366.790/0001-88",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     post :new_institution, fields
@@ -182,7 +182,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "",
       "",
       "",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     fields[:institutions][:acronym] = "FI"
@@ -200,7 +200,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "",
       "",
       "",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     fields[:institutions][:acronym] = "FI"
@@ -224,13 +224,13 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "DF",
       "Brasilia",
       "12.323.557/8900-10",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     fields[:institutions][:acronym] = "PI"
     fields[:edit_institution_page] = false
     post :new_institution, fields
-    assert(Institution.last.community.admins.include?(admin2) )
+    assert(GovUserPlugin::Institution.last.community.admins.include?(admin2) )
   end
 end
@@ -24,9 +24,9 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     @environment.save!
   end
   should "user edit its community institution" do
-    govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    juridical_nature = JuridicalNature.create(:name => "Autarquia")
+    govPower = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    govSphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
     institution = InstitutionTestHelper.create_public_institution(
       "Ministerio Publico da Uniao",
@@ -48,7 +48,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
       "DF",
       "Gama",
       "12.345.678/9012-45",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     post(
@@ -63,9 +63,9 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
   end
   should "not user edit its community institution with wrong values" do
-    govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    juridical_nature = JuridicalNature.create(:name => "Autarquia")
+    govPower = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    govSphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
     institution = InstitutionTestHelper.create_public_institution(
       "Ministerio Publico da Uniao",
@@ -87,7 +87,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
       "DF",
       "Gama",
       "6465465465",
-      "PrivateInstitution"
+      "GovUserPlugin::PrivateInstitution"
     )
     post(
@@ -29,9 +29,9 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     @environment.add_admin(admin)
     @environment.save
-    @govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    @govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = JuridicalNature.create(:name => "Autarquia")
+    @govPower = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @govSphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
     @institution_list = []
     @institution_list << InstitutionTestHelper.create_public_institution(
@@ -51,7 +51,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     get :institutions, :query => "New"
-    assert_includes assigns(:searches)[:institutions][:results], institution.community
-    assert_not_includes assigns(:searches)[:institutions][:results], community
+    assert_includes assigns(:searches)["gov_user_plugin/institutions"][:results], institution.community
+    assert_not_includes assigns(:searches)["gov_user_plugin/institutions"][:results], community
   end
 end
@@ -22,7 +22,7 @@ module InstitutionTestHelper
   end
   def self.create_public_institution name, acronym, country, state, city, juridical_nature, gov_p, gov_s, cnpj
-    institution = PublicInstitution.new
+    institution = GovUserPlugin::PublicInstitution.new
     institution.community = institution_community(name, country, state, city)
     institution.name = name
     institution.juridical_nature = juridical_nature
@@ -36,7 +36,7 @@ module InstitutionTestHelper
   end
   def self.create_private_institution name, acronym, country, state, city, cnpj
-    institution = PrivateInstitution.new
+    institution = GovUserPlugin::PrivateInstitution.new
     institution.community = institution_community(name, country, state, city)
     institution.name = name
     institution.acronym = acronym
@@ -56,4 +56,4 @@ module InstitutionTestHelper
     institution_community.save
     institution_community
   end
-end
 \ No newline at end of file
+end
@@ -1,58 +0,0 @@
-# encoding: utf-8
-
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  def setup
-    @plugin = GovUserPlugin.new
-
-    @user = fast_create(User)
-    @person = create_person(
-                "My Name",
-                "user@email.com",
-                "123456",
-                "123456",
-                "user2@email.com",
-                "Any State",
-                "Some City"
-              )
-  end
-
-  def teardown
-    @plugin = nil
-  end
-
-  should 'be a noosfero plugin' do
-    assert_kind_of Noosfero::Plugin, @plugin
-  end
-
-  should 'save person with a valid full name' do
-    p = Person::new :name=>"S1mpl3 0f N4m3", :identifier=>"simple-name"
-    p.user = fast_create(:user)
-
-    assert_equal true, p.save
-  end
-
-  should 'save person with a valid full name with accents' do
-    name = 'Jônatàs dâ Sîlvã Jösé'
-    identifier = "jonatas-jose-da-silva"
-    p = Person::new :name=>name, :identifier=>identifier
-    p.user = fast_create(:user)
-
-    assert_equal true, p.save
-  end
-
-  should 'not save person whose name has not capital letter' do
-    p = Person::new :name=>"simple name"
-    assert !p.save, _("Name Should begin with a capital letter and no special characters")
-  end
-
-  should 'not save person whose name has special characters' do
-    p = Person::new :name=>"Simple N@me"
-
-    assert !p.save , _("Name Should begin with a capital letter and no special characters")
-  end
-end
@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  def setup
+    @plugin = GovUserPlugin.new
+
+    @user = fast_create(User)
+    @person = create_person(
+                "My Name",
+                "user@email.com",
+                "123456",
+                "123456",
+                "user2@email.com",
+                "Any State",
+                "Some City"
+              )
+  end
+
+  def teardown
+    @plugin = nil
+  end
+
+  should 'be a noosfero plugin' do
+    assert_kind_of Noosfero::Plugin, @plugin
+  end
+
+  should 'save person with a valid full name' do
+    p = Person::new :name=>"S1mpl3 0f N4m3", :identifier=>"simple-name"
+    p.user = fast_create(:user)
+
+    assert_equal true, p.save
+  end
+
+  should 'save person with a valid full name with accents' do
+    name = 'Jônatàs dâ Sîlvã Jösé'
+    identifier = "jonatas-jose-da-silva"
+    p = Person::new :name=>name, :identifier=>identifier
+    p.user = fast_create(:user)
+
+    assert_equal true, p.save
+  end
+
+  should 'not save person whose name has not capital letter' do
+    p = Person::new :name=>"simple name"
+    assert !p.save, _("Name Should begin with a capital letter and no special characters")
+  end
+
+  should 'not save person whose name has special characters' do
+    p = Person::new :name=>"Simple N@me"
+
+    assert !p.save , _("Name Should begin with a capital letter and no special characters")
+  end
+end
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/institution_test_helper'
+
+class GovUserPlugin::GovernmentalPowerTest < ActiveSupport::TestCase
+
+  def setup
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+  end
+
+  def teardown
+    GovUserPlugin::Institution.destroy_all
+  end
+
+  should "get public institutions" do
+    inst_name = "Ministerio Publico da Uniao"
+    inst_cnpj = "12.345.678/9012-45"
+    gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some gov power")
+    InstitutionTestHelper.create_public_institution(
+      inst_name,
+      "MPU",
+      "BR",
+      "DF",
+      "Gama",
+      @juridical_nature,
+      gov_power,
+      @gov_sphere,
+      inst_cnpj
+    )
+
+    assert_equal gov_power.institutions.public.count, GovUserPlugin::PublicInstitution.count
+  end
+end
@@ -0,0 +1,63 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class GovUserPlugin::InstitutionTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+
+    @institution = create_public_institution(
+                      "Ministerio Publico da Uniao",
+                      "MPU",
+                      "BR",
+                      "DF",
+                      "Gama",
+                      @juridical_nature,
+                      @gov_power,
+                      @gov_sphere,
+                      "11.222.333/4444-55"
+                    )
+  end
+
+  def teardown
+    GovUserPlugin::GovernmentalPower.destroy_all
+    GovUserPlugin::GovernmentalSphere.destroy_all
+    GovUserPlugin::JuridicalNature.destroy_all
+    @institution = nil
+  end
+  should "not save institutions without name" do
+    @institution.name = nil
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("Name can't be blank")
+  end
+
+  should "not save if institution has invalid type" do
+    invalid_msg = "Type invalid, only public and private institutions are allowed."
+    @institution.type = "Other type"
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?(invalid_msg)
+  end
+
+  should "not save without country" do
+    @institution.community.country = nil
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("Country can't be blank")
+  end
+
+  should "not save without state" do
+    @institution.community.state = nil
+
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("State can't be blank")
+  end
+
+  should "not save without city" do
+    @institution.community.city = nil
+    @institution.community.state = "DF"
+
+    assert_equal false, @institution.save
+    assert_equal true, @institution.errors.full_messages.include?("City can't be blank")
+  end
+end
@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class GovUserPlugin::InstitutionsBlockTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  should 'inherit from Block' do
+    assert_kind_of Block, GovUserPlugin::InstitutionsBlock.new
+  end
+
+  should 'declare its default title' do
+    GovUserPlugin::InstitutionsBlock.any_instance.stubs(:profile_count).returns(0)
+    assert_not_equal Block.new.default_title, GovUserPlugin::InstitutionsBlock.new.default_title
+  end
+
+  should 'describe itself' do
+    assert_not_equal Block.description, GovUserPlugin::InstitutionsBlock.description
+  end
+
+  should 'give empty footer on unsupported owner type' do
+    block = GovUserPlugin::InstitutionsBlock.new
+    block.expects(:owner).returns(1)
+    assert_equal '', block.footer
+  end
+
+  should 'list institutions' do
+    user = create_person("Jose_Augusto",
+            "jose_augusto@email.com",
+            "aaaaaaa",
+            "aaaaaaa",
+            'jose@secondary.com',
+            "DF",
+            "Gama"
+          )
+
+    institution  = create_private_institution(
+                    "inst name",
+                    "IN",
+                    "country",
+                    "state",
+                    "city",
+                    "00.111.222/3333-44"
+                   )
+    institution.community.add_member(user)
+
+    block = GovUserPlugin::InstitutionsBlock.new
+    block.expects(:owner).at_least_once.returns(user)
+
+    assert_equivalent [institution.community], block.profiles
+  end
+
+end
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class GovUserPlugin::JuridicalNatureTest < ActiveSupport::TestCase
+
+  include PluginTestHelper
+
+  def setup
+    @govPower = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @govSphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+  end
+
+  def teardown
+    GovUserPlugin::Institution.destroy_all
+  end
+
+  should "get public institutions" do
+    juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+    create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere, "22.333.444/5555-66")
+    create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere, "22.333.444/5555-77")
+    assert juridical_nature.institutions.public.count == GovUserPlugin::PublicInstitution.count
+  end
+end
@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class GovUserPlugin::OrganizationRatingTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  def setup
+    @environment = Environment.default
+    @environment.enabled_plugins = ['SoftwareCommunitiesPlugin']
+    @environment.save
+  end
+
+  should "validate institution if there is an institution_id" do
+    person = fast_create(Person)
+    community = fast_create(Community)
+    private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
+
+    community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => private_institution)
+    assert_equal false, community_rating.valid?
+
+    assert_equal true, community_rating.errors[:institution].include?("not found")
+
+    private_institution.save
+    community_rating.institution = private_institution
+
+    assert_equal true, community_rating.valid?
+    assert_equal false, community_rating.errors[:institution].include?("not found")
+  end
+
+  private
+
+  def build_private_institution name, corporate_name, cnpj, country="AR"
+    community = Community.new :name => name
+    community.country = country
+
+    institution = GovUserPlugin::PrivateInstitution.new :name=> name
+    institution.corporate_name = corporate_name
+    institution.cnpj = cnpj
+    institution.community = community
+
+    institution
+  end
+end
+
@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @plugin = GovUserPlugin.new
+
+    @user = fast_create(User)
+    @person = create_person(
+                "My Name",
+                "user@email.com",
+                "123456",
+                "123456",
+                "user@secondaryemail.com",
+                "Any State",
+                "Some City"
+              )
+  end
+
+  should 'calculate the percentege of person incomplete fields' do
+    @person.cell_phone = "76888919"
+    @person.contact_phone = "987654321"
+
+    assert_equal(67, @plugin.calc_percentage_registration(@person))
+
+    @person.comercial_phone = "11223344"
+    @person.country = "I dont know"
+    @person.state = "I dont know"
+    @person.city = "I dont know"
+    @person.organization_website = "www.whatever.com"
+    @person.image = Image::new :uploaded_data=>fixture_file_upload('/files/rails.png', 'image/png')
+    @person.save
+
+    assert_equal(100, @plugin.calc_percentage_registration(@person))
+  end
+
+  should 'return true when the email has not gov.br,jus.br,leg.br or mp.br' do
+    @user.secondary_email = "test_email@com.br"
+    @user.email = "test_email@net.br"
+    assert @user.save
+  end
+end
@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class GovUserPlugin::PrivateInstitutionTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @institution = create_private_institution(
+                      "Simple Private Institution",
+                      "SPI",
+                      "BR",
+                      "DF",
+                      "Gama",
+                      "00.000.000/0001-00"
+                    )
+  end
+
+  def teardown
+    @institution = nil
+    GovUserPlugin::Institution.destroy_all
+  end
+
+  should "save without a cnpj" do
+    @institution.cnpj = nil
+
+    assert @institution.save
+  end
+
+  should "save without fantasy name" do
+    @institution.acronym = nil
+    @institution.community.save
+
+    assert @institution.save
+  end
+end
@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class GovUserPlugin::PublicInstitutionTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  def setup
+    @gov_power = GovUserPlugin::GovernmentalPower.create(:name=>"Some Gov Power")
+    @gov_sphere = GovUserPlugin::GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
+
+    @institution = create_public_institution(
+                    "Ministerio Publico da Uniao",
+                    "MPU",
+                    "BR",
+                    "DF",
+                    "Gama",
+                    @juridical_nature,
+                    @gov_power,
+                    @gov_sphere,
+                    "11.222.333/4444-55"
+                  )
+  end
+
+  def teardown
+    GovUserPlugin::GovernmentalPower.destroy_all
+    GovUserPlugin::GovernmentalSphere.destroy_all
+    GovUserPlugin::JuridicalNature.destroy_all
+    GovUserPlugin::Institution.destroy_all
+    @gov_power = nil
+    @gov_sphere = nil
+    @juridical_nature = nil
+    @institution = nil
+  end
+
+  should "save without a cnpj" do
+    @institution.cnpj = nil
+    assert @institution.save
+  end
+
+  should "save institution without an acronym" do
+    @institution.acronym = nil
+    assert @institution.save
+  end
+
+  should "Not save institution without a governmental_power" do
+    invalid_msg = "Governmental power can't be blank"
+    @institution.governmental_power = nil
+
+    assert !@institution.save
+    assert @institution.errors.full_messages.include? invalid_msg
+  end
+
+  should "Not save institution without a governmental_sphere" do
+    invalid_msg = "Governmental sphere can't be blank"
+    @institution.governmental_sphere = nil
+
+    assert !@institution.save
+    assert @institution.errors.full_messages.include? invalid_msg
+  end
+
+  should "not save institution without juridical nature" do
+    invalid_msg = "Juridical nature can't be blank"
+    @institution.juridical_nature = nil
+
+    assert !@institution.save
+    assert @institution.errors.full_messages.include? invalid_msg
+  end
+end
@@ -0,0 +1,99 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../helpers/plugin_test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  should 'not save user whose both email and secondary email are the same' do
+    user = fast_create(User)
+    user.email = "test@email.com"
+    user.secondary_email = "test@email.com"
+
+    assert !user.save
+  end
+
+  should 'not save user whose email and secondary email have been taken' do
+    user1 = create_default_user
+    user2 = fast_create(User)
+
+    user2.email = "primary@email.com"
+    user2.secondary_email = "secondary@email.com"
+    assert !user2.save
+  end
+
+  should 'not save user whose email has already been used' do
+    user1 = create_default_user
+    user2 = fast_create(User)
+
+    user2.email = "primary@email.com"
+    user2.secondary_email = "noosfero@email.com"
+    assert !user2.save
+  end
+
+  should 'not save user whose email has been taken another in users secondary email' do
+    user1 = create_default_user
+    user2 = fast_create(User)
+
+    user2.login = "another-login"
+    user2.email = "secondary@email.com"
+    user2.secondary_email = "noosfero@email.com"
+    assert !user2.save
+  end
+
+  should 'not save user whose secondary email has been taken used in another users email' do
+    user1 = create_default_user
+    user2 = fast_create(User)
+
+    user2.login = "another-login"
+    user2.email = "noosfero@email.com"
+    user2.secondary_email = "primary@email.com"
+    assert !user2.save
+  end
+
+  should 'not save user whose secondary email has already been used in another users secondary email' do
+    user1 = create_default_user
+    user2 = fast_create(User)
+
+    user2.login = "another-login"
+    user2.email = "noosfero@email.com"
+    user2.secondary_email = "secondary@email.com"
+    assert !user2.save
+  end
+
+  should 'not save user whose secondary email is in the wrong format' do
+    user = fast_create(User)
+    user.email = "test@email.com"
+    user.secondary_email = "notarightformat.com"
+
+    assert !user.save
+
+    user.secondary_email = "not@arightformatcom"
+
+    assert !user.save
+  end
+
+  should 'save more than one user without secondary email' do
+    user = fast_create(User)
+    user.email = "test@email.com"
+    user.secondary_email = ""
+    user.save
+
+    user2 = fast_create(User)
+    user2.email = "test2@email.com"
+    user2.secondary_email = ""
+    assert user2.save
+  end
+
+  private
+
+  def create_default_user
+    user = fast_create(User)
+    user.login = "a-login"
+    user.email = "primary@email.com"
+    user.secondary_email = "secondary@email.com"
+    user.save
+
+    return user
+  end
+
+end
@@ -1,33 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/institution_test_helper'
-
-class GovernmentalPowerTest < ActiveSupport::TestCase
-
-  def setup
-    @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = JuridicalNature.create(:name => "Autarquia")
-  end
-
-  def teardown
-    Institution.destroy_all
-  end
-
-  should "get public institutions" do
-    inst_name = "Ministerio Publico da Uniao"
-    inst_cnpj = "12.345.678/9012-45"
-    gov_power = GovernmentalPower.create(:name=>"Some gov power")
-    InstitutionTestHelper.create_public_institution(
-      inst_name,
-      "MPU",
-      "BR",
-      "DF",
-      "Gama",
-      @juridical_nature,
-      gov_power,
-      @gov_sphere,
-      inst_cnpj
-    )
-
-    assert_equal gov_power.public_institutions.count, PublicInstitution.count
-  end
-end
 \ No newline at end of file
@@ -1,63 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class InstitutionTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
-    @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = JuridicalNature.create(:name => "Autarquia")
-
-    @institution = create_public_institution(
-                      "Ministerio Publico da Uniao",
-                      "MPU",
-                      "BR",
-                      "DF",
-                      "Gama",
-                      @juridical_nature,
-                      @gov_power,
-                      @gov_sphere,
-                      "11.222.333/4444-55"
-                    )
-  end
-
-  def teardown
-    GovernmentalPower.destroy_all
-    GovernmentalSphere.destroy_all
-    JuridicalNature.destroy_all
-    @institution = nil
-  end
-  should "not save institutions without name" do
-    @institution.name = nil
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("Name can't be blank")
-  end
-
-  should "not save if institution has invalid type" do
-    invalid_msg = "Type invalid, only public and private institutions are allowed."
-    @institution.type = "Other type"
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?(invalid_msg)
-  end
-
-  should "not save without country" do
-    @institution.community.country = nil
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("Country can't be blank")
-  end
-
-  should "not save without state" do
-    @institution.community.state = nil
-
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("State can't be blank")
-  end
-
-  should "not save without city" do
-    @institution.community.city = nil
-    @institution.community.state = "DF"
-
-    assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("City can't be blank")
-  end
-end
@@ -1,51 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class InstitutionsBlockTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  should 'inherit from Block' do
-    assert_kind_of Block, InstitutionsBlock.new
-  end
-
-  should 'declare its default title' do
-    InstitutionsBlock.any_instance.stubs(:profile_count).returns(0)
-    assert_not_equal Block.new.default_title, InstitutionsBlock.new.default_title
-  end
-
-  should 'describe itself' do
-    assert_not_equal Block.description, InstitutionsBlock.description
-  end
-
-  should 'give empty footer on unsupported owner type' do
-    block = InstitutionsBlock.new
-    block.expects(:owner).returns(1)
-    assert_equal '', block.footer
-  end
-
-  should 'list institutions' do
-    user = create_person("Jose_Augusto",
-            "jose_augusto@email.com",
-            "aaaaaaa",
-            "aaaaaaa",
-            'jose@secondary.com',
-            "DF",
-            "Gama"
-          )
-
-    institution  = create_private_institution(
-                    "inst name",
-                    "IN",
-                    "country",
-                    "state",
-                    "city",
-                    "00.111.222/3333-44"
-                   )
-    institution.community.add_member(user)
-
-    block = InstitutionsBlock.new
-    block.expects(:owner).at_least_once.returns(user)
-
-    assert_equivalent [institution.community], block.profiles
-  end
-
-end
@@ -1,23 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class JuridicalNatureTest < ActiveSupport::TestCase
-
-  include PluginTestHelper
-
-  def setup
-    @govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    @govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-  end
-
-  def teardown
-    Institution.destroy_all
-  end
-
-  should "get public institutions" do
-    juridical_nature = JuridicalNature.create(:name => "Autarquia")
-    create_public_institution("Ministerio Publico da Uniao", "MPU", "BR", "DF", "Gama", juridical_nature, @govPower, @govSphere, "22.333.444/5555-66")
-    create_public_institution("Tribunal Regional da Uniao", "TRU", "BR", "DF", "Brasilia", juridical_nature, @govPower, @govSphere, "22.333.444/5555-77")
-    assert juridical_nature.public_institutions.count == PublicInstitution.count
-  end
-end
@@ -1,44 +0,0 @@
-require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
-require File.expand_path(File.dirname(__FILE__)) + '/../helpers/plugin_test_helper'
-
-class OrganizationRatingTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  def setup
-    @environment = Environment.default
-    @environment.enabled_plugins = ['SoftwareCommunitiesPlugin']
-    @environment.save
-  end
-
-  should "validate institution if there is an institution_id" do
-    person = fast_create(Person)
-    community = fast_create(Community)
-    private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
-
-    community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => private_institution)
-    assert_equal false, community_rating.valid?
-
-    assert_equal true, community_rating.errors[:institution].include?("not found")
-
-    private_institution.save
-    community_rating.institution = private_institution
-
-    assert_equal true, community_rating.valid?
-    assert_equal false, community_rating.errors[:institution].include?("not found")
-  end
-
-  private
-
-  def build_private_institution name, corporate_name, cnpj, country="AR"
-    community = Community.new :name => name
-    community.country = country
-
-    institution = PrivateInstitution.new :name=> name
-    institution.corporate_name = corporate_name
-    institution.cnpj = cnpj
-    institution.community = community
-
-    institution
-  end
-end
-
@@ -1,43 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class SoftwareCommunitiesPluginPersonTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @plugin = GovUserPlugin.new
-
-    @user = fast_create(User)
-    @person = create_person(
-                "My Name",
-                "user@email.com",
-                "123456",
-                "123456",
-                "user@secondaryemail.com",
-                "Any State",
-                "Some City"
-              )
-  end
-
-  should 'calculate the percentege of person incomplete fields' do
-    @person.cell_phone = "76888919"
-    @person.contact_phone = "987654321"
-
-    assert_equal(67, @plugin.calc_percentage_registration(@person))
-
-    @person.comercial_phone = "11223344"
-    @person.country = "I dont know"
-    @person.state = "I dont know"
-    @person.city = "I dont know"
-    @person.organization_website = "www.whatever.com"
-    @person.image = Image::new :uploaded_data=>fixture_file_upload('/files/rails.png', 'image/png')
-    @person.save
-
-    assert_equal(100, @plugin.calc_percentage_registration(@person))
-  end
-
-  should 'return true when the email has not gov.br,jus.br,leg.br or mp.br' do
-    @user.secondary_email = "test_email@com.br"
-    @user.email = "test_email@net.br"
-    assert @user.save
-  end
-end
@@ -1,34 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class PrivateInstitutionTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @institution = create_private_institution(
-                      "Simple Private Institution",
-                      "SPI",
-                      "BR",
-                      "DF",
-                      "Gama",
-                      "00.000.000/0001-00"
-                    )
-  end
-
-  def teardown
-    @institution = nil
-    Institution.destroy_all
-  end
-
-  should "save without a cnpj" do
-    @institution.cnpj = nil
-
-    assert @institution.save
-  end
-
-  should "save without fantasy name" do
-    @institution.acronym = nil
-    @institution.community.save
-
-    assert @institution.save
-  end
-end
@@ -1,68 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class PublicInstitutionTest < ActiveSupport::TestCase
-  include PluginTestHelper
-  def setup
-    @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
-    @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    @juridical_nature = JuridicalNature.create(:name => "Autarquia")
-
-    @institution = create_public_institution(
-                    "Ministerio Publico da Uniao",
-                    "MPU",
-                    "BR",
-                    "DF",
-                    "Gama",
-                    @juridical_nature,
-                    @gov_power,
-                    @gov_sphere,
-                    "11.222.333/4444-55"
-                  )
-  end
-
-  def teardown
-    GovernmentalPower.destroy_all
-    GovernmentalSphere.destroy_all
-    JuridicalNature.destroy_all
-    Institution.destroy_all
-    @gov_power = nil
-    @gov_sphere = nil
-    @juridical_nature = nil
-    @institution = nil
-  end
-
-  should "save without a cnpj" do
-    @institution.cnpj = nil
-    assert @institution.save
-  end
-
-  should "save institution without an acronym" do
-    @institution.acronym = nil
-    assert @institution.save
-  end
-
-  should "Not save institution without a governmental_power" do
-    invalid_msg = "Governmental power can't be blank"
-    @institution.governmental_power = nil
-
-    assert !@institution.save
-    assert @institution.errors.full_messages.include? invalid_msg
-  end
-
-  should "Not save institution without a governmental_sphere" do
-    invalid_msg = "Governmental sphere can't be blank"
-    @institution.governmental_sphere = nil
-
-    assert !@institution.save
-    assert @institution.errors.full_messages.include? invalid_msg
-  end
-
-  should "not save institution without juridical nature" do
-    invalid_msg = "Juridical nature can't be blank"
-    @institution.juridical_nature = nil
-
-    assert !@institution.save
-    assert @institution.errors.full_messages.include? invalid_msg
-  end
-end
@@ -1,99 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
-
-class UserTest < ActiveSupport::TestCase
-  include PluginTestHelper
-
-  should 'not save user whose both email and secondary email are the same' do
-    user = fast_create(User)
-    user.email = "test@email.com"
-    user.secondary_email = "test@email.com"
-
-    assert !user.save
-  end
-
-  should 'not save user whose email and secondary email have been taken' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.email = "primary@email.com"
-    user2.secondary_email = "secondary@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose email has already been used' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.email = "primary@email.com"
-    user2.secondary_email = "noosfero@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose email has been taken another in users secondary email' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.login = "another-login"
-    user2.email = "secondary@email.com"
-    user2.secondary_email = "noosfero@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose secondary email has been taken used in another users email' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.login = "another-login"
-    user2.email = "noosfero@email.com"
-    user2.secondary_email = "primary@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose secondary email has already been used in another users secondary email' do
-    user1 = create_default_user
-    user2 = fast_create(User)
-
-    user2.login = "another-login"
-    user2.email = "noosfero@email.com"
-    user2.secondary_email = "secondary@email.com"
-    assert !user2.save
-  end
-
-  should 'not save user whose secondary email is in the wrong format' do
-    user = fast_create(User)
-    user.email = "test@email.com"
-    user.secondary_email = "notarightformat.com"
-
-    assert !user.save
-
-    user.secondary_email = "not@arightformatcom"
-
-    assert !user.save
-  end
-
-  should 'save more than one user without secondary email' do
-    user = fast_create(User)
-    user.email = "test@email.com"
-    user.secondary_email = ""
-    user.save
-
-    user2 = fast_create(User)
-    user2.email = "test2@email.com"
-    user2.secondary_email = ""
-    assert user2.save
-  end
-
-  private
-
-  def create_default_user
-    user = fast_create(User)
-    user.login = "a-login"
-    user.email = "primary@email.com"
-    user.secondary_email = "secondary@email.com"
-    user.save
-
-    return user
-  end
-
-end
@@ -31,11 +31,11 @@
           <div class='formfield type-radio'>
             <label>
               <%= _("Private Institution") %>
-              <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", true)%>
+              <%= radio_button_tag("institutions[type]" ,"GovUserPlugin::PrivateInstitution", true)%>
             </label>
             <label> <%= _("Public Institution") %>
-              <%= radio_button_tag("institutions[type]", "PublicInstitution") %>
+              <%= radio_button_tag("institutions[type]", "GovUserPlugin::PublicInstitution") %>
             </label>
           </div>
         </span>
@@ -26,12 +26,12 @@
       <span class=''>
           <div class='formfield type-radio'>
             <label> <%= _("Public Institution") %>
-              <%= radio_button_tag("institutions[type]", "PublicInstitution", (@institution.type == "PublicInstitution" ? true : false)) %>
+              <%= radio_button_tag("institutions[type]", "GovUserPlugin::PublicInstitution", (@institution.type == "GovUserPlugin::PublicInstitution" ? true : false)) %>
             </label>
             <label>
               <%= _("Private Institution") %>
-              <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", (@institution.type == "PrivateInstitution" ? true : false))%>
+              <%= radio_button_tag("institutions[type]" ,"GovUserPlugin::PrivateInstitution", (@institution.type == "GovUserPlugin::PrivateInstitution" ? true : false))%>
             </label>
           </div>
         </span>
@@ -77,20 +77,20 @@
       <span class='required-field public-institutions-fields'>
         <div class="formfield type-text">
           <%= inst.label("governmental_sphere_id" ,_("Governmental Sphere:"), :class=>"formlabel") %>
-          <%= inst.select(:governmental_sphere, [[_("Select a Governmental Sphere"), 0]]|GovernmentalSphere.all.map {|s| [s.name, s.id]}, {:selected=>@institution.governmental_power_id})%>
+          <%= inst.select(:governmental_sphere, [[_("Select a Governmental Sphere"), 0]]|GovUserPlugin::GovernmentalSphere.all.map {|s| [s.name, s.id]}, {:selected=>@institution.governmental_power_id})%>
         </div>
       </span>
       <span class='required-field public-institutions-fields'>
         <div class="formfield type-text">
           <%= inst.label("governmental_power_id" ,_("Governmental Power:"), :class=>"formlabel") %>
-          <%= inst.select(:governmental_power, [[_("Select a Governmental Power"), 0]]|GovernmentalPower.all.map {|g| [g.name, g.id]}, {:selected=> @institution.governmental_sphere_id})%>
+          <%= inst.select(:governmental_power, [[_("Select a Governmental Power"), 0]]|GovUserPlugin::GovernmentalPower.all.map {|g| [g.name, g.id]}, {:selected=> @institution.governmental_sphere_id})%>
         </div>
       </span>
       <span class='required-field public-institutions-fields'>
         <div class="formfield type-text">
           <%= inst.label("juridical_nature_id" ,_("Juridical Nature:"), :class=>"formlabel") %>
-          <%= inst.select(:juridical_nature, [[_("Select a Juridical Nature"), 0]]|JuridicalNature.all.map {|j| [j.name, j.id]}, {:selected=> @institution.juridical_nature_id})%>
+          <%= inst.select(:juridical_nature, [[_("Select a Juridical Nature"), 0]]|GovUserPlugin::JuridicalNature.all.map {|j| [j.name, j.id]}, {:selected=> @institution.juridical_nature_id})%>
         </div>
       </span>
@@ -9,7 +9,7 @@
   <%= display_mpog_field(_('Country:'), profile.institution.community, :country, true) %>
   <%= display_mpog_field(_('State:'), profile.institution.community, :state, true) %>
   <%= display_mpog_field(_('City:'), profile.institution.community, :city, true) %>
-  <% if profile.institution.type == "PrivateInstitution"%>
+  <% if profile.institution.type == "GovUserPlugin::PrivateInstitution"%>
     <%= display_mpog_field(_('Fantasy Name:'), profile.institution, :acronym, true) %>
   <% else %>
     <%= display_mpog_field(_('Acronym:'), profile.institution, :acronym, true) %>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class RenameTablesWithPluginNamespace < ActiveRecord::Migration
	2	+ def change
	3	+ rename_table :institutions, :gov_user_plugin_institutions
	4	+ rename_table :governmental_spheres, :gov_user_plugin_governmental_spheres
	5	+ rename_table :governmental_powers, :gov_user_plugin_governmental_powers
	6	+ rename_table :juridical_natures, :gov_user_plugin_juridical_natures
	7	+ rename_table :institutions_users, :gov_user_plugin_institutions_users
	8	+ end
	9	+end
@@ -0,0 +1,90 @@		@@ -0,0 +1,90 @@
	1	+Given /^Institutions has initial default values on database$/ do
	2	+ GovUserPlugin::GovernmentalPower.create(:name => "Executivo")
	3	+ GovUserPlugin::GovernmentalPower.create(:name => "Legislativo")
	4	+ GovUserPlugin::GovernmentalPower.create(:name => "Judiciario")
	5	+
	6	+ GovUserPlugin::GovernmentalSphere.create(:name => "Federal")
	7	+
	8	+ GovUserPlugin::JuridicalNature.create(:name => "Autarquia")
	9	+ GovUserPlugin::JuridicalNature.create(:name => "Administracao Direta")
	10	+ GovUserPlugin::JuridicalNature.create(:name => "Empresa Publica")
	11	+ GovUserPlugin::JuridicalNature.create(:name => "Fundacao")
	12	+ GovUserPlugin::JuridicalNature.create(:name => "Orgao Autonomo")
	13	+ GovUserPlugin::JuridicalNature.create(:name => "Sociedade")
	14	+ GovUserPlugin::JuridicalNature.create(:name => "Sociedade Civil")
	15	+ GovUserPlugin::JuridicalNature.create(:name => "Sociedade de Economia Mista")
	16	+
	17	+ national_region = NationalRegion.new
	18	+ national_region.name = "Distrito Federal"
	19	+ national_region.national_region_code = '35'
	20	+ national_region.national_region_type_id = NationalRegionType::STATE
	21	+ national_region.save
	22	+end
	23	+
	24	+Given /^I type in "([^"])" in autocomplete list "([^"])" and I choose "([^"]*)"$/ do \|typed, input_field_selector, should_select\|
	25	+# Wait the page javascript load
	26	+sleep 1
	27	+# Basicaly it, search for the input field, type something, wait for ajax end select an item
	28	+page.driver.browser.execute_script %Q{
	29	+ var search_query = "#{input_field_selector}.ui-autocomplete-input";
	30	+ var input = jQuery(search_query).first();
	31	+
	32	+ input.trigger('click');
	33	+ input.val('#{typed}');
	34	+ input.trigger('keydown');
	35	+
	36	+ window.setTimeout(function(){
	37	+ search_query = ".ui-menu-item a:contains('#{should_select}')";
	38	+ var typed = jQuery(search_query).first();
	39	+
	40	+ typed.trigger('mouseenter').trigger('click');
	41	+ console.log(jQuery('#license_info_id'));
	42	+ }, 1000);
	43	+ }
	44	+ sleep 1
	45	+end
	46	+
	47	+Given /^the following public institutions?$/ do \|table\|
	48	+ # table is a Cucumber::Ast::Table
	49	+ table.hashes.each do \|item\|
	50	+ community = Community.new
	51	+ community.name = item[:name]
	52	+ community.country = item[:country]
	53	+ community.state = item[:state]
	54	+ community.city = item[:city]
	55	+ community.save!
	56	+
	57	+ governmental_power = GovUserPlugin::GovernmentalPower.where(:name => item[:governmental_power]).first
	58	+ governmental_sphere = GovUserPlugin::GovernmentalSphere.where(:name => item[:governmental_sphere]).first
	59	+
	60	+ juridical_nature = GovUserPlugin::JuridicalNature.create(:name => item[:juridical_nature])
	61	+
	62	+ institution = GovUserPlugin::PublicInstitution.new(:name => item[:name], :type => "GovUserPlugin::PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere)
	63	+ institution.community = community
	64	+ institution.corporate_name = item[:corporate_name]
	65	+ institution.save!
	66	+ end
	67	+end
	68	+
	69	+Given /^I sleep for (\d+) seconds$/ do \|time\|
	70	+ sleep time.to_i
	71	+end
	72	+
	73	+Given /^I am logged in as mpog_admin$/ do
	74	+ visit('/account/logout')
	75	+
	76	+ user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
	77	+ person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
	78	+ user.person = person
	79	+ user.save!
	80	+
	81	+ user.activate
	82	+ e = Environment.default
	83	+ e.add_admin(user.person)
	84	+
	85	+ visit('/account/login')
	86	+ fill_in("Username", :with => user.login)
	87	+ fill_in("Password", :with => '123456')
	88	+ click_button("Log in")
	89	+end
	90	+
	@@ -1,90 +0,0 @@	@@ -1,90 +0,0 @@
1	-Given /^Institutions has initial default values on database$/ do
2	- GovernmentalPower.create(:name => "Executivo")
3	- GovernmentalPower.create(:name => "Legislativo")
4	- GovernmentalPower.create(:name => "Judiciario")
5	-
6	- GovernmentalSphere.create(:name => "Federal")
7	-
8	- JuridicalNature.create(:name => "Autarquia")
9	- JuridicalNature.create(:name => "Administracao Direta")
10	- JuridicalNature.create(:name => "Empresa Publica")
11	- JuridicalNature.create(:name => "Fundacao")
12	- JuridicalNature.create(:name => "Orgao Autonomo")
13	- JuridicalNature.create(:name => "Sociedade")
14	- JuridicalNature.create(:name => "Sociedade Civil")
15	- JuridicalNature.create(:name => "Sociedade de Economia Mista")
16	-
17	- national_region = NationalRegion.new
18	- national_region.name = "Distrito Federal"
19	- national_region.national_region_code = '35'
20	- national_region.national_region_type_id = NationalRegionType::STATE
21	- national_region.save
22	-end
23	-
24	-Given /^I type in "([^"])" in autocomplete list "([^"])" and I choose "([^"]*)"$/ do \|typed, input_field_selector, should_select\|
25	-# Wait the page javascript load
26	-sleep 1
27	-# Basicaly it, search for the input field, type something, wait for ajax end select an item
28	-page.driver.browser.execute_script %Q{
29	- var search_query = "#{input_field_selector}.ui-autocomplete-input";
30	- var input = jQuery(search_query).first();
31	-
32	- input.trigger('click');
33	- input.val('#{typed}');
34	- input.trigger('keydown');
35	-
36	- window.setTimeout(function(){
37	- search_query = ".ui-menu-item a:contains('#{should_select}')";
38	- var typed = jQuery(search_query).first();
39	-
40	- typed.trigger('mouseenter').trigger('click');
41	- console.log(jQuery('#license_info_id'));
42	- }, 1000);
43	- }
44	- sleep 1
45	-end
46	-
47	-Given /^the following public institutions?$/ do \|table\|
48	- # table is a Cucumber::Ast::Table
49	- table.hashes.each do \|item\|
50	- community = Community.new
51	- community.name = item[:name]
52	- community.country = item[:country]
53	- community.state = item[:state]
54	- community.city = item[:city]
55	- community.save!
56	-
57	- governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first
58	- governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first
59	-
60	- juridical_nature = JuridicalNature.create(:name => item[:juridical_nature])
61	-
62	- institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere)
63	- institution.community = community
64	- institution.corporate_name = item[:corporate_name]
65	- institution.save!
66	- end
67	-end
68	-
69	-Given /^I sleep for (\d+) seconds$/ do \|time\|
70	- sleep time.to_i
71	-end
72	-
73	-Given /^I am logged in as mpog_admin$/ do
74	- visit('/account/logout')
75	-
76	- user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com')
77	- person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin"
78	- user.person = person
79	- user.save!
80	-
81	- user.activate
82	- e = Environment.default
83	- e.add_admin(user.person)
84	-
85	- visit('/account/login')
86	- fill_in("Username", :with => user.login)
87	- fill_in("Password", :with => '123456')
88	- click_button("Log in")
89	-end
90	-
1	require_dependency 'community'	1	require_dependency 'community'
2		2
3	class Community	3	class Community
4	- has_one :institution, :dependent=>:destroy	4	+ has_one :institution, :class_name => 'GovUserPlugin::Institution', :dependent=>:destroy
5		5
6	def institution?	6	def institution?
7	return !institution.nil?	7	return !institution.nil?
	@@ -2,7 +2,7 @@ require_dependency "organization_rating"		@@ -2,7 +2,7 @@ require_dependency "organization_rating"
2		2
3	OrganizationRating.class_eval do	3	OrganizationRating.class_eval do
4		4
5	- belongs_to :institution	5	+ belongs_to :institution, :class_name => 'GovUserPlugin::Institution'
6		6
7	attr_accessible :institution, :institution_id	7	attr_accessible :institution, :institution_id
8		8
	@@ -12,7 +12,7 @@ OrganizationRating.class_eval do		@@ -12,7 +12,7 @@ OrganizationRating.class_eval do
12		12
13	def verify_institution	13	def verify_institution
14	if self.institution != nil	14	if self.institution != nil
15	- institution = Institution.find_by_id self.institution.id	15	+ institution = GovUserPlugin::Institution.find_by_id self.institution.id
16	self.errors.add :institution, _("not found") unless institution	16	self.errors.add :institution, _("not found") unless institution
17	end	17	end
18	end	18	end
	@@ -3,6 +3,6 @@ require_dependency 'search_helper'		@@ -3,6 +3,6 @@ require_dependency 'search_helper'
3	module SearchHelper	3	module SearchHelper
4		4
5	COMMON_PROFILE_LIST_BLOCK \|\|= []	5	COMMON_PROFILE_LIST_BLOCK \|\|= []
6	- COMMON_PROFILE_LIST_BLOCK << :institutions	6	+ COMMON_PROFILE_LIST_BLOCK << "gov_user_plugin/institution"
7		7
8	end	8	end
	@@ -4,7 +4,7 @@ class User		@@ -4,7 +4,7 @@ class User
4		4
5	GOV_SUFFIX = /^.*@[gov.br\|jus.br\|leg.br\|mp.br]+$/	5	GOV_SUFFIX = /^.*@[gov.br\|jus.br\|leg.br\|mp.br]+$/
6		6
7	- has_and_belongs_to_many :institutions	7	+ has_and_belongs_to_many :institutions, :class_name => 'GovUserPlugin::Institution', :join_table => 'gov_user_plugin_institutions_users'
8		8
9	validate :email_different_secondary?, :email_has_already_been_used?,	9	validate :email_different_secondary?, :email_has_already_been_used?,
10	:secondary_email_format	10	:secondary_email_format
	@@ -86,7 +86,7 @@ class GovUserPlugin < Noosfero::Plugin		@@ -86,7 +86,7 @@ class GovUserPlugin < Noosfero::Plugin
86		86
87	def self.extra_blocks	87	def self.extra_blocks
88	{	88	{
89	- InstitutionsBlock => { :type => [Environment, Person] }	89	+ GovUserPlugin::InstitutionsBlock => { :type => [Environment, Person] }
90	}	90	}
91	end	91	end
92		92
	@@ -223,7 +223,7 @@ class GovUserPlugin < Noosfero::Plugin		@@ -223,7 +223,7 @@ class GovUserPlugin < Noosfero::Plugin
223	end	223	end
224		224
225	if context.params.has_key?(:institution)	225	if context.params.has_key?(:institution)
226	- Institution.transaction do	226	+ GovUserPlugin::Institution.transaction do
227	context.profile.	227	context.profile.
228	institution.	228	institution.
229	update_attributes!(context.params[:institution])	229	update_attributes!(context.params[:institution])
	@@ -277,7 +277,7 @@ class GovUserPlugin < Noosfero::Plugin		@@ -277,7 +277,7 @@ class GovUserPlugin < Noosfero::Plugin
277	context.params[:user][:institution_ids].delete('')	277	context.params[:user][:institution_ids].delete('')
278		278
279	context.params[:user][:institution_ids].each do \|id\|	279	context.params[:user][:institution_ids].each do \|id\|
280	- new_communities << Institution.find(id).community	280	+ new_communities << GovUserPlugin::Institution.find(id).community
281	end	281	end
282	end	282	end
283		283
	@@ -320,7 +320,7 @@ class GovUserPlugin < Noosfero::Plugin		@@ -320,7 +320,7 @@ class GovUserPlugin < Noosfero::Plugin
320		320
321	def update_user_institutions(user)	321	def update_user_institutions(user)
322	context.params[:user][:institution_ids].each do \|institution_id\|	322	context.params[:user][:institution_ids].each do \|institution_id\|
323	- institution = Institution.find institution_id	323	+ institution = GovUserPlugin::Institution.find institution_id
324	user.institutions << institution	324	user.institutions << institution
325		325
326	if institution.community.admins.blank?	326	if institution.community.admins.blank?
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+class GovUserPlugin::GovernmentalPower < Noosfero::Plugin::ActiveRecord
	2	+ attr_accessible :name
	3	+
	4	+ validates :name, :presence=>true, :uniqueness=>true
	5	+ has_many :institutions, :class_name => 'GovUserPlugin::Institution'
	6	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+class GovUserPlugin::GovernmentalSphere < Noosfero::Plugin::ActiveRecord
	2	+ attr_accessible :name
	3	+
	4	+ validates :name, :presence=>true, :uniqueness=>true
	5	+
	6	+ has_many :institutions, :class_name => 'GovUserPlugin::Institution'
	7	+end