Merge branch 'master' into pluginize-solr

Rodrigo Souto
2 parents 0e26cea3 146786cb
Showing 38 changed files with 294 additions and 57 deletions Show diff stats
INSTALL.varnish
app/controllers/admin/environment_design_controller.rb
app/controllers/public/catalog_controller.rb
app/helpers/catalog_helper.rb
app/models/spammer_logger.rb
app/models/tags_block.rb
app/models/user.rb
app/views/account/_signup_form.rhtml
app/views/account/forgot_password.rhtml
app/views/catalog/index.rhtml
app/views/search/_image.html.erb
db/migrate/20130304200849_add_default_value_to_product_highlighted.rb
db/schema.rb
debian/changelog
features/browse_catalogs.feature
features/signup.feature
features/step_definitions/noosfero_steps.rb
gitignore.example
lib/noosfero.rb
lib/noosfero/core_ext/string.rb
@@ -45,6 +45,10 @@ Install the RPAF apache module (or skip this step if not using apache):
 On manual installations, change "/etc/noosfero/*" to
 "{Rails.root}/etc/noosfero/*"
  
+NOTE: it is very important that the *.vcl files are included in that order,
+i.e. *first* include "varnish-noosfero.vcl", and *after*
+"noosfero-accept-language.cvl".
+
 4c) Restart Varnish
  
   # invoke-rc.d varnish restart
@@ -3,7 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
  
   def available_blocks
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
   end
  
 end
@@ -7,7 +7,7 @@ class CatalogController &lt; PublicController
   def index
     @category = params[:level] ? ProductCategory.find(params[:level]) : nil
     @products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
-    @categories = ProductCategory.on_level(params[:level])
+    @categories = ProductCategory.on_level(params[:level]).order(:name)
   end
  
   protected
@@ -21,7 +21,7 @@ module CatalogHelper
  
   def category_sub_links(category)
     sub_categories = []
-    category.children.each do |sub_category|
+    category.children.order(:name).each do |sub_category|
       sub_categories << category_link(sub_category, true)
     end
     content_tag('ul', sub_categories) if sub_categories.size > 1
@@ -5,10 +5,10 @@ class SpammerLogger &lt; Logger
   def self.log(spammer_ip, object=nil)
     if object
       if object.kind_of?(Comment)
-        @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+        @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
       end
     else
-        @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n"
+        @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
     end
   end
  
@@ -20,7 +20,8 @@ class TagsBlock &lt; Block
   end
  
   def content(args={})
-    tags = owner.article_tags
+    is_env = owner.class == Environment
+    tags = is_env ? owner.tag_counts : owner.article_tags
     return '' if tags.empty?
  
     if limit
@@ -29,18 +30,28 @@ class TagsBlock &lt; Block
       tags_tmp.map{ |k,v| tags[k] = v }
     end
  
+    url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
+          owner.public_profile_url.merge(:controller => 'profile', :action => 'tags')
+    tagname_option = is_env ? :tag : :id
+
     block_title(title) +
     "\n<div class='tag_cloud'>\n"+
-    tag_cloud( tags, :id,
-               owner.public_profile_url.merge(:controller => 'profile', :action => 'tags'),
-               :max_size => 16, :min_size => 9 ) +
+    tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
     "\n</div><!-- end class='tag_cloud' -->\n";
   end
  
   def footer
-    owner_id = owner.identifier
-    lambda do
-      link_to s_('tags|View all'), :profile => owner_id, :controller => 'profile', :action => 'tags'
+    if owner.class == Environment
+      lambda do
+        link_to s_('tags|View all'),
+          :controller => 'search', :action => 'tags'
+      end
+    else
+      owner_id = owner.identifier
+      lambda do
+        link_to s_('tags|View all'),
+          :profile => owner_id, :controller => 'profile', :action => 'tags'
+      end
     end
   end
  
@@ -15,7 +15,7 @@ class User &lt; ActiveRecord::Base
   # FIXME ugly workaround
   def self.human_attribute_name(attrib)
     case attrib.to_sym
-      when :login:  return _('Username')
+      when :login:  return [_('Username'), _('Email')].join(' / ')
       when :email:  return _('e-Mail')
       else _(self.superclass.human_attribute_name(attrib))
     end
