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

Francisco Marcelo de Araújo Lima Júnior
2 parents 909929d8 c6e843e5
Showing 34 changed files with 250 additions and 154 deletions Show diff stats
app/helpers/account_helper.rb
app/helpers/application_helper.rb
app/models/environment.rb
app/views/account/accept_terms.html.erb
app/views/blocks/login_block.html.erb
app/views/layouts/_user.html.erb
app/views/profile_editor/edit.html.erb
features/admin_categories.feature
features/edit_image.feature
features/edit_profile.feature
features/forum.feature
features/plugins.feature
features/profile_domain.feature
features/suggest_article.feature
features/support/selenium.rb
lib/api/api.rb
lib/api/entities.rb
lib/api/v1/articles.rb
lib/api/v1/categories.rb
lib/api/v1/users.rb
@@ -15,12 +15,17 @@ module AccountHelper
   def suggestion_based_on_username(requested_username='')
     return "" if requested_username.empty?
+
+    requested_username = requested_username.downcase.tr("^#{Profile::IDENTIFIER_FORMAT}", '')
     usernames = []
+    tries = 0
     3.times do
       begin
         valid_name = requested_username + rand(1000).to_s
-      end while (usernames.include?(valid_name) || !Person.is_available?(valid_name, environment))
-      usernames << valid_name
+        tries += 1
+        invalid = usernames.include?(valid_name) || !Person.is_available?(valid_name, environment)
+      end while tries <= 10 && invalid
+      usernames << valid_name unless invalid
     end
     usernames
   end
@@ -1091,10 +1091,10 @@ module ApplicationHelper
       link_to_all = nil
       if list.count > 5
         list = list.first(5)
-        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
+        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => user.identifier)
       end
       link = list.map do |element|
-        link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
+        link_to(content_tag('strong', _('<span>Manage</span> %s') % element.short_name(25)), element.admin_url, :class => "icon-menu-"+element.class.identification.underscore, :title => _('Manage %s') % element.short_name)
       end
       if link_to_all
         link << link_to_all
@@ -1118,15 +1118,15 @@ module ApplicationHelper
     pending_tasks_count = ''
     count = user ? Task.to(user).pending.count : -1
     if count > 0
-      pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
+      pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
-    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') +
     manage_enterprises.to_s +
     manage_communities.to_s +
-    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
@@ -637,6 +637,10 @@ class Environment &lt; ActiveRecord::Base
     domain
   end
+  def admin_url
+    { :controller => 'admin_panel', :action => 'index' }
+  end
+
   def top_url
     url = 'http://'
     url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
@@ -19,10 +19,18 @@
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
     <%= hidden_field_tag :answer, params[:answer] %>
-    <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)') %>
+    <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :id => 'accept-terms') %>
     <% button_bar do %>
       <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
       <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
     <% end %>
   <% end %>
 </div>
+
+<script type="text/javascript">
+  jQuery('#accept-terms').change(function(){
+    jQuery("#submit-accept-terms").toggleClass("disabled");
+    jQuery("#submit-accept-terms").prop("disabled", !jQuery("#submit-accept-terms").prop("disabled"));
+  });
+</script>
+
-<div class="logged-user-info" style='display: none;'>
-  <h2><%= _('Logged in as %s') % '{login}' %></h2>
-  <ul>
-    <li><%= _('User since {year}/{month}') %></li>
-    <li><%= link_to _('Homepage'), '/{login}' %></li>
-  </ul>
-  <div class="user-actions">
-    <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
+<% if user.present? %>
+  <div class="logged-user-info">
+    <h2><%= _('Logged in as %s') % user.identifier %></h2>
+    <ul>
+      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
+      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
+    </ul>
+    <div class="user-actions">
+      <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
+    </div>
   </div>
-</div>
-<div class='not-logged-user' style='display: none;'>
-  <%= render :file => 'account/login_block' %>
-</div>
+<% else %>
+  <div class='not-logged-user'>
+    <%= render :file => 'account/login_block' %>
+  </div>
+<% end%>
 <div id="user">
