Merge branch 'stable'

Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature

Merge branch 'stable'
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
Rodrigo Souto
2 parents c3308c85 5cafd9b6
Showing 45 changed files with 339 additions and 71 deletions Show diff stats
AUTHORS
app/controllers/application_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
app/models/category.rb
app/models/comment.rb
app/models/create_enterprise.rb
app/models/domain.rb
app/models/environment.rb
app/models/event.rb
app/models/image.rb
app/models/person.rb
app/models/uploaded_file.rb
app/models/user.rb
app/views/profile/_person_profile.rhtml
app/views/shared/_list_groups.html.erb
db/migrate/20131121162641_remove_orphan_profiles.rb
debian/changelog
features/manage_products.feature
@@ -111,6 +111,7 @@ Diego Martinez &lt;diegoamc90@gmail.com&gt;
 Diego Martinez <diego@diego-K55A.(none)>
 Diego + Renan <renanteruoc@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
+Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
 Grazieno Pellegrino <grazieno@gmail.com>
 Isaac Canan <isaac@intelletto.com.br>
@@ -195,6 +196,7 @@ root &lt;root@debian.sdr.serpro&gt;
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Valessio Brito <valessio@gmail.com>
 vfcosta <vfcosta@gmail.com>
+Vinicius Cubas Brand <viniciuscb@gmail.com>
 Visita <visita@debian.(none)>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
  
@@ -174,8 +174,6 @@ class ApplicationController &lt; ActionController::Base
   end
  
   def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
-    scope = scope.send(options[:filter]) if options[:filter]
-
     @plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
     fallback_find_by_contents(asset, scope, query, paginate_options, options)
   end
@@ -183,8 +181,9 @@ class ApplicationController &lt; ActionController::Base
   private
  
   def fallback_find_by_contents(asset, scope, query, paginate_options, options)
-    return {:results => scope.paginate(paginate_options)} if query.blank?
-    {:results => scope.like_search(query).paginate(paginate_options)}
+    scope = scope.like_search(query) unless query.blank?
+    scope = scope.send(options[:filter]) unless options[:filter].blank?
+    {:results => scope.paginate(paginate_options)}
   end
  
 end
@@ -55,8 +55,9 @@ class ContentViewerController &lt; ApplicationController
  
     @page = FilePresenter.for @page
  
-    unless @page.mime_type == 'text/html' || params[:view]
+    if @page.download? params[:view]
       headers['Content-Type'] = @page.mime_type
+      headers.merge! @page.download_headers
       data = @page.data
  
       # TODO test the condition
@@ -72,7 +73,7 @@ class ContentViewerController &lt; ApplicationController
  
     #FIXME see a better way to do this. It's not need to pass this variable anymore
     @comment = Comment.new
-    
+
     if @page.has_posts?
       posts = if params[:year] and params[:month]
         filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
@@ -730,8 +730,15 @@ module ApplicationHelper
   end
  
   def rolename_for(profile, resource)
-    role = profile.role_assignments.find_by_resource_id(resource.id).role
-    content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
+    roles = profile.role_assignments.
+      where(:resource_id => resource.id).
+      sort_by{ |role_assignment| role_assignment.role_id }.
+      map(&:role)
+    names = []
+    roles.each do |role|
+      names << content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
+    end
+    names.join(', ')
   end
  
   def role_color(role, env_id)
@@ -192,7 +192,7 @@ class Article &lt; ActiveRecord::Base
     pending_categorizations.clear
   end
  
-  acts_as_taggable  
+  acts_as_taggable
   N_('Tag list')
  
   acts_as_filesystem
@@ -272,7 +272,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   # returns the data of the article. Must be overriden in each subclass to
-  # provide the correct content for the article. 
+  # provide the correct content for the article.
   def data
     body
   end
@@ -368,6 +368,16 @@ class Article &lt; ActiveRecord::Base
     false
   end
  
+  def download? view = nil
+    (self.uploaded_file? and not self.image?) or
+      (self.image? and view.blank?) or
+      (not self.uploaded_file? and self.mime_type != 'text/html')
+  end
+
+  def download_headers
+    {}
+  end
+
   named_scope :native_translations, :conditions => { :translation_of_id => nil }
  
   def translatable?
@@ -7,13 +7,13 @@ class Category &lt; ActiveRecord::Base
     :slug => 1,
   }
  
-  validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
+  validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('{fn} cannot be like that.').fix_i18n
   validates_presence_of :name, :environment_id
-  validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
+  validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
  
   validates_inclusion_of :display_color, :in => [ 1, 2, 3, 4, nil ]