@@ -116,10 +116,11 @@ class User &lt; ActiveRecord::Base
  
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
  
-  # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
+  # Authenticates a user by their login name or email and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
     environment ||= Environment.default
-    u = first :conditions => ['login = ? AND environment_id = ? AND activated_at IS NOT NULL', login, environment.id] # need to get the salt
+    u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
+                                   login, login, environment.id] # need to get the salt
     u && u.authenticated?(password) ? u : nil
   end
  
@@ -32,7 +32,8 @@
     <span id="signup-domain"><%= environment.default_hostname %>/</span>
     <div id='signup-login'>
       <div id='signup-login-field' class='formfield'>
-        <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
+        <%= required text_field(:user, :login, :id => 'user_login',
+                                :onchange => 'this.value = convToValidUsername(this.value);') %>
         <div id='url-check'><p>&nbsp;</p></div>
       </div>
       <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
@@ -5,7 +5,7 @@
 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
  
   <%= f.text_field :login,
-                   :onchange => 'this.value = convToValidLogin( this.value )' %>
+                   :onchange => 'this.value = convToValidUsername( this.value )' %>
  
   <%= f.text_field :email %>
  
@@ -7,13 +7,15 @@
  
 <div class='l-sidebar-left-bar'>
   <ul>
-    <% if @categories.size > 0 %>
+    <% if @categories.present? %>
       <% @categories.each do |category| %>
         <%= category_link(category) %>
         <%= category_sub_links(category) %>
       <% end %>
+    <% elsif @category.present? %>
+      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %>
     <% else %>
-      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %>
+      <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %>
     <% end %>
   </ul>
 </div>
@@ -28,8 +28,9 @@
     <div class="search-gallery-items">
       <% r = image.children.find(:all, :order => :updated_at, :conditions => ['type = ?', 'UploadedFile']).last(3) %>
       <% if r.length > 0 %>
-        <% r.each do |i| %>
-          <%= link_to '', i.view_url, :class => "search-image-pic", :style => 'background-image: url(%s)'% i.public_filename(:thumb) %>
+        <% r.each_index do |i| img = r[i] %>
+          <%= link_to '', img.view_url, :class => "search-image-pic pic-num#{i+1}",
+                                        :style => 'background-image: url(%s)'% img.public_filename(:thumb) %>
         <% end %>
       <% else %>
         <div class="search-no-image"><span><%= _('No image') %></span></div>
@@ -0,0 +1,10 @@
+class AddDefaultValueToProductHighlighted < ActiveRecord::Migration
+  def self.up
+    change_column :products, :highlighted, :boolean, :default => false
+    execute('UPDATE products SET highlighted=(0>1) WHERE highlighted IS NULL;')
+  end
+
+  def self.down
+    say 'This migraiton is not reversible!'
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20130111232201) do
+ActiveRecord::Schema.define(:version => 20130304200849) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -415,7 +415,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130111232201) do
     t.datetime "updated_at"
     t.decimal  "discount"
     t.boolean  "available",           :default => true
-    t.boolean  "highlighted"
+    t.boolean  "highlighted",         :default => false
     t.integer  "unit_id"
     t.integer  "image_id"
   end