-  <span class='logged-in' style='display: none;'>
-    <%= usermenu_logged_in %>
-  </span>
-  <span class='not-logged-in' style='display: none'>
+  <% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
+  <% if user.present? %>
+    <% user = user.person %>
+    <span class='logged-in'>
+      <%= usermenu_logged_in %>
+    </span>
+  <% else %>
+    <span class='not-logged-in'>
+      <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+      <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
-    <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
-    <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
+      <div id='inlineLoginBox' style='display: none;'>
+        <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+      </div>
-    <div id='inlineLoginBox' style='display: none;'>
-      <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-    </div>
-
-    <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-      <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
-    <% end %>
-
-  </span>
+      <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+        <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+      <% end %>
+    </span>
+  <% end %>
   <form action="/search" id="top-search" class="search_form clean" method="get">
     <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
     <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
@@ -53,7 +53,7 @@
   <%=
     @plugins.dispatch(:profile_editor_extras).map do |content|
-      if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
+      content.kind_of?(Proc) ? self.instance_exec(&content) : content
     end.join("\n")
   %>
@@ -40,11 +40,11 @@ Feature: manage categories
   Scenario: admin user could hide the category tree
     Given I follow "Administration"
     And I follow "Categories"
-    When I follow "Show" and wait while it hides
+    When I follow "Show"
     Then I should see "Vegetarian"
     And I should see "Steak"
-    When I follow "Hide" and wait while it hides
-    Then "Vegetarian" should not be visible within "div"
+    When I follow "Hide"
+    Then I should not see "Vegetarian"
     And "Steak" should not be visible within "div"
   @selenium
@@ -52,7 +52,6 @@ Feature: manage categories
     Given the following category
       | parent  | name     | display_in_menu |
       | Steak   | Pig      | true            |
-    And I am on the homepage
     When I follow "Administration"
     And I follow "Categories"
     Then I should see "Food Show"
@@ -19,8 +19,8 @@ Feature: edit_image
   Scenario: dont offer to edit external link if no image
     Given the following files
       | owner   | file     | mime       |
-      | morgoth | test.txt | text/plain |
-    When I go to edit "test.txt" by morgoth
+      | morgoth | test_another.txt | text/plain |
+    When I go to edit "test_another.txt" by morgoth
     Then I should not see "External link"
   Scenario: display tag list field when editing file
@@ -12,9 +12,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November" from "profile_data_birth_date_2i"
-    And I select "15" from "profile_data_birth_date_3i"
-    And I select "1980" from "profile_data_birth_date_1i"
+    And I select "1980-11-15" from "profile_data_birth_date"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -25,9 +23,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November" from "profile_data_birth_date_2i"
-    And I select "15" from "profile_data_birth_date_3i"
-    And I select "1980" from "profile_data_birth_date_1i"
+    And I select "1980-11-15" from "profile_data_birth_date"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -165,7 +165,7 @@ Feature: forum
        | article  | author    | title  | body   |
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
-   Then I should see "Joao" linking to "http://localhost/joaosilva/"
+   Then I should see "Joao Silva" within ".forum-post-last-answer"
    @selenium
    Scenario: community member should be able to see the discussion topic button
@@ -13,46 +13,39 @@ Feature: plugins
       | login | name |
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
-    And the following plugin
-      | klass       |
-      | TestPlugin  |
-    And the following events of TestPlugin
-      | event                 | body                                                                                                     |
-      | control_panel_buttons | proc { {:title => 'Test plugin button', :icon => '', :url => ''} }                                     |
-      | profile_tabs          | proc { {:title => 'Test plugin tab', :id => 'test_plugin', :content => proc {'Test plugin random content'} } } |
   Scenario: a user must see the plugin\'s button in the control panel if the plugin is enabled
-    Given plugin Test is enabled on environment
+    Given plugin Foo is enabled on environment
     And I go to joaosilva's control panel
-    Then I should see "Test plugin button"
+    Then I should see "Foo plugin button"
   Scenario: a user must see the plugin\'s tab in in the profile if the plugin is enabled
-    Given plugin Test is enabled on environment
+    Given plugin Foo is enabled on environment
     And I am on joaosilva's profile
-    Then I should see "Test plugin tab"
+    Then I should see "Foo plugin tab"
   Scenario: a user must not see the plugin\'s button in the control panel if the plugin is disabled