-  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.').fix_i18n
+  validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { |cat| ! cat.display_color.nil? }), :message => N_('{fn} was already assigned to another category.').fix_i18n
  
   # Finds all top level categories for a given environment. 
   named_scope :top_level_for, lambda { |environment|
@@ -27,7 +27,7 @@ class Comment &lt; ActiveRecord::Base
   validates_presence_of :author_id, :if => (lambda { |rec| rec.name.blank? && rec.email.blank? })
   validates_each :name do |rec,attribute,value|
     if rec.author_id && (!rec.name.blank? || !rec.email.blank?)
-      rec.errors.add(:name, _('%{fn} can only be informed for unauthenticated authors').fix_i18n)
+      rec.errors.add(:name, _('{fn} can only be informed for unauthenticated authors').fix_i18n)
     end
   end
  
@@ -40,12 +40,12 @@ class CreateEnterprise &lt; Task
  
     if self.region && self.target
       unless self.region.validators.include?(self.target) || self.target_type == "Environment"
-        self.errors.add(:target, _('%{fn} is not a validator for the chosen region').fix_i18n)
+        self.errors.add(:target, _('{fn} is not a validator for the chosen region').fix_i18n)
       end
     end
  
     if self.status != Task::Status::CANCELLED && self.identifier && Profile.exists?(:identifier => self.identifier)
-      self.errors.add(:identifier, _('%{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
+      self.errors.add(:identifier, _('{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
     end
   end
  
@@ -10,14 +10,14 @@ class Domain &lt; ActiveRecord::Base
  
   # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
   # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
-  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
+  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
  
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
   # * <tt>name</tt> must not start with 'www.'
   def validate
     if self.name =~ /^www\./
-      self.errors.add(:name, _('%{fn} must not start with www.').fix_i18n)
+      self.errors.add(:name, _('{fn} must not start with www.').fix_i18n)
     end
   end
  
@@ -169,7 +169,7 @@ class Environment &lt; ActiveRecord::Base
  
   # One Environment can be reached by many domains
   has_many :domains, :as => :owner
-  has_many :profiles
+  has_many :profiles, :dependent => :destroy
  
   has_many :organizations
   has_many :enterprises
@@ -784,13 +784,6 @@ class Environment &lt; ActiveRecord::Base
     self.save!
   end
  
-  after_destroy :destroy_templates
-  def destroy_templates
-    [enterprise_template, inactive_enterprise_template, community_template, person_template].compact.each do |template|
-      template.destroy
-    end
-  end
-
   after_create :create_default_licenses
   def create_default_licenses
     License.create!(:name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode', :environment => self)
@@ -25,7 +25,7 @@ class Event &lt; Article
  
   validates_each :start_date do |event,field,value|
     if event.end_date && event.start_date && event.start_date > event.end_date
-      event.errors.add(:start_date, _('%{fn} cannot come before end date.').fix_i18n)
+      event.errors.add(:start_date, _('{fn} cannot come before end date.').fix_i18n)
     end
   end
  
@@ -17,7 +17,7 @@ class Image &lt; ActiveRecord::Base
                                   :icon     => '20x20!' },
                  :max_size => 5.megabytes # remember to update validate message below
  
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
+  validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
  
   delay_attachment_fu_thumbnails
  
@@ -240,7 +240,7 @@ class Person &lt; Profile
  
   validates_each :email, :on => :update do |record,attr,value|
     if User.find(:first, :conditions => ['email = ? and id != ? and environment_id = ?', value, record.user.id, record.environment.id])
-      record.errors.add(attr, _('%{fn} is already used by other user').fix_i18n)
+      record.errors.add(attr, _('{fn} is already used by other user').fix_i18n)
     end
   end
  
@@ -54,7 +54,7 @@ class UploadedFile &lt; Article
     :thumbnail_class => Thumbnail,
     :max_size => 5.megabytes # remember to update validate message below
  
-  validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
+  validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
  
   delay_attachment_fu_thumbnails
  
@@ -94,6 +94,12 @@ class UploadedFile &lt; Article
     self.name = self.filename
   end
  
+  def download_headers
+    {
+      'Content-Disposition' => "attachment; filename=\"#{self.filename}\"",
+    }
+  end
+
   def data
     File.read(self.full_filename)
   end
@@ -114,7 +114,7 @@ class User &lt; ActiveRecord::Base
   before_save :encrypt_password
   validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?})
  
-  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
+  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 or email and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
@@ -4,7 +4,7 @@
   </tr>
   <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
   <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
-  <%= display_field(_('Location:'), profile, :location, true) %>
+  <%= display_field _('Location:'), profile, :location %>
  
   <%= display_field(_('Type:'), profile, :privacy_setting, true) %>
  
@@ -12,7 +12,9 @@
       <%= _('Members: %s') % group.members_count.to_s %> <br/>
       <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
       <% button_bar do %>
-        <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+        <% if user.has_permission?(:edit_profile, group) %>
+          <%= button 'menu-ctrl-panel', _('Control panel of this group'), group.admin_url %>
+        <% end %>
         <%= button 'menu-logout', _('Leave community'), group.leave_url(true), :class => 'leave-community' %>
         <% if (group.community? && user.has_permission?(:destroy_profile, group)) %>
           <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => group.identifier } %>
@@ -0,0 +1,10 @@
+class RemoveOrphanProfiles < ActiveRecord::Migration
+  def self.up
+    profiles = Profile.joins('LEFT JOIN environments ON profiles.environment_id=environments.id').where('environments.id IS NULL')
+    profiles.map(&:destroy)
+  end
+
+  def self.down
+    say 'This migration can not be reverted.'
+  end
+end
+noosfero (0.44.5) unstable; urgency=low
+
+  * Bugfix release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Tue, 26 Nov 2013 17:39:39 -0300
+
 noosfero (0.44.4) unstable; urgency=low
  
   * Bugfix release
@@ -9,7 +9,7 @@ Feature: manage products
     And the following enterprises
       | identifier | owner | name | enabled |
       | redemoinho | joaosilva | Rede Moinho | true |
-   And feature "products_for_enterprises" is enabled on environment
+    And feature "products_for_enterprises" is enabled on environment
  
   Scenario: display "create new product" button
     Given I am logged in as "joaosilva"
@@ -39,3 +39,6 @@ debian/*.debhelper
 debian/files
 debian/noosfero/
 debian/noosfero-apache/
+features/plugins/*
+plugins/solr/config/solr.yml
+/solr
@@ -24,7 +24,7 @@ module NeedsProfile
     @profile ||= environment.profiles.find_by_identifier(params[:profile])
     if @profile
       profile_hostname = @profile.hostname
-      if profile_hostname && request.host == @environment.default_hostname
+      if profile_hostname && profile_hostname != request.host
         params.delete(:profile)
         redirect_to(Noosfero.url_options.merge(params).merge(:host => profile_hostname))
       end
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.44.4'
+  VERSION = '0.44.5'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -2,8 +2,11 @@ require_dependency &#39;active_record&#39;
  
 class ActiveRecord::Base
   def self.pg_search_plugin_search(query)
+    query.gsub!(/\|/,' ')
+    formatted_query = query.split.map{|w| w += ":*"}.join('|')
+    
     if defined?(self::SEARCHABLE_FIELDS)
-      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{query}:*')")
+      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{formatted_query}')")
     else
       raise "No searchable fields defined for #{self.name}"
     end
@@ -9,8 +9,9 @@ class PgSearchPlugin &lt; Noosfero::Plugin
   end
  
   def find_by_contents(asset, scope, query, paginate_options={}, options={})
-    return if query.blank?
-    {:results => scope.pg_search_plugin_search(query).paginate(paginate_options)}
+    scope = scope.pg_search_plugin_search(query) unless query.blank?
+    scope = scope.send(options[:filter]) unless options[:filter]
+    {:results => scope.paginate(paginate_options)}
   end
  
 end
@@ -14,6 +14,13 @@ class PgSearchPluginTest &lt; ActiveSupport::TestCase
     assert_includes search(Profile, 'water'), profile
   end
  
+  should 'locate one or more profiles' do
+    profile1 = fast_create(Profile, :identifier => 'administrator')
+    profile2 = fast_create(Profile, :identifier => 'debugger')
+    assert_includes search(Profile, 'admin deb'), profile1
+    assert_includes search(Profile, 'admin deb'), profile2
+  end
+
   # TODO This feature is available only on Postgresql 9.0
   # http://www.postgresql.org/docs/9.0/static/unaccent.html
   # should 'ignore accents' do
@@ -94,10 +94,12 @@ class ShoppingCartPluginController &lt; PublicController
   end
  
   def buy
-    @cart = cart
-    @enterprise = environment.enterprises.find(cart[:enterprise_id])
-    @settings = Noosfero::Plugin::Settings.new(@enterprise, ShoppingCartPlugin)
-    render :layout => false
+    if validate_cart_presence
+      @cart = cart
+      @enterprise = environment.enterprises.find(cart[:enterprise_id])
+      @settings = Noosfero::Plugin::Settings.new(@enterprise, ShoppingCartPlugin)
+      render :layout => false
+    end
   end
  
   def send_request
@@ -63,7 +63,7 @@ class ShoppingCartPluginMyprofileController &lt; MyProfileController
  
   def treat_delivery_options(params)
     result = {}
-    return result if params.nil? || params[:delivery_options].nil?
+    return result if params.nil? || params[:options].nil?
     params[:options].size.times do |counter|
       if params[:options][counter].present? && params[:prices][counter].present?
         result[params[:options][counter]] = params[:prices][counter]
@@ -187,6 +187,12 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
     assert !cart?, "cart expected to be empty!"
   end
  
+  should 'not allow buy without any cart' do
+    get :buy
+    assert !json_response[:ok]
+    assert_equal 2, json_response['error']['code']
+  end
+
   private
  
   def json_response
@@ -51,6 +51,14 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert settings.delivery_price == price
   end
  
+  should 'be able to choose delivery_options' do
+    delivery_options = {:options => ['car', 'bike'], :prices => ['20', '5']}
+    post :edit, :profile => enterprise.identifier, :settings => {:delivery_options => delivery_options}
+
+    assert_equal '20', settings.delivery_options['car']
+    assert_equal '5', settings.delivery_options['bike']
+  end
+
   should 'filter the reports correctly' do
     another_enterprise = fast_create(Enterprise)
     po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
@@ -24,7 +24,8 @@ class Article
       {:slug => :text}, {:body => :text},
       {:abstract => :text}, {:filename => :text},
       # filtered fields
-      {:solr_plugin_public => :boolean}, {:environment_id => :integer},
+      {:solr_plugin_public => :boolean}, {:published => :boolean},
+      {:environment_id => :integer},
       {:profile_id => :integer}, :language,
       {:solr_plugin_category_filter => :integer},
       # ordered/query-boosted fields
@@ -28,7 +28,7 @@ class Profile
       {:solr_plugin_category_filter => :integer},
       # ordered/query-boosted fields
       {:solr_plugin_name_sortable => :string}, {:user_id => :integer},
-      :enabled, :active, :validated, :public_profile,
+      :enabled, :active, :validated, :public_profile, :visible,
       {:lat => :float}, {:lng => :float},
       :updated_at, :created_at,
     ],
@@ -18,16 +18,71 @@ class SolrPlugin &lt; Noosfero::Plugin
     true
   end
  
+  def solr_search? empty_query, klass
+    not empty_query or klass == Product
+  end
+
   def find_by_contents(asset, scope, query, paginate_options={}, options={})
     klass = asset_class(asset)
-    category = options.delete(:category)
-    filter = options.delete(:filter)
+    category = options[:category]
+    empty_query = empty_query? query, category
  
-    return if empty_query?(query, category) && klass != Product
+    unless solr_search? empty_query, klass
+      return options[:filter] ?  {:results => scope.send(options[:filter]).paginate(paginate_options)} : nil
+    end
  
     solr_options = solr_options(class_asset(klass), category)
-    solr_options.merge!(products_options(user)) if klass == Product && empty_query?(query, category)
-    klass.find_by_contents(query, paginate_options, solr_options.merge(options))
+    solr_options[:filter_queries] ||= []
+    solr_options[:filter_queries] += scopes_to_solr_filters scope, klass, options
+    solr_options.merge! products_options(user) if klass == Product and empty_query
+    solr_options.merge! options.except(:category, :filter)
+
+    scope.find_by_contents query, paginate_options, solr_options
+  end
+
+  protected
+
+  def scopes_to_solr_filters scope, klass = nil, options = {}
+    filter_queries = []
+    klass ||= scope.base_class
+    solr_fields = klass.configuration[:solr_fields].keys
+    scopes_applied = scope.scopes_applied.dup rescue [] #rescue association and class direct filtering
+
+    scope.current_scoped_methods[:create].each do |attr, value|
+      next unless solr_fields.include? attr.to_sym
+
+      # if the filter is present here, then prefer it
+      scopes_applied.reject!{ |name| name == attr.to_sym }
+
+      filter_queries << "#{attr}:#{value}"
+    end
+
+    scopes_applied.each do |name|
+      next if name.to_s == options[:filter].to_s
+
+      has_value = name === Hash
+      if has_value
+        name, args = name.keys.first, name.values.first
+        value = args.first
+      end
+
+      related_field = nil
+      related_field = name if solr_fields.include? name
+      related_field = "solr_plugin_#{name}" if solr_fields.include? :"solr_plugin_#{name}"
+
+      if has_value
+        if related_field
+          filter_queries << "#{related_field}:#{value}"
+        else
+          filter_queries << klass.send("solr_filter_#{name}", *args)
+        end
+      else
+        raise "Undeclared solr field for scope #{name}" if related_field.nil?
+        filter_queries << "#{related_field}:true"
+      end
+    end
+
+    filter_queries
   end
  
   def method_missing method, *args, &block
@@ -0,0 +1,16 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class SolrPlugin::PluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = SolrPlugin.new
+  end
+  attr_reader :plugin
+
+  should 'convert scopes to solr filters' do
+    person = create_user('test').person
+    result = plugin.send :scopes_to_solr_filters, person.files.public.published
+    assert_equal result, ["profile_id:#{person.id}", "published:'true'", "solr_plugin_public:true"]
+  end
+
+end
@@ -0,0 +1,57 @@
+require_dependency 'active_record/named_scope'
+
+if Rails::VERSION::STRING < "2.3.99"
+
+  module ::ActiveRecord
+
+    module NamedScope
+
+      module ClassMethods
+
+        def named_scope_with_applied_names name, options = {}, &block
+          named_scope_without_applied_names name, options, &block
+
+          name = name.to_sym
+          scopes[name] = lambda do |parent_scope, *args|
+            scope = Scope.new(parent_scope, case options
+            when Hash
+              options
+            when Proc
+              if self.model_name != parent_scope.model_name
+                options.bind(parent_scope).call(*args)
+              else
+                options.call(*args)
+              end
+            end, &block)
+            scope.scope_name = name
+            scope
+          end
+        end
+        alias_method_chain :named_scope, :applied_names
+      end
+
+      class Scope
+        attr_accessor :scope_name, :scopes_applied
+
+        def initialize_with_applied_names proxy_scope, options, &block
+          initialize_without_applied_names proxy_scope, options, &block
+          self.scopes_applied ||= []
+          self.scopes_applied += proxy_scope.send :scopes_applied if Scope === proxy_scope
+
+          # unrelated bugfix: use if instead of unless
+          if (Scope === proxy_scope || ActiveRecord::Associations::AssociationCollection === proxy_scope)
+            @current_scoped_methods_when_defined = proxy_scope.send(:current_scoped_methods)
+          end
+        end
+        alias_method_chain :initialize, :applied_names
+
+        def scope_name= name
+          @scope_name = name
+          self.scopes_applied << @scope_name
+        end
+
+      end
+
+    end
+  end
+end
@@ -0,0 +1 @@
+../../../public/500.html
 \ No newline at end of file
@@ -235,4 +235,18 @@ class CatalogControllerTest &lt; ActionController::TestCase
     assert_equal [pc2, pc1, pc4, pc3], assigns(:categories)
   end
  
+  should 'use price_detail name instead of production_cost name straight' do
+    p1 = fast_create(Product, :product_category_id => @product_category.id, :enterprise_id => @enterprise.id)
+    p2 = fast_create(Product, :product_category_id => @product_category.id, :enterprise_id => @enterprise.id)
+    Product.any_instance.stubs(:price_described?).returns(true)
+    production_cost = fast_create(ProductionCost)
+    pd1 = PriceDetail.create!(:product => p1, :production_cost => production_cost)
+    pd2 = PriceDetail.create!(:product => p2)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'div', :attributes => {:class => 'search-product-input-name'}, :content => production_cost.name
+    assert_tag :tag => 'div', :attributes => {:class => 'search-product-input-name'}, :content => 'Other costs'
+  end
+
 end
@@ -64,7 +64,20 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_response :missing
   end
  
-  should 'produce a download-like when article is not text/html' do
+  should 'produce a download-link when article is a uploaded file' do
+    profile = create_user('someone').person
+    html = UploadedFile.create! :uploaded_data => fixture_file_upload('/files/500.html', 'text/html'), :profile => profile
+    html.save!
+
+    get :view_page, :profile => 'someone', :page => [ '500.html' ]
+
+    assert_response :success
+    assert_match /^text\/html/, @response.headers['Content-Type']
+    assert @response.headers['Content-Disposition'].present?
+    assert_match /attachment/, @response.headers['Content-Disposition']
+  end
+
+  should 'produce a download-link when article is not text/html' do
  
     # for example, RSS feeds
     profile = create_user('someone').person
@@ -1254,7 +1267,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
  
     get 'view_page', :profile => profile.identifier, :page => article.path.split('/')
     assert_tag :tag => 'a', :attributes => { :href => "/#{profile.identifier}/#{article.path}?comment_page=2", :rel => 'next' }
-  end 
+  end
  
   should 'not escape acceptable HTML in list of blog posts' do
     login_as('testinguser')
@@ -6,7 +6,7 @@ require &#39;memberships_controller&#39;
 class MembershipsController; def rescue_action(e) raise e end; end
  
 class MembershipsControllerTest < ActionController::TestCase
-  
+
   include ApplicationHelper
  
   def setup
@@ -22,7 +22,7 @@ class MembershipsControllerTest &lt; ActionController::TestCase
   def test_local_files_reference
     assert_local_files_reference :get, :index, :profile => profile.identifier
   end
-  
+
   def test_valid_xhtml
     assert_valid_xhtml
   end
@@ -245,4 +245,23 @@ class MembershipsControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'input', :attributes => {:id => 'community_plugin2', :type => 'hidden', :value => 'Plugin 2'}
   end
  
+  should 'only display control panel link to members with permission' do
+    c1 = fast_create(Community, :name => 'My own community')
+    c2 = fast_create(Community, :name => 'Not my community')
+
+    owner = fast_create(Person)
+    c2.add_admin(owner)
+
+    person = Person['testuser']
+    c1.add_admin(person)
+    c2.add_member(person)
+
+    login_as('testuser')
+    get :index, :profile => 'testuser'
+
+    assert_template 'index'
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{c2.identifier}" }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{c1.identifier}" }
+  end
+
 end
@@ -1344,6 +1344,17 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'span', :content => '(removed user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-removed'}
   end
  
+  should 'not display spam comments in wall' do
+    UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
+    article = TinyMceArticle.create!(:profile => profile, :name => 'An article about spam\'s nutritional attributes')
+    comment = Comment.create!(:author => profile, :title => 'Test Comment', :body => 'This article makes me hungry', :source_id => article.id, :source_type => 'Article')
+    comment.spam!
+    login_as(profile.identifier)
+    get :index, :profile => profile.identifier
+
+    assert !/This article makes me hungry/.match(@response.body), 'Spam comment was shown!'
+  end
+
   should 'display comment in wall from non logged users' do
     UserStampSweeper.any_instance.stubs(:current_user).returns(profile)
     article = TinyMceArticle.create!(:profile => profile, :name => 'An article about free software')
@@ -624,6 +624,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
  
     profile.domains << Domain.new(:name => 'myowndomain.net')
     profile.environment.domains << Domain.new(:name => 'myenv.net')
+    ActionController::TestRequest.any_instance.stubs(:host).returns(profile.hostname)
  
     get :edit, :profile => profile.identifier
     assert_tag :tag => 'select', :attributes => { :name => 'profile_data[preferred_domain_id]' }, :descendant => { :tag => "option", :content => 'myowndomain.net' }
@@ -639,6 +640,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
  
     profile.domains << Domain.new(:name => 'myowndomain.net')
     profile.environment.domains << Domain.new(:name => 'myenv.net')
+    ActionController::TestRequest.any_instance.stubs(:host).returns(profile.hostname)
  
     get :edit, :profile => profile.identifier
     assert_tag :tag => "select", :attributes => { :name => 'profile_data[preferred_domain_id]'}, :descendant => { :tag => 'option', :content => '&lt;Select domain&gt;', :attributes => { :value => '' } }
@@ -978,4 +980,13 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_equal({}, person.reload.fields_privacy)
   end
  
+  should 'not redirect if the profile_hostname is the same as environment hostname' do
+    Person.any_instance.stubs(:hostname).returns('hostname.org')
+    Environment.any_instance.stubs(:default_hostname).returns('hostname.org')
+    ActionController::TestRequest.any_instance.stubs(:host).returns('hostname.org')
+    get :index, :profile => profile.identifier
+    assert_response :success
+  end
+
+
 end
@@ -143,6 +143,18 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Member'
   end
  
+  should 'rolenames for a member admin' do
+    member1 = create_user('usertest1').person
+    member2 = create_user('usertest2').person
+    community = fast_create(Community, :name => 'new community', :identifier => 'new-community', :environment_id => Environment.default.id)
+    community.add_member(member1)
+    # member2 is both a admin and a member
+    community.add_member(member2)
+    community.add_admin(member2)
+    assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Member'
+    assert_tag_in_string rolename_for(member2, community), :tag => 'span', :content => 'Profile Administrator'
+  end
+
   should 'get theme from environment by default' do
     @environment = mock
     @environment.stubs(:theme).returns('my-environment-theme')
@@ -293,21 +293,6 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert_equal blocks - env_blocks, Block.count
   end
  
-  should 'destroy templates' do
-    env = fast_create(Environment)
-    templates = [mock, mock, mock, mock]
-    templates.each do |item|
-      item.expects(:destroy)
-    end
-
-    env.stubs(:person_template).returns(templates[0])
-    env.stubs(:community_template).returns(templates[1])
-    env.stubs(:enterprise_template).returns(templates[2])
-    env.stubs(:inactive_enterprise_template).returns(templates[3])
-
-    env.destroy
-  end
-
   should 'have boxes and blocks upon creation' do
     Environment.any_instance.stubs(:create_templates) # avoid creating templates, it's expensive
     environment = Environment.create!(:name => 'a test environment')
@@ -1888,4 +1888,11 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert !profile.may_display_location_to?(user)
   end
  
+  should 'destroy profile if its environment is destroyed' do
+    environment = fast_create(Environment)
+    profile = fast_create(Profile, :environment_id => environment.id)
+
+    environment.destroy
+    assert_raise(ActiveRecord::RecordNotFound) {profile.reload}
+  end
 end
@@ -7,7 +7,7 @@ Rails.configuration.to_prepare do
  
     def conditions_for_comments
       type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
-      "source_type = '#{type}' AND source_id = '#{id}'"
+      "source_type = '#{type}' AND source_id = '#{id}' AND spam IS NOT TRUE"
     end
  
     def comments_as_thread
...	...	@@ -111,6 +111,7 @@ Diego Martinez <diegoamc90@gmail.com>
111	111	Diego Martinez <diego@diego-K55A.(none)>
112	112	Diego + Renan <renanteruoc@gmail.com>
113	113	Fernanda Lopes <nanda.listas+psl@gmail.com>
	114	+Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
114	115	Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
115	116	Grazieno Pellegrino <grazieno@gmail.com>
116	117	Isaac Canan <isaac@intelletto.com.br>
...	...	@@ -195,6 +196,7 @@ root <root@debian.sdr.serpro>
195	196	Samuel R. C. Vale <srcvale@holoscopio.com>
196	197	Valessio Brito <valessio@gmail.com>
197	198	vfcosta <vfcosta@gmail.com>
	199	+Vinicius Cubas Brand <viniciuscb@gmail.com>
198	200	Visita <visita@debian.(none)>
199	201	Yann Lugrin <yann.lugrin@liquid-concept.ch>
200	202
...	...
...	...	@@ -174,8 +174,6 @@ class ApplicationController < ActionController::Base
174	174	end
175	175
176	176	def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
177		- scope = scope.send(options[:filter]) if options[:filter]
178		-
179	177	@plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) \|\|
180	178	fallback_find_by_contents(asset, scope, query, paginate_options, options)
181	179	end
...	...	@@ -183,8 +181,9 @@ class ApplicationController < ActionController::Base
183	181	private
184	182
185	183	def fallback_find_by_contents(asset, scope, query, paginate_options, options)
186		- return {:results => scope.paginate(paginate_options)} if query.blank?
187		- {:results => scope.like_search(query).paginate(paginate_options)}
	184	+ scope = scope.like_search(query) unless query.blank?
	185	+ scope = scope.send(options[:filter]) unless options[:filter].blank?
	186	+ {:results => scope.paginate(paginate_options)}
188	187	end
189	188
190	189	end
...	...
...	...	@@ -55,8 +55,9 @@ class ContentViewerController < ApplicationController
55	55
56	56	@page = FilePresenter.for @page
57	57
58		- unless @page.mime_type == 'text/html' \|\| params[:view]
	58	+ if @page.download? params[:view]
59	59	headers['Content-Type'] = @page.mime_type
	60	+ headers.merge! @page.download_headers
60	61	data = @page.data
61	62
62	63	# TODO test the condition
...	...	@@ -72,7 +73,7 @@ class ContentViewerController < ApplicationController
72	73
73	74	#FIXME see a better way to do this. It's not need to pass this variable anymore
74	75	@comment = Comment.new
75		-
	76	+
76	77	if @page.has_posts?
77	78	posts = if params[:year] and params[:month]
78	79	filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
...	...
...	...	@@ -730,8 +730,15 @@ module ApplicationHelper
730	730	end
731	731
732	732	def rolename_for(profile, resource)
733		- role = profile.role_assignments.find_by_resource_id(resource.id).role
734		- content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
	733	+ roles = profile.role_assignments.
	734	+ where(:resource_id => resource.id).
	735	+ sort_by{ \|role_assignment\| role_assignment.role_id }.
	736	+ map(&:role)
	737	+ names = []
	738	+ roles.each do \|role\|
	739	+ names << content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
	740	+ end
	741	+ names.join(', ')
735	742	end
736	743
737	744	def role_color(role, env_id)
...	...
...	...	@@ -192,7 +192,7 @@ class Article < ActiveRecord::Base
192	192	pending_categorizations.clear
193	193	end
194	194
195		- acts_as_taggable
	195	+ acts_as_taggable
196	196	N_('Tag list')
197	197
198	198	acts_as_filesystem
...	...	@@ -272,7 +272,7 @@ class Article < ActiveRecord::Base
272	272	end
273	273
274	274	# returns the data of the article. Must be overriden in each subclass to
275		- # provide the correct content for the article.
	275	+ # provide the correct content for the article.
276	276	def data
277	277	body
278	278	end
...	...	@@ -368,6 +368,16 @@ class Article < ActiveRecord::Base
368	368	false
369	369	end
370	370
	371	+ def download? view = nil
	372	+ (self.uploaded_file? and not self.image?) or
	373	+ (self.image? and view.blank?) or
	374	+ (not self.uploaded_file? and self.mime_type != 'text/html')
	375	+ end
	376	+
	377	+ def download_headers
	378	+ {}
	379	+ end
	380	+
371	381	named_scope :native_translations, :conditions => { :translation_of_id => nil }
372	382
373	383	def translatable?
...	...
...	...	@@ -7,13 +7,13 @@ class Category < ActiveRecord::Base
7	7	:slug => 1,
8	8	}
9	9
10		- validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
	10	+ validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('{fn} cannot be like that.').fix_i18n
11	11	validates_presence_of :name, :environment_id
12		- validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
	12	+ validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('{fn} is already being used by another category.').fix_i18n
13	13	belongs_to :environment
14	14
15	15	validates_inclusion_of :display_color, :in => [ 1, 2, 3, 4, nil ]
16		- validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { \|cat\| ! cat.display_color.nil? }), :message => N_('%{fn} was already assigned to another category.').fix_i18n
	16	+ validates_uniqueness_of :display_color, :scope => :environment_id, :if => (lambda { \|cat\| ! cat.display_color.nil? }), :message => N_('{fn} was already assigned to another category.').fix_i18n
17	17
18	18	# Finds all top level categories for a given environment.
19	19	named_scope :top_level_for, lambda { \|environment\|
...	...
...	...	@@ -27,7 +27,7 @@ class Comment < ActiveRecord::Base
27	27	validates_presence_of :author_id, :if => (lambda { \|rec\| rec.name.blank? && rec.email.blank? })
28	28	validates_each :name do \|rec,attribute,value\|
29	29	if rec.author_id && (!rec.name.blank? \|\| !rec.email.blank?)
30		- rec.errors.add(:name, _('%{fn} can only be informed for unauthenticated authors').fix_i18n)
	30	+ rec.errors.add(:name, _('{fn} can only be informed for unauthenticated authors').fix_i18n)
31	31	end
32	32	end
33	33
...	...
...	...	@@ -40,12 +40,12 @@ class CreateEnterprise < Task
40	40
41	41	if self.region && self.target
42	42	unless self.region.validators.include?(self.target) \|\| self.target_type == "Environment"
43		- self.errors.add(:target, _('%{fn} is not a validator for the chosen region').fix_i18n)
	43	+ self.errors.add(:target, _('{fn} is not a validator for the chosen region').fix_i18n)
44	44	end
45	45	end
46	46
47	47	if self.status != Task::Status::CANCELLED && self.identifier && Profile.exists?(:identifier => self.identifier)
48		- self.errors.add(:identifier, _('%{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
	48	+ self.errors.add(:identifier, _('{fn} is already being as identifier by another enterprise, organization or person.').fix_i18n)
49	49	end
50	50	end
51	51
...	...
...	...	@@ -10,14 +10,14 @@ class Domain < ActiveRecord::Base
10	10
11	11	# <tt>name</tt> must be sequences of alphanumeric characters (a to z,
12	12	# 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
13		- validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('%{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
	13	+ validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
14	14
15	15	# checks validations that could not be expressed using Rails' predefined
16	16	# validations. In particular:
17	17	# * <tt>name</tt> must not start with 'www.'
18	18	def validate
19	19	if self.name =~ /^www\./
20		- self.errors.add(:name, _('%{fn} must not start with www.').fix_i18n)
	20	+ self.errors.add(:name, _('{fn} must not start with www.').fix_i18n)
21	21	end
22	22	end
23	23
...	...
...	...	@@ -169,7 +169,7 @@ class Environment < ActiveRecord::Base
169	169
170	170	# One Environment can be reached by many domains
171	171	has_many :domains, :as => :owner
172		- has_many :profiles
	172	+ has_many :profiles, :dependent => :destroy
173	173
174	174	has_many :organizations
175	175	has_many :enterprises
...	...	@@ -784,13 +784,6 @@ class Environment < ActiveRecord::Base
784	784	self.save!
785	785	end
786	786
787		- after_destroy :destroy_templates
788		- def destroy_templates
789		- [enterprise_template, inactive_enterprise_template, community_template, person_template].compact.each do \|template\|
790		- template.destroy
791		- end
792		- end
793		-
794	787	after_create :create_default_licenses
795	788	def create_default_licenses
796	789	License.create!(:name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode', :environment => self)
...	...