+noosfero (0.41.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Fri, 08 Mar 2013 11:33:11 -0300
+
 noosfero (0.41.0) unstable; urgency=low
  
   * Features version with anti spam-bot measures
@@ -18,7 +18,7 @@ Feature: browse catalogs
  
   Scenario: display titles
     Then I should see "Associação de Artesanato de Bonito"
-    And I should see "Products/Services" within "#product-list"
+    And I should see "Products/Services"
  
   Scenario: display the simplest possible product
     Given the following products
@@ -3,6 +3,7 @@ Feature: signup
   I want to sign up to the site
   So I can have fun using its features
  
+@selenium
   Scenario: successfull registration
     Given I am on the homepage
     When I follow "Login"
@@ -13,6 +14,7 @@ Feature: signup
       | Password              | secret                |
       | Password confirmation | secret                |
       | Full name             | José da Silva         |
+    And wait for the captcha signup time
     And I press "Create my account"
     Then I should not be logged in
     And I should receive an e-mail on josesilva@example.com
@@ -36,6 +38,7 @@ Feature: signup
     And I go to signup page
     Then I should be on Joao Silva's control panel
  
+  @selenium
   Scenario: user cannot register without a name
     Given I am on the homepage
     And I follow "Login"
@@ -44,6 +47,7 @@ Feature: signup
     And I fill in "Username" with "josesilva"
     And I fill in "Password" with "secret"
     And I fill in "Password confirmation" with "secret"
+    And wait for the captcha signup time
     And I press "Create my account"
     Then I should see "Name can't be blank"
  
@@ -538,6 +538,7 @@ end
  
 Then /^I should receive an e-mail on (.*)$/ do |address|
   last_mail = ActionMailer::Base.deliveries.last
+  last_mail.nil?.should be_false
   last_mail['to'].to_s.should == address
 end
  
@@ -748,3 +749,8 @@ Given /^the profile (.*) is configured to (.*) after login$/ do |profile, option
   profile.redirection_after_login = redirection
   profile.save
 end
+
+When /^wait for the captcha signup time$/ do
+  environment = Environment.default
+  sleep environment.min_signup_delay + 1
+end
@@ -11,6 +11,7 @@ config/mongrel_cluster.yml
 config/solr.yml
 config/plugins
 config/thin.yml
+config/local.rb
 index
 locale
 log
@@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.41.0'
+  VERSION = '0.41.1'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -11,12 +11,52 @@ class String
     [ 'ó', 'ò', 'ô', 'ö', 'õ', 'º' ] => 'o',
     [ 'Ú', 'Ù', 'Û', 'Ü' ] => 'U',
     [ 'ú', 'ù', 'û', 'ü' ] => 'u',
+    [ 'ß' ] => 'ss',
     [ 'Ç' ] => 'C',
     [ 'ç' ] => 'c',
     [ 'Ñ' ] => 'N',
     [ 'ñ' ] => 'n',
     [ 'Ÿ' ] => 'Y',
     [ 'ÿ' ] => 'y',
+# Cyrillic alphabet transliteration
+    [ 'а', 'А' ] => 'a',
+    [ 'б', 'Б' ] => 'b',
+    [ 'в', 'В' ] => 'v',
+    [ 'г', 'Г' ] => 'g',
+    [ 'д', 'Д' ] => 'd',
+    [ 'е', 'Е' ] => 'e',
+    [ 'ё', 'Ё' ] => 'yo',
+    [ 'ж', 'Ж' ] => 'zh',
+    [ 'з', 'З' ] => 'z',
+    [ 'и', 'И' ] => 'i',
+    [ 'й', 'Й' ] => 'y',
+    [ 'к', 'К' ] => 'k',
+    [ 'л', 'Л' ] => 'l',
+    [ 'м', 'М' ] => 'm',
+    [ 'н', 'Н' ] => 'n',
+    [ 'о', 'О' ] => 'o',
+    [ 'п', 'П' ] => 'p',
+    [ 'р', 'Р' ] => 'r',
+    [ 'с', 'С' ] => 's',
+    [ 'т', 'Т' ] => 't',
+    [ 'у', 'У' ] => 'u',
+    [ 'ф', 'Ф' ] => 'f',
+    [ 'х', 'Х' ] => 'h',
+    [ 'ц', 'Ц' ] => 'ts',
+    [ 'ч', 'Ч' ] => 'ch',
+    [ 'ш', 'Ш' ] => 'sh',
+    [ 'щ', 'Щ' ] => 'sch',
+    [ 'э', 'Э' ] => 'e',
+    [ 'ю', 'Ю' ] => 'yu',
+    [ 'я', 'Я' ] => 'ya',
+    [ 'ы', 'Ы' ] => 'i',
+    [ 'ь', 'Ь' ] => '',
+    [ 'ъ', 'Ъ' ] => '',
+# Ukrainian lovely letters
+    [ 'і', 'І' ] => 'i',
+    [ 'ї', 'Ї' ] => 'yi',
+    [ 'є', 'Є' ] => 'ye',
+    [ 'ґ', 'Ґ' ] => 'g',
   }
  
   # transliterate a string (assumed to contain UTF-8 data)