-    Given plugin Test is disabled on environment
+    Given plugin Foo is disabled on environment
     And I go to joaosilva's control panel
-    Then I should not see "Test plugin button"
+    Then I should not see "Foo plugin button"
   Scenario: a user must not see the plugin\'s tab in in the profile if the plugin is disabled
-    Given plugin Test is disabled on environment
+    Given plugin Foo is disabled on environment
     And I am on joaosilva's profile
-    Then I should not see "Test plugin tab"
+    Then I should not see "Foo plugin tab"
   Scenario: an admin should be able to deactivate a plugin
-    Given plugin Test is enabled on environment
+    Given plugin Foo is enabled on environment
     And I am logged in as admin
     When I go to admin_user's control panel
-    Then I should see "Test plugin button"
+    Then I should see "Foo plugin button"
     When I go to admin_user's profile
-    Then I should see "Test plugin tab"
+    Then I should see "Foo plugin tab"
     And I go to the environment control panel
     And I follow "Plugins"
-    And I uncheck "Test plugin"
+    And I uncheck "Foo"
     And I press "Save changes"
     When I go to admin_user's control panel
-    Then I should not see "Test plugin button"
+    Then I should not see "Foo plugin button"
     When I go to admin_user's profile
-    Then I should not see "Test plugin tab"
+    Then I should not see "Foo plugin tab"
@@ -55,7 +55,7 @@ Feature: domain for profile
   Scenario: access community by domain
     Given I go to the search communities page
     When I follow "Sample Community" within ".search-profile-item"
-    Then the page title should be "Sample Community - Colivre.net"
+    Then the page title should be "Sample Community"
   # This test is not working because the community domain isn't at all different
   # from the environment (localhost / 127.0.0.1)
@@ -12,6 +12,7 @@ Feature: suggest article
       | sample-community | Sample Community |
     And "Joao Silva" is admin of "Sample Community"
+  @selenium
   Scenario: highlight an article before approval of a suggested article
     Given someone suggested the following article to be published
       | target           | article_name        | article_body                    | name | email            |
@@ -19,6 +20,7 @@ Feature: suggest article
     When I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
+    And I choose "Accept"
     And I should see "suggested the publication of the article"
     Then I should see "Highlight this article" within ".task_box"
@@ -21,6 +21,7 @@ Before(&#39;@ignore-hidden-elements&#39;) do
 end
 Capybara.default_wait_time = 30
+Capybara.server_host = "localhost"
 After do
   DatabaseCleaner.clean
@@ -16,6 +16,7 @@ module API
     mount V1::Communities
     mount V1::People
     mount V1::Enterprises
+    mount V1::Categories
     mount Session
   end
@@ -59,8 +59,18 @@ module API
     class User < Grape::Entity
       root 'users', 'user'
+      expose :id
       expose :login
       expose :person, :using => Profile
+      expose :permissions do |user, options|
+        output = {}
+        user.person.role_assignments.map do |role_assigment|
+          if role_assigment.resource.respond_to?(:identifier)
+            output[role_assigment.resource.identifier] = role_assigment.role.permissions 
+          end
+        end
+        output
+      end
     end
     class UserLogin < User
@@ -65,8 +65,12 @@ module API
             #  POST api/v1/communites/:community_id/articles?private_toke=234298743290432&article[name]=title&article[body]=body
             post do
               community = environment.communities.find(params[:community_id])
-              article = community.articles.build(params[:article].merge(:last_changed_by => current_person))
-              article.type= params[:type].nil? ? 'TinyMceArticle' : params[:type]
+              klass_type= params[:content_type].nil? ? 'TinyMceArticle' : params[:content_type]
+              article = klass_type.constantize.new(params[:article])
+              article.last_changed_by = current_person
+              article.created_by= current_person
+              article.profile = community
+
               if !article.save
                 render_api_errors!(article.errors.full_messages)
               end
@@ -0,0 +1,24 @@
+module API
+  module V1
+    class Categories < Grape::API
+      before { detect_stuff_by_domain }
+      before { authenticate! }
+   
+      resource :categories do
+
+        get do
+          type = params[:category_type]
+          categories = type.nil? ?  environment.categories : environment.categories.find(:all, :conditions => {:type => type})
+          present categories, :with => Entities::Category
+        end
+  
+        desc "Return the category by id" 
+        get ':id' do
+          present environment.categories.find(params[:id]), :with => Entities::Category
+        end
+
+      end
+   
+    end
+  end
+end
@@ -15,6 +15,17 @@ module API
           present environment.users.find(params[:id]), :with => Entities::User
         end
+        get ":id/permissions" do
+          user = environment.users.find(params[:id])
+          output = {}
+          user.person.role_assignments.map do |role_assigment|
+            if role_assigment.resource.respond_to?(:identifier) && role_assigment.resource.identifier == params[:profile]
+              output[:permissions] = role_assigment.role.permissions 
+            end
+          end
+          present output
+        end
+  
       end
     end
@@ -52,7 +52,7 @@ module Noosfero
   end
   def self.identifier_format
-    '[a-z0-9][a-z0-9~.]*([_-][a-z0-9~.]+)*'
+    '[a-z0-9][a-z0-9~.]*([_\-][a-z0-9~.]+)*'
   end
   def self.default_hostname
@@ -11,13 +11,13 @@ module Noosfero::SampleDataHelper
   def save(obj, &block)
     begin
-      if obj.save
-        print '.'
-        instance_eval &block if block
-        return obj
-      else
-        print 'F'
-      end
+     if obj.save
+       print '.'
+       instance_eval &block if block
+       return obj
+     else
+       print 'F'
+     end
     rescue
       print 'E'
     end
@@ -8,4 +8,12 @@ class FooPlugin &lt; Noosfero::Plugin
     _("A sample plugin to test autoload craziness.")
   end
+  def control_panel_buttons
+    {:title => 'Foo plugin button', :icon => '', :url => ''}
+  end
+
+  def profile_tabs
+    {:title => 'Foo plugin tab', :id => 'foo_plugin', :content => lambda {'Foo plugin random content'} }
+  end
+
 end
@@ -518,16 +518,11 @@ jQuery(function($) {
   $.getJSON('/account/user_data', function userDataCallBack(data) {
     if (data.login) {
       // logged in
-      loggedInDataCallBack(data);
-      addManageEnterprisesToOldStyleMenu(data);
       if (data.chat_enabled) {
         setInterval(function(){ $.getJSON('/account/user_data', chatOnlineUsersDataCallBack)}, 10000);
       }
       $('head').append('<meta content="authenticity_token" name="csrf-param" />');
       $('head').append('<meta content="'+$.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
-    } else {
-      // not logged in
-      $('#user .not-logged-in, .login-block .not-logged-user').fadeIn();
     }
     if (data.notice) {
       display_notice(data.notice);
@@ -536,45 +531,6 @@ jQuery(function($) {
     $(window).trigger("userDataLoaded", data);
   });
-  function loggedInDataCallBack(data) {
-    // logged in
-    $('body').addClass('logged-in');
-    $('#user .logged-in, .login-block .logged-user-info').each(function() {
-      $(this).find('a[href]').each(function() {
-        var new_href = $(this).attr('href').replace('{login}', data.login);
-        if (data.email_domain) {
-          new_href = new_href.replace('{email_domain}', data.email_domain);
-        }
-        $(this).attr('href', new_href);
-      });
-      var html = $(this).html()
-                        .replace(/{login}/g, data.login)
-                        .replace('{avatar}', data.avatar)
-                        .replace('{month}', data.since_month)
-                        .replace('{year}', data.since_year);
-      $(this).html(html).fadeIn();
-      if (data.is_admin) {
-        $('#user .admin-link').show();
-      }
-      if (data.email_domain) {
-        $('#user .webmail-link').show();
-      }
-    });
-  }
-
-  function addManageEnterprisesToOldStyleMenu(data) {
-    if ($('#manage-enterprises-link-template').length > 0) {
-      $.each(data.enterprises, function(index, enterprise) {
-        var item = $('<li>' + $('#manage-enterprises-link-template').html() + '</li>');
-        item.find('a[href]').each(function() {
-          $(this).attr('href', '/myprofile/' + enterprise.identifier);
-        });
-        item.html(item.html().replace('{name}', enterprise.name));
-        item.insertAfter('#manage-enterprises-link-template');
-      });
-    }
-  }
-
   function chatOnlineUsersDataCallBack(data) {
     if ($('#chat-online-users').length == 0) {
       return;
@@ -13,14 +13,16 @@ print &quot;Creating some TinyMce articles: &quot;
 for subject in SUBJECTS
   rand(20).times do |i|
     profile = profiles.sample
+    name = "%s #{subject}" % profile.name
+    next if profile.articles.where(:slug => name.to_slug).first
     article = TinyMceArticle.new(
-      :name => "%s #{subject}" % profile.name,
-      :body => "%s #{subject}" % profile.name,
+      :name => name,
+      :body => name,
       :tag_list => [TAGS.sample, TAGS.sample],
       :profile => profile
     )
     save article do
-      categories.sample.articles << article
+      article.add_category categories.sample
     end
   end
 end
@@ -30,9 +32,11 @@ print &quot;Creating some galleries: &quot;
 for subject in SUBJECTS
   rand(20).times do |i|
     profile = profiles.sample
+    name = "Gallery %s #{subject}" % profile.name
+    next if profile.articles.where(:slug => name.to_slug).first
     save Gallery.new(
-      :name => "Gallery %s #{subject}" % profile.name,
-      :body => "Gallery %s #{subject}" % profile.name,
+      :name => name,
+      :body => name,
       :tag_list => [TAGS.sample, TAGS.sample],
       :profile => profile
     )
@@ -43,16 +47,20 @@ done
 print "Creating some events: "
 for subject in EVENT_SUBJECTS
   for theme in THEMES
+    profile = profiles.sample
+    name = subject % theme
+    next if profile.articles.where(:slug => name.to_slug).first
     event = Event.new(
-      :name => subject % theme,
-      :profile => profiles.sample,
+      :name => name,
+      :profile => profile,
       :start_date => Date.today + (-30 + rand(60)).days,
       :tag_list => [TAGS.sample, TAGS.sample]
     )
     save event do
-      categories.sample.events << event
-      categories.sample.events << event
-      categories.sample.events << event
+      3.times do
+        category = categories.sample
+        event.add_category category
+      end
     end
   end
 end
@@ -32,9 +32,12 @@ groups.each do |group|
         :lat => rand_position(:lat),
         :lng => rand_position(:lng)
       )
+      next if Profile[enterprise.identifier]
       save enterprise do
-        categories.sample.enterprises << enterprise
-        categories.sample.enterprises << enterprise
+        2.times do
+          category = categories.sample
+          enterprise.add_category category
+        end
       end
     end
   end
@@ -43,7 +46,6 @@ done
 EnterpriseActivation.find(:all, :conditions => ['created_at > ?', start_time]).each do |activation|
   enterprise = activation.enterprise
-  puts [activation.code, enterprise.name, enterprise.foundation_year].join(';')
 end
 ze = Person['ze']
@@ -12,10 +12,14 @@ for thing in THINGS
   for color in COLORS
     name = [color, thing].join(' ')
     rand(10).times do |i|
-      save Product.new(
-        :name => name,
-        :profile => enterprises.sample, :price => (i * 13.7),
-      )
+      profile = enterprises.sample
+      next if profile.products.where(:name => name).first
+      product = Product.new
+      product.name = name
+      product.profile_id = profile.id
+      product.price = (i * 13.7)
+      product.product_category_id = categories.sample.id
+      save product
     end
   end
 end
@@ -64,7 +64,7 @@ for name in NAMES
       if categories.present?
         2.times do
           category = categories.sample
-          category.people << user.person unless category.people.include?(user.person)
+          user.person.add_category category unless category.people.include?(user.person)
         end
       end
     end
@@ -149,7 +149,7 @@ for verb in VERBS
       if categories.present?
         2.times do
           category = categories.sample
-          category.communities << community unless category.communities.include?(community)
+          community.add_category category unless category.communities.include?(community)
         end
       end
     end
@@ -653,10 +653,10 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_match /<img.*align="right".*\/>/, saved.body
   end
-  should 'not be able to add image with alignment when textile' do
+  should 'be able to add image with alignment when textile' do
     post :new, :type => 'TextileArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with image <img src='#' align='right'/> right align..." }
     saved = TextileArticle.find_by_name('image-alignment')
-    assert_no_match /align="right"/, saved.body
+    assert_match /align="right"/, saved.body
   end
   should 'be able to create a new event document' do
@@ -154,7 +154,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     community = Community.create!(:name => 'my test community')
     community.add_admin(@profile)
     get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/\{login\}/ }, :content => 'Control panel'
+    assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/my-test-community/ }, :content => 'Control panel'
   end
   should 'show create community in own profile' do
@@ -211,14 +211,14 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
   should 'back when update community info fail' do
     org = fast_create(Community)
-    Community.any_instance.stubs(:update_attributes!).returns(false)
+    Community.any_instance.stubs(:update_attributes).returns(false)
     post :edit, :profile => org.identifier
     assert_template 'edit'
   end
   should 'back when update enterprise info fail' do
     org = fast_create(Enterprise)
-    Enterprise.any_instance.stubs(:update_attributes!).returns(false)
+    Enterprise.any_instance.stubs(:update_attributes).returns(false)
     post :edit, :profile => org.identifier
     assert_template 'edit'
   end
@@ -744,7 +744,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
   should 'not crash if identifier is left blank' do
     c = fast_create(Community)
     assert_nothing_raised do
-      post :edit, :profile => c.identifier, :profile_data => c.attributes.merge('identifier' => '')
+      post :edit, :profile => c.identifier, :profile_data => {:identifier => ''}
     end
   end
@@ -894,6 +894,23 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => {:id => 'field_added_by_plugin', :value => 'value_of_field_added_by_plugin'}
   end
+  should 'add extra content with block provided by plugins on edit' do
+    class TestProfileEditPlugin < Noosfero::Plugin
+      def profile_editor_extras
+        lambda do
+          render :text => "<input id='field_added_by_plugin' value='value_of_field_added_by_plugin'/>"
+        end
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([TestProfileEditPlugin.to_s])
+
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([TestProfileEditPlugin.new])
+
+    get :edit, :profile => profile.identifier
+
+    assert_tag :tag => 'input', :attributes => {:id => 'field_added_by_plugin', :value => 'value_of_field_added_by_plugin'}
+  end
+
   should 'show image upload field from profile editor' do
     env = Environment.default
     env.custom_person_fields = { }
@@ -9,7 +9,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
     user.activate
     login('myuser', 'myuser')
-    assert_tag :tag => 'a', :attributes => { :href => "#{user.environment.top_url}/myprofile\/{login}"  }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{user.login}"  }
     get '/myprofile/myuser'
     assert_response :success
@@ -40,7 +40,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
     article.save!
     login('myuser', 'myuser')
-    assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}"  }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}"  }
     get '/myprofile/myuser'
     assert_response :success
@@ -75,7 +75,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
     login('myuser', 'myuser')
-    assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}"  }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}"  }
     get '/myprofile/myuser'
     assert_response :success
@@ -18,4 +18,19 @@ class AccountHelperTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'remove chars which are not allowed' do
+    stubs(:environment).returns(Environment.default)
+    suggestions = suggestion_based_on_username('z/%&#e')
+    suggestions.each do |suggestion|
+      assert_no_match /.*%&#.*/, suggestion
+    end
+  end
+
+  should 'return empty suggestions if do not find any identifier available' do
+    stubs(:environment).returns(Environment.default)
+    Person.stubs(:is_available?).returns(false)
+    suggestions = suggestion_based_on_username('z/%&#e')
+    assert_equal [], suggestions
+  end
+
 end
@@ -82,4 +82,26 @@ class APITest &lt; ActiveSupport::TestCase
     assert_includes json["users"].map { |a| a["login"] }, user.login
   end
+  should 'list user permissions' do
+    community = fast_create(Community)
+    community.add_admin(user.person)
+    get "/api/v1/users/#{user.id}/?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_includes json["user"]["permissions"], community.identifier
+  end
+
+  should 'list categories' do
+    category = fast_create(Category)
+    get "/api/v1/categories/?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_includes json["categories"].map { |c| c["name"] }, category.name
+  end
+
+  should 'get category by id' do
+    category = fast_create(Category)
+    get "/api/v1/categories/#{category.id}/?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal category.name, json["category"]["name"]
+  end
+
 end
	@@ -1091,10 +1091,10 @@ module ApplicationHelper		@@ -1091,10 +1091,10 @@ module ApplicationHelper
1091	link_to_all = nil	1091	link_to_all = nil
1092	if list.count > 5	1092	if list.count > 5
1093	list = list.first(5)	1093	list = list.first(5)
1094	- link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)	1094	+ link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => user.identifier)
1095	end	1095	end
1096	link = list.map do \|element\|	1096	link = list.map do \|element\|
1097	- link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])	1097	+ link_to(content_tag('strong', _('<span>Manage</span> %s') % element.short_name(25)), element.admin_url, :class => "icon-menu-"+element.class.identification.underscore, :title => _('Manage %s') % element.short_name)
1098	end	1098	end
1099	if link_to_all	1099	if link_to_all
1100	link << link_to_all	1100	link << link_to_all
	@@ -1118,15 +1118,15 @@ module ApplicationHelper		@@ -1118,15 +1118,15 @@ module ApplicationHelper