@@ -4,7 +4,7 @@ class CustomFormsPlugin::Field &lt; ActiveRecord::Base
   validates_presence_of :form, :name
   validates_uniqueness_of :slug, :scope => :form_id
  
-  belongs_to :form, :class_name => 'CustomFormsPlugin::Form', :dependent => :destroy
+  belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
   has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
  
   serialize :choices, Hash
 class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
   belongs_to :profile
  
-  has_many :fields, :class_name => 'CustomFormsPlugin::Field'
+  has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy
   has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
  
   serialize :access
@@ -60,5 +60,16 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
     assert_equal 2, field.choices['Second']
     assert_equal 3, field.choices['Third']
   end
+
+  should 'not destroy form after removing a field' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    license_field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    url_field = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
+
+    assert_no_difference CustomFormsPlugin::Form, :count do
+      url_field.destroy
+    end
+    assert_equal form.fields, [license_field]
+  end
 end
  
@@ -169,4 +169,15 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
     assert_includes scope, f2
     assert_not_includes scope, f3
   end
+
+  should 'destroy fields after removing a form' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    license_field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    url_field = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
+
+    assert_difference CustomFormsPlugin::Field, :count, -2 do
+      form.destroy
+    end
+  end
+
 end
 (function($) {
   $(window).bind('userDataLoaded', function(event, data) {
-    if (data.login || $('meta[name=profile.allow_unauthenticated_comments]').length > 0) {
+    if (data.login || $('meta[name="profile.allow_unauthenticated_comments"]').length > 0) {
       $('.post-comment-button').show();
       $('#page-comment-form').show();
       $('.comment-footer').show();
@@ -209,7 +209,7 @@ label.error {
   padding-left: 5px;
 }
  
-#order-filter {
+#cart-order-filter {
   background-color: #ccc;
   border: 1px solid #aaa;
   border-radius: 5px;
@@ -6,7 +6,7 @@
 <% status_collection = [[nil, _('All')]] %>
 <% status_collection += status.map{|s| [pos+=1, s] } %>
  
-<% form_tag({}, {:id => 'order-filter'}) do %>
+<% form_tag({}, {:id => 'cart-order-filter'}) do %>
   <%= labelled_text_field(_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %>
   <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %>
   <span style="white-space:nowrap"><%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status,  status_collection)%></span>
@@ -15,12 +15,12 @@ class SpaminatorPlugin::Spaminator
     def initialize_logger(environment)
       logdir = File.join(RAILS_ROOT, 'log', SpaminatorPlugin.name.underscore)
       File.makedirs(logdir) if !File.exist?(logdir)
-      logpath = File.join(logdir, "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime("%F_%T")}.log")
+      logpath = File.join(logdir, "#{environment.name.to_slug}_#{ENV['RAILS_ENV']}_#{Time.now.strftime('%F_%T')}.log")
       @logger = Logger.new(logpath)
     end
  
     def log(message)
-      @logger << "[#{Time.now.strftime("%F %T %z")}] #{message}\n"
+      @logger << "[#{Time.now.strftime('%F %T %z')}] #{message}\n"
     end
   end
  
@@ -5497,7 +5497,7 @@ msgstr &quot;Produto destacado&quot;
 #: app/views/catalog/index.rhtml:42 app/views/search/_image.rhtml:35
 #: app/views/search/_image.rhtml:47
 msgid "No image"
-msgstr "Nenhum imagem"
+msgstr "Nenhuma imagem"
  
 #: app/views/catalog/index.rhtml:52
 msgid "from "
@@ -29,7 +29,14 @@ function focus_first_field() {
  
 /* * * Convert a string to a valid login name * * */
 function convToValidLogin( str ) {
-  return convToValidIdentifier(str, '')
+  if (str.indexOf('@') == -1)
+    return convToValidUsername(str);
+  else
+    return convToValidEmail(str);
+}
+
+function convToValidUsername( str ) {
+  return convToValidIdentifier(str, '');
 }
  
 /* * * Convert a string to a valid login name * * */
@@ -46,6 +53,18 @@ function convToValidIdentifier( str, sep ) {
             .replace( /[^-_a-z0-9.]+/g, sep )
 }
  
+function convToValidEmail( str ) {
+  return str.toLowerCase()
+            .replace( /á|à|ã|â/g, "a" )
+            .replace( /é|ê/g,     "e" )
+            .replace( /í/g,       "i" )
+            .replace( /ó|ô|õ|ö/g, "o" )
+            .replace( /ú|ũ|ü/g,   "u" )
+            .replace( /ñ/g,       "n" )
+            .replace( /ç/g,       "c" )
+            .replace( /[^@a-z0-9!#$%&'*+-/=?^_`{|}~.]+/g, '' )
+}
+
 function updateUrlField(name_field, id) {
    url_field = $(id);
    old_url_value = url_field.value;
@@ -2715,6 +2715,11 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   padding: 0;
 }
  
+#catalog-categories-notice {
+  color: #555753;
+  padding-bottom: 0.5em;
+}
+
 /* * * Show Product * * * * * * * * * * * * */
  
 .controller-catalog #show_product .product-pic {
@@ -756,10 +756,18 @@ li.search-product-item hr {
   min-height: 98px;
   position: absolute;
 }
+.search-gallery .search-content-first-column {
+  width: 190px;
+}
+
 .search-content-second-column {
   margin-left: 140px;
   width: auto;
 }
+.search-gallery .search-content-second-column {
+  margin-left: 200px;
+}
+
 .search-content-second-column tr:hover {
   background-color: none;
 }
@@ -827,15 +835,45 @@ a.search-image-pic {
   display: table-cell;
   vertical-align: middle;
 }
+
 .search-gallery-items a.search-image-pic {
   float:left;
   margin:0 2px;
 }
+
+
 .search-gallery .search-gallery-items {
   float: left;
-  margin: 0 10px 0 0;
+  margin: 0;
   min-width: 130px;
+  position: relative;
 }
+
+.search-gallery .search-gallery-items a.search-image-pic {
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
+  width: 62px;
+  margin: 0px 0px 1px 1px;
+  background-size: cover;
+  background-position: 50% 10%;
+  float: none;
+}
+
+.search-gallery .search-gallery-items a.search-image-pic.pic-num1,
+.search-gallery .search-gallery-items a.search-image-pic.pic-num2 {
+  display: block;
+  width: 60px;
+  height: 49px;
+}
+.search-gallery .search-gallery-items a.search-image-pic.pic-num3 {
+  width: 130px;
+  height: 99px;
+  position: absolute;
+  left: 61px;
+  top: 0px;
+}
+
 .search-content-first-column .search-image-container .search-image-pic
 .search-uploaded-file-first-column .search-image-container .search-image-pic {
   display: block;
@@ -5,20 +5,24 @@ include Noosfero::SampleDataHelper
 categories = $environment.categories
  
 places = [
-  { :country=>'BR', :city=>'Salvador',
+  { :country=>'BR', :state=>'Bahia',        :city=>'Salvador',
     :lat=>-12.94032, :lng=>-38.58398  },
-  { :country=>'BR', :city=>'São Paulo',
+  { :country=>'BR', :state=>'Bahia',        :city=>'Feira de Santana',
+    :lat=>-12.25547, :lng=>-38.95430  },
+  { :country=>'BR', :state=>'São Paulo',    :city=>'São Paulo',
     :lat=>-23.54894, :lng=>-46.63881  },
-  { :country=>'BR', :city=>'Rio de Janeiro',
-    :lat=>-22.90353, :lng=>-43.20958  },
-  { :country=>'AR', :city=>'Buenos Aires',
+  { :country=>'BR', :state=>'Rio de Janeiro', :city=>'Petrópolis',
+    :lat=>-22.50462, :lng=>-43.18232  },
+  { :country=>'AR', :state=>'A.C.',         :city=>'Buenos Aires',
     :lat=>-34.61088, :lng=>-58.39782  },
-  { :country=>'AR', :city=>'Mar del Plata',
+  { :country=>'AR', :state=>'Buenos Aires', :city=>'Mar del Plata',
     :lat=>-37.98317, :lng=>-57.59513  },
-  { :country=>'MX', :city=>'Acapulco',
+  { :country=>'MX', :state=>'Guerrero',     :city=>'Acapulco',
     :lat=>16.86369,  :lng=>-99.88151  },
-  { :country=>'US', :city=>'Los Angeles',
+  { :country=>'US', :state=>'California',   :city=>'Los Angeles',
     :lat=>34.02307,  :lng=>-118.24310 },
+  { :country=>'US', :state=>'Florida',      :city=>'Jacksonville',
+    :lat=>30.33217,  :lng=>-81.65566 },
   { :country=>'IT', :city=>'Roma',
     :lat=>41.89512,  :lng=>12.48184   },
   { :country=>'IN', :city=>'Mumbai',
@@ -51,12 +55,17 @@ for name in NAMES
       user.person.name = full_name
       place = places[rand(places.length)]
       user.person.data[:country] = place[:country]
+      user.person.state = place[:state]
       user.person.city = place[:city]
       user.person.lat = place[:lat] + (rand/100)-0.005
       user.person.lng = place[:lng] + (rand/100)-0.005
       user.person.save!
-      categories.rand.people << user.person
-      categories.rand.people << user.person
+      if categories.present?
+        2.times do
+          category = categories.rand
+          category.people << user.person unless category.people.include?(user.person)
+        end
+      end
     end
   end
 end
@@ -89,12 +98,8 @@ guest = User.new({
   :password_confirmation => 'test',
   :environment => $environment,
 })
-save guest do
-  5.times do
-    communities.rand.add_admin(guest.person)
-    communities.rand.add_member(guest.person)
-  end
-end
+save guest
+
 done
  
 print "Activating users: "
@@ -128,14 +133,32 @@ for verb in VERBS
   for stuff in STUFF
     name = [verb, stuff].join(' ')
     community = Community.new(:name => name, :environment => $environment)
+    if rand(2)==1 # not all communities must have a place
+      place = places[rand(places.length)]
+      community.data[:country] = place[:country]
+      community.state = place[:state]
+      community.city = place[:city]
+    end
     save community do
       communities << community
       rand(10).times do
-        community.add_member(people.rand)
+        person = people.rand
+        community.add_member(person) unless community.members.include?(person)
+      end
+      if categories.present?
+        2.times do
+          category = categories.rand
+          category.communities << community unless category.communities.include?(community)
+        end
       end
-      categories.rand.communities << community
-      categories.rand.communities << community
     end
   end
 end
+
+5.times do
+  community = communities.rand
+  community.add_member(guest.person) unless community.members.include?(guest.person)
+  community.add_admin(guest.person) unless community.admins.include?(guest.person)
+end
+
 done
@@ -224,4 +224,21 @@ class CatalogControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'li', :attributes => {:id => "product-#{p2.id}", :class => /not-available/}
   end
  
+  should 'sort categories by name' do
+    environment = @enterprise.environment
+    environment.categories.destroy_all
+    pc1 = ProductCategory.create!(:name => "Drinks", :environment => environment)
+    pc2 = ProductCategory.create!(:name => "Bananas", :environment => environment)
+    pc3 = ProductCategory.create!(:name => "Sodas", :environment => environment)
+    pc4 = ProductCategory.create!(:name => "Pies", :environment => environment)
+    p1 = fast_create(Product, :product_category_id => pc1.id, :enterprise_id => @enterprise.id)
+    p2 = fast_create(Product, :product_category_id => pc2.id, :enterprise_id => @enterprise.id)
+    p3 = fast_create(Product, :product_category_id => pc3.id, :enterprise_id => @enterprise.id)
+    p4 = fast_create(Product, :product_category_id => pc4.id, :enterprise_id => @enterprise.id)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_equal [pc2, pc1, pc4, pc3], assigns(:categories)
+  end
+
 end
@@ -6,7 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
  
 class EnvironmentDesignControllerTest < ActionController::TestCase
  
-  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
+  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
  
   def setup
     @controller = EnvironmentDesignController.new
@@ -175,6 +175,16 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => { :id => 'block_address' }
   end
  
+  should 'be able to edit TagsBlock' do
+    login_as(create_admin_user(Environment.default))
+    b = TagsBlock.create!
+    e = Environment.default
+    e.boxes.create!
+    e.boxes.first.blocks << b
+    get :edit, :id => b.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
   should 'create back link to environment control panel' do
     Environment.default.boxes.create!.blocks << CommunitiesBlock.new
     Environment.default.boxes.create!.blocks << EnterprisesBlock.new
@@ -1347,6 +1347,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     a = profile.articles.create!(:name => 'a test article', :last_changed_by => author)
     assert_equal author.name, a.author_name
     author.destroy
+    a.reload
     a.author_name = 'some name'
     assert_equal 'some name', a.author_name
   end
@@ -22,9 +22,22 @@ class TagsBlockTest &lt; ActiveSupport::TestCase
   end
  
   should 'generate links to tags' do
-    assert_match /profile\/testinguser\/tags\/first-tag/, block.content
+    assert_match /profile\/testinguser\/tags\/first-tag/,  block.content
     assert_match /profile\/testinguser\/tags\/second-tag/, block.content
-    assert_match /profile\/testinguser\/tags\/third-tag/, block.content
+    assert_match /profile\/testinguser\/tags\/third-tag/,  block.content
+  end
+
+  should 'generate links to tags on a environment page' do
+    @otheruser = create_user('othertestinguser').person
+    @otheruser.articles.build(:name => 'article A', :tag_list => 'other-tag').save!
+    @otheruser.articles.build(:name => 'article B', :tag_list => 'other-tag, second-tag').save!
+    box = Box.create!(:owner => Environment.default)
+    @block = TagsBlock.create!(:box => box)
+
+    assert_match /\/tag\/first-tag" [^>]+"3 items"/,  block.content
+    assert_match /\/tag\/second-tag" [^>]+"3 items"/, block.content
+    assert_match /\/tag\/third-tag" [^>]+"one item"/, block.content
+    assert_match /\/tag\/other-tag" [^>]+"2 items"/,  block.content
   end
  
   should 'return (none) when no tags to display' do
@@ -53,6 +53,8 @@ class UserTest &lt; ActiveSupport::TestCase
  
   def test_should_authenticate_user
     assert_equal users(:johndoe), User.authenticate('johndoe', 'test')
+    assert_equal users(:johndoe), User.authenticate('johndoe@localhost.localdomain', 'test')
+    assert_equal nil, User.authenticate('wrongemail@localhost', 'test')
   end
  
   def test_should_authenticate_user_of_nondefault_environment
...	...	@@ -45,6 +45,10 @@ Install the RPAF apache module (or skip this step if not using apache):
45	45	On manual installations, change "/etc/noosfero/*" to
46	46	"{Rails.root}/etc/noosfero/*"
47	47
	48	+NOTE: it is very important that the *.vcl files are included in that order,
	49	+i.e. first include "varnish-noosfero.vcl", and after
	50	+"noosfero-accept-language.cvl".
	51	+
48	52	4c) Restart Varnish
49	53
50	54	# invoke-rc.d varnish restart
...	...
...	...	@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
3	3	protect 'edit_environment_design', :environment
4	4
5	5	def available_blocks
6		- @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
	6	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
7	7	end
8	8
9	9	end
...	...
...	...	@@ -7,7 +7,7 @@ class CatalogController < PublicController
7	7	def index
8	8	@category = params[:level] ? ProductCategory.find(params[:level]) : nil
9	9	@products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
10		- @categories = ProductCategory.on_level(params[:level])
	10	+ @categories = ProductCategory.on_level(params[:level]).order(:name)
11	11	end
12	12
13	13	protected
...	...
...	...	@@ -21,7 +21,7 @@ module CatalogHelper
21	21
22	22	def category_sub_links(category)
23	23	sub_categories = []
24		- category.children.each do \|sub_category\|
	24	+ category.children.order(:name).each do \|sub_category\|
25	25	sub_categories << category_link(sub_category, true)
26	26	end
27	27	content_tag('ul', sub_categories) if sub_categories.size > 1
...	...
...	...	@@ -5,10 +5,10 @@ class SpammerLogger < Logger
5	5	def self.log(spammer_ip, object=nil)
6	6	if object
7	7	if object.kind_of?(Comment)
8		- @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
	8	+ @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
9	9	end
10	10	else
11		- @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n"
	11	+ @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
12	12	end
13	13	end
14	14
...	...
...	...	@@ -20,7 +20,8 @@ class TagsBlock < Block
20	20	end
21	21
22	22	def content(args={})
23		- tags = owner.article_tags
	23	+ is_env = owner.class == Environment
	24	+ tags = is_env ? owner.tag_counts : owner.article_tags
24	25	return '' if tags.empty?
25	26
26	27	if limit
...	...	@@ -29,18 +30,28 @@ class TagsBlock < Block
29	30	tags_tmp.map{ \|k,v\| tags[k] = v }
30	31	end
31	32
	33	+ url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
	34	+ owner.public_profile_url.merge(:controller => 'profile', :action => 'tags')
	35	+ tagname_option = is_env ? :tag : :id
	36	+
32	37	block_title(title) +
33	38	"\n<div class='tag_cloud'>\n"+
34		- tag_cloud( tags, :id,
35		- owner.public_profile_url.merge(:controller => 'profile', :action => 'tags'),
36		- :max_size => 16, :min_size => 9 ) +
	39	+ tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
37	40	"\n</div><!-- end class='tag_cloud' -->\n";
38	41	end
39	42
40	43	def footer
41		- owner_id = owner.identifier
42		- lambda do
43		- link_to s_('tags\|View all'), :profile => owner_id, :controller => 'profile', :action => 'tags'
	44	+ if owner.class == Environment
	45	+ lambda do
	46	+ link_to s_('tags\|View all'),
	47	+ :controller => 'search', :action => 'tags'
	48	+ end
	49	+ else
	50	+ owner_id = owner.identifier
	51	+ lambda do
	52	+ link_to s_('tags\|View all'),
	53	+ :profile => owner_id, :controller => 'profile', :action => 'tags'
	54	+ end
44	55	end
45	56	end
46	57
...	...
...	...	@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
15	15	# FIXME ugly workaround
16	16	def self.human_attribute_name(attrib)
17	17	case attrib.to_sym
18		- when :login: return _('Username')
	18	+ when :login: return [_('Username'), _('Email')].join(' / ')
19	19	when :email: return _('e-Mail')
20	20	else _(self.superclass.human_attribute_name(attrib))
21	21	end
...	...	@@ -116,10 +116,11 @@ class User < ActiveRecord::Base
116	116
117	117	validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { \|u\| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
118	118
119		- # Authenticates a user by their login name and unencrypted password. Returns the user or nil.
	119	+ # Authenticates a user by their login name or email and unencrypted password. Returns the user or nil.
120	120	def self.authenticate(login, password, environment = nil)
121	121	environment \|\|= Environment.default
122		- u = first :conditions => ['login = ? AND environment_id = ? AND activated_at IS NOT NULL', login, environment.id] # need to get the salt
	122	+ u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
	123	+ login, login, environment.id] # need to get the salt
123	124	u && u.authenticated?(password) ? u : nil
124	125	end
125	126
...	...
...	...	@@ -32,7 +32,8 @@
32	32	<span id="signup-domain"><%= environment.default_hostname %>/</span>
33	33	<div id='signup-login'>
34	34	<div id='signup-login-field' class='formfield'>
35		- <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
	35	+ <%= required text_field(:user, :login, :id => 'user_login',
	36	+ :onchange => 'this.value = convToValidUsername(this.value);') %>
36	37	<div id='url-check'><p> </p></div>
37	38	</div>
38	39	<%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
...	...
...	...	@@ -5,7 +5,7 @@
5	5	<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do \|f\| %>
6	6
7	7	<%= f.text_field :login,
8		- :onchange => 'this.value = convToValidLogin( this.value )' %>
	8	+ :onchange => 'this.value = convToValidUsername( this.value )' %>
9	9
10	10	<%= f.text_field :email %>
11	11
...	...
...	...	@@ -7,13 +7,15 @@
7	7
8	8	<div class='l-sidebar-left-bar'>
9	9	<ul>
10		- <% if @categories.size > 0 %>
	10	+ <% if @categories.present? %>
11	11	<% @categories.each do \|category\| %>
12	12	<%= category_link(category) %>
13	13	<%= category_sub_links(category) %>
14	14	<% end %>
	15	+ <% elsif @category.present? %>
	16	+ <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %>
15	17	<% else %>
16		- <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %>
	18	+ <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %>
17	19	<% end %>
18	20	</ul>
19	21	</div>
...	...