1118	pending_tasks_count = ''	1118	pending_tasks_count = ''
1119	count = user ? Task.to(user).pending.count : -1	1119	count = user ? Task.to(user).pending.count : -1
1120	if count > 0	1120	if count > 0
1121	- pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))	1121	+ pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1122	end	1122	end
1123		1123
1124	- (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +	1124	+ (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
1125	render_environment_features(:usermenu) +	1125	render_environment_features(:usermenu) +
1126	- link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +	1126	+ link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') +
1127	manage_enterprises.to_s +	1127	manage_enterprises.to_s +
1128	manage_communities.to_s +	1128	manage_communities.to_s +
1129	- link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +	1129	+ link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
1130	pending_tasks_count +	1130	pending_tasks_count +
1131	link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))	1131	link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
1132	end	1132	end
1	-<div class="logged-user-info" style='display: none;'>
2	- <h2><%= _('Logged in as %s') % '{login}' %></h2>
3	- <ul>
4	- <li><%= _('User since {year}/{month}') %></li>
5	- <li><%= link_to _('Homepage'), '/{login}' %></li>
6	- </ul>
7	- <div class="user-actions">
8	- <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>	1	+<% if user.present? %>
		2	+ <div class="logged-user-info">
		3	+ <h2><%= _('Logged in as %s') % user.identifier %></h2>
		4	+ <ul>
		5	+ <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
		6	+ <li><%= link_to _('Homepage'), user.public_profile_url %></li>
		7	+ </ul>
		8	+ <div class="user-actions">
		9	+ <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
		10	+ </div>
9	</div>	11	</div>
10	-</div>
11	-<div class='not-logged-user' style='display: none;'>
12	- <%= render :file => 'account/login_block' %>
13	-</div>	12	+<% else %>
		13	+ <div class='not-logged-user'>
		14	+ <%= render :file => 'account/login_block' %>
		15	+ </div>
		16	+<% end%>
	@@ -53,7 +53,7 @@		@@ -53,7 +53,7 @@
53		53
54	<%=	54	<%=
55	@plugins.dispatch(:profile_editor_extras).map do \|content\|	55	@plugins.dispatch(:profile_editor_extras).map do \|content\|
56	- if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end	56	+ content.kind_of?(Proc) ? self.instance_exec(&content) : content
57	end.join("\n")	57	end.join("\n")
58	%>	58	%>
59		59
	@@ -165,7 +165,7 @@ Feature: forum		@@ -165,7 +165,7 @@ Feature: forum
165	\| article \| author \| title \| body \|	165	\| article \| author \| title \| body \|
166	\| Post one \| joaosilva \| Hi all \| Hi all \|	166	\| Post one \| joaosilva \| Hi all \| Hi all \|
167	When I go to /joaosilva/forum	167	When I go to /joaosilva/forum
168	- Then I should see "Joao" linking to "http://localhost/joaosilva/"	168	+ Then I should see "Joao Silva" within ".forum-post-last-answer"
169		169
170	@selenium	170	@selenium
171	Scenario: community member should be able to see the discussion topic button	171	Scenario: community member should be able to see the discussion topic button
	@@ -55,7 +55,7 @@ Feature: domain for profile		@@ -55,7 +55,7 @@ Feature: domain for profile
55	Scenario: access community by domain	55	Scenario: access community by domain
56	Given I go to the search communities page	56	Given I go to the search communities page
57	When I follow "Sample Community" within ".search-profile-item"	57	When I follow "Sample Community" within ".search-profile-item"
58	- Then the page title should be "Sample Community - Colivre.net"	58	+ Then the page title should be "Sample Community"
59		59
60	# This test is not working because the community domain isn't at all different	60	# This test is not working because the community domain isn't at all different
61	# from the environment (localhost / 127.0.0.1)	61	# from the environment (localhost / 127.0.0.1)
	@@ -21,6 +21,7 @@ Before('@ignore-hidden-elements') do		@@ -21,6 +21,7 @@ Before('@ignore-hidden-elements') do
21	end	21	end
22		22
23	Capybara.default_wait_time = 30	23	Capybara.default_wait_time = 30
		24	+Capybara.server_host = "localhost"
24		25
25	After do	26	After do
26	DatabaseCleaner.clean	27	DatabaseCleaner.clean
	@@ -16,6 +16,7 @@ module API		@@ -16,6 +16,7 @@ module API
16	mount V1::Communities	16	mount V1::Communities
17	mount V1::People	17	mount V1::People
18	mount V1::Enterprises	18	mount V1::Enterprises
		19	+ mount V1::Categories
19	mount Session	20	mount Session
20		21
21	end	22	end
	@@ -59,8 +59,18 @@ module API		@@ -59,8 +59,18 @@ module API
59		59
60	class User < Grape::Entity	60	class User < Grape::Entity
61	root 'users', 'user'	61	root 'users', 'user'
		62	+ expose :id
62	expose :login	63	expose :login
63	expose :person, :using => Profile	64	expose :person, :using => Profile
		65	+ expose :permissions do \|user, options\|
		66	+ output = {}
		67	+ user.person.role_assignments.map do \|role_assigment\|
		68	+ if role_assigment.resource.respond_to?(:identifier)
		69	+ output[role_assigment.resource.identifier] = role_assigment.role.permissions
		70	+ end
		71	+ end
		72	+ output
		73	+ end
64	end	74	end
65		75
66	class UserLogin < User	76	class UserLogin < User
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+module API
	2	+ module V1
	3	+ class Categories < Grape::API
	4	+ before { detect_stuff_by_domain }
	5	+ before { authenticate! }
	6	+
	7	+ resource :categories do
	8	+
	9	+ get do
	10	+ type = params[:category_type]
	11	+ categories = type.nil? ? environment.categories : environment.categories.find(:all, :conditions => {:type => type})
	12	+ present categories, :with => Entities::Category
	13	+ end
	14	+
	15	+ desc "Return the category by id"
	16	+ get ':id' do
	17	+ present environment.categories.find(params[:id]), :with => Entities::Category
	18	+ end
	19	+
	20	+ end
	21	+
	22	+ end
	23	+ end
	24	+end
	@@ -15,6 +15,17 @@ module API		@@ -15,6 +15,17 @@ module API
15	present environment.users.find(params[:id]), :with => Entities::User	15	present environment.users.find(params[:id]), :with => Entities::User
16	end	16	end
17		17
		18	+ get ":id/permissions" do
		19	+ user = environment.users.find(params[:id])
		20	+ output = {}
		21	+ user.person.role_assignments.map do \|role_assigment\|
		22	+ if role_assigment.resource.respond_to?(:identifier) && role_assigment.resource.identifier == params[:profile]
		23	+ output[:permissions] = role_assigment.role.permissions
		24	+ end
		25	+ end
		26	+ present output
		27	+ end
		28	+
18	end	29	end
19		30
20	end	31	end