Merge branch 'master' into AI3283-integration_with_dspace

Francisco Júnior
2 parents 705a63f5 f323c51d
Showing 144 changed files with 82700 additions and 84850 deletions Show diff stats
.ackrc
AUTHORS.md
Gemfile
Gemfile.lock
Rakefile
Vagrantfile
app/controllers/admin/environment_design_controller.rb
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/controllers/my_profile/memberships_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/layout_helper.rb
app/models/article.rb
app/models/box.rb
 --ignore-dir=log
 --ignore-dir=tmp
 --ignore-dir=pkg
+--ignore-dir=public/javascripts/cache
+--ignore-dir=public/stylesheets/cache
@@ -41,6 +41,7 @@ Alessandro Palmeira + Paulo Meirelles &lt;alessandro.palmeira@gmail.com&gt;
 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
 Ana Losnak <analosnak@gmail.com>
+Andre Bernardes <andrebsguedes@gmail.com>
 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
 Antonio Terceiro <terceiro@colivre.coop.br>
@@ -132,6 +133,7 @@ Francisco Marcelo de Araújo Lima Júnior &lt;maljunior@gmail.com&gt;
 Gabriela Navarro <navarro1703@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Gust <darksshades@hotmail.com>
+Hebert Douglas <hebertdougl@gmail.com>
 Hugo Melo <hugo@riseup.net>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
@@ -230,6 +232,8 @@ Rodrigo Souto &lt;rodrigo@colivre.coop.br&gt;
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 root <root@debian.sdr.serpro>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+Tallys Martins <tallysmartins@gmail.com>
+tallys <tallys@tallys.(none)>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
 source "https://rubygems.org"
-gem 'rails'
-gem 'fast_gettext'
-gem 'acts-as-taggable-on'
-gem 'prototype-rails'
-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
-gem 'rails_autolink'
-gem 'pg'
-gem 'rmagick'
-gem 'RedCloth'
-gem 'will_paginate'
-gem 'ruby-feedparser'
-gem 'daemons'
-gem 'thin'
-gem 'hpricot'
-gem 'nokogiri'
+gem 'rails',                    '~> 3.2.19'
+gem 'fast_gettext',             '~> 0.6.8'
+gem 'acts-as-taggable-on',      '~> 3.0.2'
+gem 'prototype-rails',          '~> 3.2.1'
+gem 'prototype_legacy_helper',  '0.0.0', :path => 'vendor/prototype_legacy_helper'
+gem 'rails_autolink',           '~> 1.1.5'
+gem 'pg',                       '~> 0.13.2'
+gem 'rmagick',                  '~> 2.13.1'
+gem 'RedCloth',                 '~> 4.2.9'
+gem 'will_paginate',            '~> 3.0.3'
+gem 'ruby-feedparser',          '~> 0.7'
+gem 'daemons',                  '~> 1.1.5'
+gem 'thin',                     '~> 1.3.1'
+gem 'hpricot',                  '~> 0.8.6'
+gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
-gem 'rest-client'
-gem 'exception_notification'
+gem 'rest-client',              '~> 1.6.7'
+gem 'exception_notification',   '~> 4.0.1'
+gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
  
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
  
 group :production do
-  gem 'dalli'
+  gem 'dalli', '~> 2.7.0'
 end
  
 group :test do
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'mocha', :require => false
+  gem 'rspec',                  '~> 2.10.0'
+  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'mocha',                  '~> 1.1.0', :require => false
 end
  
 group :cucumber do
-  gem 'cucumber-rails', :require => false
-  gem 'capybara'
-  gem 'cucumber'
-  gem 'database_cleaner'
-  gem 'selenium-webdriver'
+  gem 'cucumber-rails',         '~> 1.0.6', :require => false
+  gem 'capybara',               '~> 2.1.0'
+  gem 'cucumber',               '~> 1.0.6'
+  gem 'database_cleaner',       '~> 1.2.0'
+  gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
 # include plugin gemfiles
@@ -1,191 +0,0 @@
-PATH
-  remote: vendor/prototype_legacy_helper
-  specs:
-    prototype_legacy_helper (0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
-      mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (3.0.2)
-      rails (>= 3, < 5)
-    arel (3.0.2)
-    builder (3.0.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
-    cucumber (1.0.6)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.6)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.0.6)
-      nokogiri (>= 1.5.0)
-    daemons (1.1.5)
-    dalli (2.7.0)
-    database_cleaner (1.2.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    eventmachine (0.12.10)
-    exception_notification (4.0.1)
-      actionmailer (>= 3.0.4)
-      activesupport (>= 3.0.4)
-    fast_gettext (0.6.8)
-    ffi (1.0.11)
-    gherkin (2.4.21)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    hpricot (0.8.6)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.11.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    pg (0.13.2)
-    polyglot (0.3.3)
-    prototype-rails (3.2.1)
-      rails (~> 3.2)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
-      bundler (~> 1.0)
-      railties (= 3.2.6)
-    rails_autolink (1.1.5)
-      rails (> 3.1)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.9.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rmagick (2.13.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.10.0)
-    ruby-feedparser (0.7)
-    rubyzip (1.1.2)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.3)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    websocket (1.0.7)
-    will_paginate (3.0.3)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  acts-as-taggable-on
-  capybara
-  cucumber
-  cucumber-rails
-  daemons
-  dalli
-  database_cleaner
-  exception_notification
-  fast_gettext
-  hpricot
-  mocha
-  nokogiri
-  pg
-  prototype-rails
-  prototype_legacy_helper (= 0.0.0)!
-  rails
-  rails_autolink
-  rake
-  rest-client
-  rmagick
-  rspec
-  rspec-rails
-  ruby-feedparser
-  selenium-webdriver
-  thin
-  will_paginate
@@ -6,3 +6,13 @@
 require File.expand_path('../config/application', __FILE__)
  
 Noosfero::Application.load_tasks
+
+[
+  "baseplugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+  "config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake",
+].map do |pattern|
+  Dir.glob(pattern).sort
+end.flatten.each do |taskfile|
+  load taskfile
+end
@@ -3,7 +3,7 @@
  
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "debian-wheezy"
+  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.provision :shell do |shell|
     shell.inline = 'su vagrant -c /vagrant/script/vagrant'
@@ -3,9 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
  
   def available_blocks
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
  
@@ -8,7 +8,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
   before_filter :login_required, :if => :private_environment?
-  before_filter :verify_members_whitelist, :if => :user
+  before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
  
   def verify_members_whitelist
     render_access_denied unless user.is_admin? || environment.in_whitelist?(user)
@@ -40,7 +40,7 @@ class ApplicationController &lt; ActionController::Base
  
     theme_layout = theme_option(:layout)
     if theme_layout
-      theme_view_file('layouts/'+theme_layout) || theme_layout
+      (theme_view_file('layouts/'+theme_layout) || theme_layout).to_s
     else
      'application'
     end
@@ -4,6 +4,12 @@ class CmsController &lt; MyProfileController
  
   include ArticleHelper
  
+  def search_tags
+    arg = params[:term].downcase
+    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
+  end
+
   def self.protect_if(*args)
     before_filter(*args) do |c|
       user, profile = c.send(:user), c.send(:profile)
@@ -221,7 +227,7 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     if request.post?
       @article.destroy
-      session[:notice] = _("\"#{@article.name}\" was removed.")
+      session[:notice] = _("\"%s\" was removed." % @article.name)
       referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
       if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
         redirect_to referer
@@ -20,7 +20,7 @@ class FriendsController &lt; MyProfileController
  
   class << self
     def per_page
-      10
+      12
     end
   end
   def per_page
@@ -21,6 +21,9 @@ class MembershipsController &lt; MyProfileController
     @back_to = params[:back_to] || url_for(:action => 'index')
     if request.post? && @community.valid?
       @community = Community.create_after_moderation(user, params[:community].merge({:environment => environment}))
+      if @community.new_record?
+        session[:notice] = _('Your new community creation request will be evaluated by an administrator. You will be notified.')
+      end
       redirect_to @back_to
       return
     end
@@ -4,6 +4,7 @@ class TasksController &lt; MyProfileController
  
   def index
     @filter = params[:filter_type].blank? ? nil : params[:filter_type]
+    @task_types = Task.pending_types_for(profile)
     @tasks = Task.to(profile).without_spam.pending.of(@filter).order_by('created_at', 'asc').paginate(:per_page => Task.per_page, :page => params[:page])
     @failed = params ? params[:failed] : {}
   end
@@ -15,11 +15,23 @@ class AccountController &lt; ApplicationController
  
   def activate
     @user = User.find_by_activation_code(params[:activation_code]) if params[:activation_code]
-    if @user and @user.activate
-      @message = _("Your account has been activated, now you can log in!")
-      check_redirection
-      session[:join] = params[:join] unless params[:join].blank?
-      render :action => 'login', :userlogin => @user.login
+    if @user
+      unless @user.environment.enabled?('admin_must_approve_new_users') 
+        if @user.activate
+          @message = _("Your account has been activated, now you can log in!")
+          check_redirection
+          session[:join] = params[:join] unless params[:join].blank?
+          render :action => 'login', :userlogin => @user.login
+        end
+      else
+        if @user.create_moderate_task
+          session[:notice] = _('Thanks for registering. The administrators were notified.')
+          @register_pending = true
+          @user.activation_code = nil
+          @user.save!
+          redirect_to :controller => :home
+        end      
+      end
     else
       session[:notice] = _("It looks like you're trying to activate an account. Perhaps have already activated this account?")
       redirect_to :controller => :home
@@ -85,6 +97,7 @@ class AccountController &lt; ApplicationController
       @user.return_to = session[:return_to]
       @person = Person.new(params[:profile_data])
       @person.environment = @user.environment
+
       if request.post?
         if may_be_a_bot
           set_signup_start_time_for_now
@@ -103,11 +116,20 @@ class AccountController &lt; ApplicationController
             invitation.update_attributes!({:friend => @user.person})
             invitation.finish
           end
+
+          unless params[:file].nil?
+            image = Image::new :uploaded_data=> params[:file][:image]
+
+            @user.person.image = image
+            @user.person.save
+          end
+
           if @user.activated?
             self.current_user = @user
             check_join_in_community(@user)
             go_to_signup_initial_page
           else
+            session[:notice] = _('Thanks for registering!')
             @register_pending = true
           end
         end
@@ -19,9 +19,13 @@ class ChatController &lt; PublicController
   def avatar
     profile = environment.profiles.find_by_identifier(params[:id])
     filename, mimetype = profile_icon(profile, :minor, true)
-    data = File.read(File.join(Rails.root, 'public', filename))
-    render :text => data, :layout => false, :content_type => mimetype
-    expires_in 24.hours
+    if filename =~ /^https?:/
+      redirect_to filename
+    else
+      data = File.read(File.join(Rails.root, 'public', filename))
+      render :text => data, :layout => false, :content_type => mimetype
+      expires_in 24.hours
+    end
   end
  
   def index
@@ -216,8 +216,6 @@ class ContentViewerController &lt; ApplicationController
     if @page.has_posts?
       posts = get_posts(params[:year], params[:month])
  
-      posts = posts.includes(:parent, {:profile => [:domains, :environment]}, :author)
-
       #FIXME Need to run this before the pagination because this version of
       #      will_paginate returns a will_paginate collection instead of a
       #      relation.
@@ -482,7 +482,12 @@ module ApplicationHelper
             '/images/icons-app/enterprise-'+ size.to_s() +'.png'
           end
         else
-          '/images/icons-app/person-'+ size.to_s() +'.png'
+          pixels = Image.attachment_options[:thumbnails][size].split('x').first
+          gravatar_profile_image_url(
+            profile.email,
+            :size => pixels,
+            :d => gravatar_default
+          )
         end
       filename = default_or_themed_icon(icon)
     end
@@ -602,7 +607,7 @@ module ApplicationHelper
   end
  
   def gravatar_default
-    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar']
+    (respond_to?(:theme_option) && theme_option.present? && theme_option['gravatar']) || NOOSFERO_CONF['gravatar'] || 'mm'
   end
  
   attr_reader :environment
@@ -1281,9 +1286,9 @@ module ApplicationHelper
  
   def delete_article_message(article)
     if article.folder?
-      _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
+      _("Are you sure that you want to remove the folder \"%s\"? Note that all the items inside it will also be removed!") % article.name
     else
-      _("Are you sure that you want to remove the item \"#{article.name}\"?")
+      _("Are you sure that you want to remove the item \"%s\"?") % article.name
     end
   end
  
@@ -83,6 +83,10 @@ module ArticleHelper
     array.map { |object| {:id => object.id, :name => object.name} }
   end
  
+  def prepare_to_token_input_by_label(array)
+    array.map { |object| {:label => object.name, :value => object.name} }
+  end
+
   def cms_label_for_new_children
     _('New article')
   end
@@ -27,6 +27,7 @@ module LayoutHelper
       'thickbox',
       'lightbox',
       'colorbox',
+      'inputosaurus',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
@@ -157,14 +157,17 @@ class Article &lt; ActiveRecord::Base
     self.profile
   end
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :name
       _('Title')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   def css_class_list
     [self.class.name.to_css_class]
@@ -28,9 +28,6 @@ class Box &lt; ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeedReaderBlock,
@@ -53,9 +50,6 @@ class Box &lt; ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeaturedProductsBlock,
@@ -2,16 +2,19 @@ class ChangePassword &lt; Task
  
   attr_accessor :password, :password_confirmation
  
-  def self.human_attribute_name(attrib, options = {})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
     when :password
       _('Password')
     when :password_confirmation
       _('Password Confirmation')
     else
-      _(self.superclass.human_attribute_name(attrib))
+      _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   validates_presence_of :requestor
  
@@ -124,6 +124,7 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
+      'admin_must_approve_new_users' => _("Admin must approve registration of new users"),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
@@ -176,9 +177,6 @@ class Environment &lt; ActiveRecord::Base
  
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
  
     # "right" area
@@ -806,7 +804,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def notification_emails
-    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
+    [contact_email].select(&:present?) + admins.map(&:email)
   end
  
   after_create :create_templates
@@ -1,33 +0,0 @@
-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-#      the Noosfero core soon, see ActionItem3045
-
-class EnvironmentStatisticsBlock < Block
-
-  def self.description
-    _('Environment stastistics (DEPRECATED)')
-  end
-
-  def default_title
-    _('Statistics for %s') % owner.name
-  end
-
-  def help
-    _('This block presents some statistics about your environment.')
-  end
-
-  def content(args={})
-    users = owner.people.visible.count
-    enterprises = owner.enterprises.visible.count
-    communities = owner.communities.visible.count
-
-    info = []
-    info << (n_('One user', '%{num} users', users) % { :num => users })
-    unless owner.enabled?('disable_asset_enterprises')
-      info << (n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
-    end
-    info << (n_('One community', '%{num} communities', communities) % { :num => communities })
-
-    block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
-  end
-
-end
@@ -30,6 +30,7 @@ class ExternalFeed &lt; ActiveRecord::Base
     article.source = link 
     article.profile = blog.profile 
     article.parent = blog
+    article.author_name = self.feed_title
     unless blog.children.exists?(:slug => article.slug)
       article.save!
       article.delay.create_activity
@@ -85,8 +85,4 @@ class FeedReaderBlock &lt; Block
     block_title(title) + formatted_feed_content
   end
  
-  def editable?
-    true
-  end
-
 end
@@ -84,10 +84,6 @@ class LinkListBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
   def icons_options
     ICONS.map do |i|
       "<span title=\"#{i[1]}\" class=\"icon-#{i[0]}\" onclick=\"changeIcon(this, '#{i[0]}')\"></span>".html_safe
@@ -16,10 +16,6 @@ class MainBlock &lt; Block
     true
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -0,0 +1,59 @@
+class ModerateUserRegistration < Task
+
+  settings_items :user_id, :type => String
+  settings_items :name, :type => String
+  settings_items :author_name, :type => String
+  settings_items :email, :type => String
+
+  after_create :schedule_spam_checking
+
+  alias :environment :target
+  alias :environment= :target=
+
+  def schedule_spam_checking
+    self.delay.check_for_spam
+  end
+
+  include Noosfero::Plugin::HotSpot
+
+  def sender
+    "#{name} (#{email})"
+  end
+
+  def perform
+    user=environment.users.find_by_id(user_id)
+    user.activate
+  end
+
+  def title
+    _("New user")
+  end
+
+  def subject
+    name
+  end
+
+  def information
+    { :message => _('%{sender} wants to register.'),
+      :variables => {:sender => sender} }
+  end
+
+  def icon
+    result = {:type => :defined_image, :src => '/images/icons-app/person-minor.png', :name => name}
+  end
+
+  def target_notification_description
+    _('%{sender} tried to register.') %
+    {:sender => sender}
+  end
+
+  def target_notification_message
+    target_notification_description + "\n\n" +
+    _('You need to login on %{system} in order to approve or reject this user.') % {  :environment => self.environment }
+  end
+
+  def target_notification_message
+    _("User \"%{user}\" just requested to register. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.name }
+  end
+
+end
 \ No newline at end of file
@@ -135,7 +135,11 @@ class Organization &lt; Profile
   end
  
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    emails = [contact_email].select(&:present?) + admins.map(&:email)
+    if emails.empty?
+      emails << environment.contact_email
+    end
+    emails
   end
  
   def already_request_membership?(person)
@@ -23,10 +23,6 @@ class ProfileImageBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
   def cacheable?
     false
   end
@@ -15,10 +15,6 @@ class ProfileInfoBlock &lt; Block
     end
   end
  
-  def editable?
-    false
-  end
-
   def cacheable?
     false
   end
@@ -11,8 +11,4 @@ class ProfileSearchBlock &lt; Block
     end
   end
  
-  def editable?
-    true
-  end
-
 end
@@ -73,10 +73,6 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
-  def self.all_types
-    %w[Invitation EnterpriseActivation AddMember Ticket SuggestArticle  AddFriend CreateCommunity AbuseComplaint ApproveComment ApproveArticle CreateEnterprise ChangePassword EmailActivation InviteFriend InviteMember]
-  end
-
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
@@ -254,6 +250,10 @@ class Task &lt; ActiveRecord::Base
     { :conditions => [environment_condition, profile_condition].compact.join(' OR ') }
   }
  
+  def self.pending_types_for(profile)
+    Task.to(profile).pending.select('distinct type').map { |t| [t.class.name, t.title] }
+  end
+
   def opened?
     status == Task::Status::ACTIVE || status == Task::Status::HIDDEN
   end
@@ -16,15 +16,18 @@ class User &lt; ActiveRecord::Base
   end
  
   # FIXME ugly workaround
-  def self.human_attribute_name(attrib, options={})
+  def self.human_attribute_name_with_customization(attrib, options={})
     case attrib.to_sym
       when :login
         return [_('Username'), _('Email')].join(' / ')
       when :email
         return _('e-Mail')
-      else _(self.superclass.human_attribute_name(attrib))
+      else _(self.human_attribute_name_without_customization(attrib))
     end
   end
+  class << self
+    alias_method_chain :human_attribute_name, :customization
+  end
  
   before_create do |user|
     if user.environment.nil?
@@ -47,8 +50,12 @@ class User &lt; ActiveRecord::Base
  
       user.person = p
     end
-    if user.environment.enabled?('skip_new_user_email_confirmation')
-      user.activate
+    if user.environment.enabled?('skip_new_user_email_confirmation') 
+      if user.environment.enabled?('admin_must_approve_new_users')
+        create_moderate_task
+      else
+        user.activate
+      end
     end
   end
   after_create :deliver_activation_code
@@ -137,6 +144,15 @@ class User &lt; ActiveRecord::Base
     end
   end
  
+  def create_moderate_task
+    @task = ModerateUserRegistration.new
+    @task.user_id = self.id
+    @task.name = self.name
+    @task.email = self.email
+    @task.target = self.environment
+    @task.save
+  end
+
   def activated?
     self.activation_code.nil? && !self.activated_at.nil?
   end
@@ -8,9 +8,6 @@ class ProfileSweeper # &lt; ActiveRecord::Observer
   end
  
   def after_create(profile)
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    expire_statistics_block_cache(profile)
   end
  
 protected
@@ -31,13 +28,6 @@ protected
     expire_blogs(profile) if profile.organization?
   end
  
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  def expire_statistics_block_cache(profile)
-    blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
-    BlockSweeper.expire_blocks(blocks)
-  end
-
   def expire_blogs(profile)
     profile.blogs.select{|b| !b.empty?}.each do |blog|
       pages = blog.posts.count / blog.posts_per_page + 1
@@ -2,18 +2,36 @@
   <div id='thanks-for-signing'>
     <% if environment.has_custom_welcome_screen? %>
       <%= environment.settings[:signup_welcome_screen_body].html_safe %>
-    <% else %>
-        <h1><%= _("Welcome to %s!") % environment.name %></h1>
-        <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
-        <p><%= _("Firstly, some tips for getting started:") %></p>
-        <h4><%= _("Confirm your account!") %></h4>
+    <% elsif environment.enabled?('admin_must_approve_new_users')%>
+      <h1><%= _("Welcome to %s!") % environment.name %></h1>
+      <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+      <p><%= _("Firstly, some tips for getting started:") %></p>
+      <% unless environment.enabled?('skip_new_user_email_confirmation') %>
+        <h4><%= _("Confirm your account and wait for admin approvement!") %></h4>
         <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
-        <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-        <h4><%= _("What to do next?") %></h4>
-        <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
-        <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
-        <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
-        <p><%= _("Start exploring and have fun!") %></p>
+        <p><%= _("You won't appear as %s until your account is confirmed and approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <% else %>
+        <h4><%= _("Wait for admin approvement!") %></h4>
+        <p><%= _("The administrators will evaluate your signup request for approvement.") %></p>
+        <p><%= _("You won't appear as %s until your account is approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <% end %> 
+      <h4><%= _("What to do next?") %></h4>
+      <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+      <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+      <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+      <p><%= _("Start exploring and have fun!") %></p>
+    <% else %>
+      <h1><%= _("Welcome to %s!") % environment.name %></h1>
+      <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+      <p><%= _("Firstly, some tips for getting started:") %></p>
+      <h4><%= _("Confirm your account!") %></h4>
+      <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
+      <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <h4><%= _("What to do next?") %></h4>
+      <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+      <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+      <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+      <p><%= _("Start exploring and have fun!") %></p>
     <% end %>
   </div>
 <% else %>
@@ -14,8 +14,8 @@
  
 <ul id="product-list">
   <% @products.each do |product| %>
-    <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
-    <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
+    <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_exec(&content) } %>
+    <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_exec(&content) } %>
  
     <% status = [] %>
     <% status << 'not-available' if !product.available %>
@@ -31,9 +31,18 @@
  
   <%= select_categories(:article, _('Categorize your article')) %>
  
+  <br />
+
   <%= f.text_field('tag_list', :size => 64) %>
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
  
+  <script>
+    jQuery('#article_tag_list').inputosaurus({
+      autoCompleteSource: <%= "'/myprofile/#{profile.identifier}/cms/search_tags'," %>
+      activateFinalResult : true
+    })
+  </script>
+
   <div id='edit-article-options'>
     <%= options_for_article(@article, @tokenized_children) %>
   </div>
@@ -4,7 +4,7 @@
 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
 'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
-'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', :cache => 'cache/application' %>
+'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', 'inputosaurus.js', :cache => 'cache/application' %>
  
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -13,7 +13,7 @@
       <%= render :partial => 'manage_products/display_image' %>
     </div>
     <div id='product-extra-content'>
-      <% extra_content = @plugins.dispatch(:product_info_extras, @product).collect { |content| instance_eval(&content) } %>
+      <% extra_content = @plugins.dispatch(:product_info_extras, @product).collect { |content| instance_exec(&content) } %>
       <%= extra_content.join("\n") %>
     </div>
     <div id='product-info'>
@@ -25,6 +25,7 @@
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
 <%= optional_field(@person, 'address_reference', labelled_form_field(_('Address reference'), text_field(:profile_data, :address_reference, :rel => _('Address reference')))) %>
 <%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
+<%= optional_field(@person, 'image', labelled_form_field(_('Image'), file_field(:file, :image, :rel => _('Image')))) %>
  
 <% optional_field(@person, 'schooling') do %>
   <div class="formfieldline">
@@ -3,10 +3,9 @@
 <h1><%= _("%s's pending tasks") % profile.name %></h1>
 <p>
  
-<% type_collection = [[nil, _('All')]] %>
-<% type_collection += Task.all_types.sort_by {|klass| klass.constantize.new.title}.map{|s| [s, s.constantize.new.title] } %>
-
-
+<%
+  type_collection = [[nil, _('All')]] + @task_types
+%>
  
 <% if !@failed.blank? %>
   <div id="errorExplanation">
@@ -39,7 +38,7 @@
  
     <ul class='task-list'>
       <p>
-        <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => 'document.location.href = "?filter_type="+this.value')%>
+        <%= labelled_select(_('Filter')+': ', :filter_type, :first, :last, @filter,  type_collection, :onchange => "document.location.href = '?filter_type='+this.value") %>
       </p>
       <p>
       <%= labelled_select(_("Set all to: "), 'set-decisions', 'first', 'last', nil, [['',""],['accept',_("Accept")],['reject',_("Reject")],['skip',_("Skip")]], :id => "up-set-all-tasks-to") %>
@@ -0,0 +1 @@
+../plugins/statistics
 \ No newline at end of file
@@ -108,7 +108,7 @@ module Noosfero
  
     # Your secret key for verifying cookie session data integrity.
     # If you change this key, all old sessions will become invalid!
-    # Make sure the secret is at least 30 characters and all random, 
+    # Make sure the secret is at least 30 characters and all random,
     # no regular words or you'll be exposed to dictionary attacks.
     config.secret_token = noosfero_session_secret
     config.action_dispatch.session = {
 <% base_requires = '-r features/support -r features/step_definitions' %>
-<% default_options = "--color --format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb #{base_requires}" %>
+<% default_options = "--format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb #{base_requires}" %>
+<%
+  default_options += ' --color' if $stdout.isatty
+%>
 <% selenium_options = "--strict --tags @selenium #{base_requires}" %>
  
 default: <%= default_options %>
-if Delayed::Backend::ActiveRecord::Job.table_exists?
+if Delayed::Backend::ActiveRecord::Job.table_exists? &&
+  Delayed::Backend::ActiveRecord::Job.attribute_names.include?('queue')
   job = Delayed::Backend::ActiveRecord::Job.all :conditions => ['handler LIKE ?', "%ActivitiesCounterCacheJob%"]
   if job.blank?
     Delayed::Backend::ActiveRecord::Job.enqueue(ActivitiesCounterCacheJob.new, {:priority => -3})
@@ -1,5 +0,0 @@
-if Delayed::Backend::ActiveRecord::Job.table_exists?
-  jobs = Delayed::Backend::ActiveRecord::Job.all :conditions => ['handler LIKE ?', "%LogMemoryConsumptionJob%"]
-  jobs.map(&:destroy) if jobs.present?
-  Delayed::Backend::ActiveRecord::Job.enqueue(LogMemoryConsumptionJob.new)
-end
@@ -0,0 +1,2 @@
+# Load newrelic agent if its config file is defined.
+require 'newrelic_rpm' if File.exist?(File.dirname(__FILE__) + '/../newrelic.yml')
@@ -0,0 +1,9 @@
+if defined? PhusionPassenger
+
+  # from http://russbrooks.com/2010/10/20/rails-cache-memcache-on-passenger-with-smart-spawning
+  PhusionPassenger.on_event :starting_worker_process do |forked|
+    if forked
+      Rails.cache.instance_variable_get(:@data).reset if Rails.cache.class == ActiveSupport::Cache::MemCacheStore
+    end
+  end
+end
-if Delayed::Backend::ActiveRecord::Job.table_exists?
+if Delayed::Backend::ActiveRecord::Job.table_exists? &&
+  Delayed::Backend::ActiveRecord::Job.attribute_names.include?('queue')
   PersonNotifier.schedule_all_next_notification_mail
 end
@@ -0,0 +1,10 @@
+class IndexDomainsFilteredFields < ActiveRecord::Migration
+
+  def self.up
+    add_index :domains, [:name]
+    add_index :domains, [:is_default]
+    add_index :domains, [:owner_id, :owner_type]
+    add_index :domains, [:owner_id, :owner_type, :is_default]
+  end
+
+end
@@ -0,0 +1,12 @@
+class IndexArticlesFilteredFields < ActiveRecord::Migration
+  def self.up
+    %w[articles article_versions].each do |table|
+      add_index table, [:path]
+      add_index table, [:path, :profile_id]
+    end
+    add_index :articles, [:type]
+    add_index :articles, [:type, :parent_id]
+    add_index :articles, [:type, :profile_id]
+  end
+
+end
@@ -0,0 +1,13 @@
+class AddIndexToBlogPostsSort < ActiveRecord::Migration
+  def self.up
+     %w[articles article_versions].each do |table|
+      add_index table, [:published_at, :id]
+    end
+ end
+
+  def self.down
+     %w[articles article_versions].each do |table|
+      remove_index table, [:published_at, :id]
+    end
+  end
+end
@@ -0,0 +1,9 @@
+class RemoveEnvironmentStatisticsBlock < ActiveRecord::Migration
+  def self.up
+    update("UPDATE blocks SET type = 'StatisticsBlock' WHERE type = 'EnvironmentStatisticsBlock'")
+  end
+
+  def self.down
+    say("Nothing to undo (cannot recover the data)")
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20140808185510) do
+ActiveRecord::Schema.define(:version => 20140827191326) do
  
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -95,12 +95,15 @@ ActiveRecord::Schema.define(:version =&gt; 20140808185510) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
-    t.integer  "created_by_id"
     t.integer  "spam_comments_count",  :default => 0
     t.integer  "author_id"
+    t.integer  "created_by_id"
   end
  
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
+  add_index "article_versions", ["path", "profile_id"], :name => "index_article_versions_on_path_and_profile_id"
+  add_index "article_versions", ["path"], :name => "index_article_versions_on_path"
+  add_index "article_versions", ["published_at", "id"], :name => "index_article_versions_on_published_at_and_id"
  
   create_table "articles", :force => true do |t|
     t.string   "name"
@@ -143,9 +146,9 @@ ActiveRecord::Schema.define(:version =&gt; 20140808185510) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
-    t.integer  "created_by_id"
     t.integer  "spam_comments_count",  :default => 0
     t.integer  "author_id"
+    t.integer  "created_by_id"
   end
  
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -153,9 +156,15 @@ ActiveRecord::Schema.define(:version =&gt; 20140808185510) do
   add_index "articles", ["hits"], :name => "index_articles_on_hits"
   add_index "articles", ["name"], :name => "index_articles_on_name"
   add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
+  add_index "articles", ["path", "profile_id"], :name => "index_articles_on_path_and_profile_id"
+  add_index "articles", ["path"], :name => "index_articles_on_path"
   add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
+  add_index "articles", ["published_at", "id"], :name => "index_articles_on_published_at_and_id"
   add_index "articles", ["slug"], :name => "index_articles_on_slug"
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
+  add_index "articles", ["type", "parent_id"], :name => "index_articles_on_type_and_parent_id"
+  add_index "articles", ["type", "profile_id"], :name => "index_articles_on_type_and_profile_id"
+  add_index "articles", ["type"], :name => "index_articles_on_type"
  
   create_table "articles_categories", :id => false, :force => true do |t|
     t.integer "article_id"
@@ -277,6 +286,11 @@ ActiveRecord::Schema.define(:version =&gt; 20140808185510) do
     t.string  "google_maps_key"
   end
  
+  add_index "domains", ["is_default"], :name => "index_domains_on_is_default"
+  add_index "domains", ["name"], :name => "index_domains_on_name"
+  add_index "domains", ["owner_id", "owner_type", "is_default"], :name => "index_domains_on_owner_id_and_owner_type_and_is_default"
+  add_index "domains", ["owner_id", "owner_type"], :name => "index_domains_on_owner_id_and_owner_type"
+
   create_table "environments", :force => true do |t|
     t.string   "name"
     t.string   "contact_email"
+noosfero (1.0~rc3) wheezy-test; urgency=low
+
+  * Third release candidate to Noosfero 1.0
+
+ -- Antonio Terceiro <terceiro@debian.org>  Fri, 12 Sep 2014 16:20:58 -0300
+
+noosfero (1.0~rc2) wheezy-test; urgency=low
+
+  * Second 1.0 release candidate
+
+ -- Antonio Terceiro <terceiro@debian.org>  Fri, 12 Sep 2014 13:01:11 -0300
+
 noosfero (1.0~rc1) wheezy-test; urgency=low
  
   * First 1.0 release candidate
@@ -10,6 +22,12 @@ noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
  
  -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 18 Jun 2014 20:25:01 +0000
  
+noosfero (0.47.4) unstable; urgency=low
+
+  * Bugfixes and performance optimizations
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Thu, 21 Aug 2014 19:25:37 +0000
+
 noosfero (0.47.3) unstable; urgency=low
  
   * Bugfixes release
@@ -9,7 +9,7 @@ Build-Depends:
  ruby-gettext,
  ruby-sqlite3,
  rake,
- rails3 (>= 3.2.6-1~),
+ rails3 (>= 3.2.19-1~),
  ruby-rspec,
  ruby-rspec-rails,
  ruby-will-paginate,
@@ -30,12 +30,14 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
  
 Package: noosfero
 Architecture: all
+Pre-Depends: ruby1.8 (>= 1.8.7.358)
 Depends:
  rails3 (>= 3.2.6-1~),
  ruby (>= 1:1.9.3),
  rake,
  ruby-dalli,
  ruby-exception-notification,
+ ruby-gettext,
  ruby-fast-gettext,
  ruby-pg,
  ruby-rmagick,
@@ -8,7 +8,6 @@ Rakefile                          usr/share/noosfero
 vendor                            usr/share/noosfero
  
 Gemfile                           usr/share/noosfero
-Gemfile.lock                      usr/share/noosfero
 debian/bundle/config              usr/share/noosfero/.bundle
  
 config/application.rb             usr/share/noosfero/config
@@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails             usr/share/noosfero/public/th
 usr/share/noosfero/public/designs/themes/noosfero   usr/share/noosfero/public/designs/themes/default
 usr/share/noosfero/public/designs/icons/tango       usr/share/noosfero/public/designs/icons/default
 usr/share/noosfero/script/noosfero-plugins          usr/sbin/noosfero-plugins
+usr/share/noosfero/Gemfile.lock                     /dev/null
@@ -45,7 +45,7 @@ if [ -z &quot;$NOOSFERO_DIR&quot; ] || [ -z &quot;$NOOSFERO_USER&quot; ]; then
 fi
  
 if test -x /usr/sbin/noosfero-check-dbconfig ; then
-  if ! noosfero-check-dbconfig; then
+  if ! /usr/sbin/noosfero-check-dbconfig; then
     echo "Noosfero database access not configured, service disabled."
     exit 0
   fi
@@ -298,3 +298,55 @@ Feature: signup
     And wait for the captcha signup time
     And I press "Create my account"
     Then "José da Silva" should be a member of "Free Software"
+
+  @selenium
+  Scenario: user registration is moderated by admin
+    Given feature "admin_must_approve_new_users" is enabled on environment
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I go to /account/signup
+    And I fill in "Username" with "teste"
+    And I fill in "Password" with "123456"
+    And I fill in "Password confirmation" with "123456"
+    And I fill in "e-Mail" with "teste@teste.com"
+    And I fill in "Full name" with "Teste da Silva"
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to teste's confirmation URL
+    And I am logged in as admin
+    And I follow "Control panel"
+    And I follow "Tasks"
+    And I choose "Accept"
+    And I press "Apply!"
+    And I follow "Logout"
+    And Teste da Silva's account is activated
+    And I follow "Login"
+    And I fill in "Username / Email" with "teste"
+    And I fill in "Password" with "123456"
+    And I press "Log in"
+    Then I should see "teste"
+
+
+  @selenium
+  Scenario: user registration is not accepted by the admin
+    Given feature "admin_must_approve_new_users" is enabled on environment
+    And feature "skip_new_user_email_confirmation" is disabled on environment
+    And I go to /account/signup
+    And I fill in "Username" with "teste"
+    And I fill in "Password" with "123456"
+    And I fill in "Password confirmation" with "123456"
+    And I fill in "e-Mail" with "teste@teste.com"
+    And I fill in "Full name" with "Teste da Silva"
+    And wait for the captcha signup time
+    And I press "Create my account"
+    And I go to teste's confirmation URL
+    And I am logged in as admin
+    And I follow "Control panel"
+    And I follow "Tasks"
+    And I choose "Reject"
+    And I press "Apply!"
+    And I follow "Logout"
+    And I follow "Login"
+    And I fill in "Username / Email" with "teste"
+    And I fill in "Password" with "123456"
+    And I press "Log in"
+    Then I should not see "teste"
 \ No newline at end of file
@@ -43,3 +43,4 @@ debian/noosfero-apache/
 features/plugins/*
 plugins/solr/config/solr.yml
 /solr
+/Gemfile.lock
@@ -22,7 +22,7 @@ module ActsAsHavingPosts
   end
  
   def feed
-    self.children.find(:first, :conditions => {:type => 'RssFeed'})
+    Article.where(:parent_id => self.id).where(:type => 'RssFeed').first
   end
  
   def feed=(attrs)
@@ -20,7 +20,5 @@ class LogMemoryConsumptionJob &lt; Struct.new(:last_stat)
       i += 1
     end
     logger << "\n"
-
-    Delayed::Job.enqueue(LogMemoryConsumptionJob.new(stats), {:priority => 0, :run_at => PERIOD.seconds.from_now})
   end
 end
@@ -20,5 +20,5 @@ if File.exists?(locale_dir)
   repos << FastGettext::TranslationRepository.build('iso_3166', :type => 'mo', :path => locale_dir)
 end
  
-FastGettext.add_text_domain 'noosferofull', :type => :chain, :chain => repos
-FastGettext.default_text_domain = 'noosferofull'
+FastGettext.add_text_domain 'noosfero', :type => :chain, :chain => repos
+FastGettext.default_text_domain = 'noosfero'
@@ -62,14 +62,16 @@ class Noosfero::Plugin
           path << File.join(dir, 'lib')
           # load vendor/plugins
           Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
-            path << "#{vendor_plugin}/lib" 
-            init = "#{vendor_plugin}/init.rb"
-            require init.gsub(/.rb$/, '') if File.file? init
-         end
+            path << "#{vendor_plugin}/lib"
+          end
+        end
+        Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
+          init = "#{vendor_plugin}/init.rb"
+          require init.gsub(/.rb$/, '') if File.file? init
         end
  
         # add view path
-        ActionController::Base.view_paths.unshift(File.join(dir, 'views'))
+        config.paths['app/views'].unshift File.join(dir, 'views')
       end
     end
  
@@ -237,7 +239,7 @@ class Noosfero::Plugin
     nil
   end
  
-  # -> Adds content to calalog item
+  # -> Adds content to catalog item
   # returns = lambda block that creates html code
   def catalog_item_extras(item)
     nil
@@ -249,7 +251,7 @@ class Noosfero::Plugin
     nil
   end
  
-  # -> Adds content to calalog list item
+  # -> Adds content to catalog list item
   # returns = lambda block that creates html code
   def catalog_list_item_extras(item)
     nil
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.0~rc1'
+  VERSION = '1.0~rc3'
 end
@@ -5,7 +5,7 @@ namespace :noosfero do
     end
     task :link_plugins_textiles do
       plugins_textiles.each do |file|
-        ln_sf Rails.root.join(file), 'doc/noosfero/plugins/'
+        ln_sf File.join('../../../', file), 'doc/noosfero/plugins/'
       end
     end
     task :unlink_plugins_textiles do
@@ -6,8 +6,16 @@ makemo_stamp = &#39;tmp/makemo.stamp&#39;
 desc "Create mo-files for L10n"
 task :makemo => makemo_stamp
 file makemo_stamp => Dir.glob('po/*/noosfero.po') do
-  ruby '-I. -rconfig/boot -e \'require "gettext"; require "gettext/utils"; GetText.create_mofiles(true, "po", "locale")\''
   Rake::Task['symlinkmo'].invoke
+
+  require 'gettext'
+  require 'gettext/tools'
+  GetText.create_mofiles(
+    verbose: true,
+    po_root: 'po',
+    mo_root: 'locale',
+  )
+
   FileUtils.mkdir_p 'tmp'
   FileUtils.touch makemo_stamp
 end
@@ -22,7 +30,7 @@ task :symlinkmo do
     'pt' => 'pt_BR',
   }
   mkdir_p(Rails.root.join('locale'))
-  Dir.glob(Rails.root.join('locale/*')).each do |dir|
+  Dir.glob(Rails.root.join('po/*/')).each do |dir|
     lang = File.basename(dir)
     orig_lang = langmap[lang] || lang
     mkdir_p(Rails.root.join('locale', "#{lang}", 'LC_MESSAGES'))
@@ -38,21 +46,28 @@ end
  
 desc "Update pot/po files to match new version."
 task :updatepo do
-  require 'gettext_rails/tools'
-  require_dependency 'noosfero'
-
-  GetText::RubyParser::ID << '__'
-  GetText::RubyParser::PLURAL_ID << 'n__'
-  GetText::ActiveRecordParser.init(:use_classname => false)
  
   puts 'Extracting strings from source. This may take a while ...'
-  sources =
-    Dir.glob("{app,lib}/**/*.{rb,rhtml,erb}") +
-    Dir.glob('config/initializers/*.rb') +
-    Dir.glob('public/*.html.erb') +
-    Dir.glob('public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}') +
-    Dir.glob('plugins/**/{controllers,models,lib,views}/**/*.{rhtml,html.erb,rb}')
-  GetText.update_pofiles(Noosfero::PROJECT, sources, "#{Noosfero::PROJECT} #{Noosfero::VERSION}")
+
+  files_to_translate = [
+    "{app,lib}/**/*.{rb,rhtml,erb}",
+    'config/initializers/*.rb',
+    'public/*.html.erb',
+    'public/designs/themes/{base,noosfero,profile-base}/*.{rhtml,html.erb}',
+    'plugins/**/{controllers,models,lib,views}/**/*.{rhtml,html.erb,rb}',
+  ].map { |pattern| Dir.glob(pattern) }.flatten
+
+  require 'gettext'
+  require 'gettext/tools'
+  GetText.update_pofiles(
+    'noosfero',
+    files_to_translate,
+    Noosfero::VERSION,
+    {
+      po_root: 'po',
+    }
+  )
+
 end
  
 task :checkpo do
@@ -9,7 +9,7 @@ task :package =&gt; &#39;package:clobber&#39; do
     fail
   end
  
-  release = "#{Noosfero::PROJECT}-#{Noosfero::VERSION}"
+  release = "#{Noosfero::PROJECT}-#{$version}"
   target = "pkg/#{release}"
   mkdir_p target
   sh "git archive HEAD | (cd #{target} && tar x)"
@@ -7,7 +7,11 @@ namespace :noosfero do
     plugin_migration_dirs = Dir.glob(Rails.root.join('{baseplugins,config/plugins}', '*', 'db', 'migrate'))
  
     task :load_config do
-      dirs = Dir.glob("{baseplugins,config/plugins}/*/db/migrate")
+      dirs = Dir.glob("{baseplugins,config/plugins}/*").uniq do |dir|
+        File.basename(dir)
+      end.map do |dir|
+        File.join(dir, 'db/migrate')
+      end
       dirs.each do |dir|
         ActiveRecord::Migrator.migrations_paths << dir
       end
@@ -131,7 +131,7 @@ EOF
     new_version = $version.dup
  
     if target =~ /-test$/
-      if new_version =~ /~rc\d\+/
+      if new_version =~ /~rc\d+/
         new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" }
       else
         new_version += '~rc1'
@@ -141,7 +141,7 @@ EOF
     end
  
     puts "Current version: #{$version}"
-    ask("Version to release" % new_version, new_version)
+    new_version = ask("Version to release", new_version)
     release_message = ask("Release message")
  
     sh 'git checkout debian/changelog lib/noosfero/version.rb'
@@ -205,14 +205,17 @@ EOF
     puts "==> Preparing debian packages..."
     Rake::Task['noosfero:debian_packages'].invoke
  
-    sh "git tag #{$version.gsub('~','-')}"
-    if confirm('Push new version tag')
-      repository = ask('Repository name', 'origin')
-      puts "==> Uploading tags..."
-      sh "git push #{repository} #{$version.gsub('~','-')}"
+    if confirm("Create tag for version #{$version}")
+      sh "git tag #{$version.gsub('~','-')}"
+
+      if confirm('Push new version tag')
+        repository = ask('Repository name', 'origin')
+        puts "==> Uploading tags..."
+        sh "git push #{repository} #{$version.gsub('~','-')}"
+      end
     end
  
-    if confirm('Do you want to upload the packages')
+    if confirm('Upload the packages')
       puts "==> Uploading debian packages..."
       Rake::Task['noosfero:upload_packages'].invoke(target)
     else
 <div id='cart-request-box'>
-  <% form_for(:customer, :url => {:action => 'send_request'},
-              :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
+  <%= form_for(:customer, :url => {:action => 'send_request'},
+              :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form'}) do |f| %>
     <div id="cart-form-main">
       <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
       <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
@@ -9,18 +9,18 @@
 production:
   url: http://127.0.0.1:8983/solr
   jvm_options: -server -Xmx192M -Xms64M
-  timeout: 0
+  timeout: 600
   data_path: /var/lib/noosfero-data/solr/index
  
 development:
   url: http://0.0.0.0:8982/solr
   jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
+  timeout: 600
  
 test: &TEST
   url: http://0.0.0.0:8981/solr
   jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
+  timeout: 600
  
 cucumber:
   <<: *TEST
-raise "Not ready yet. Some tests are failing."
+#raise "Not ready yet. Some tests are failing."
 require 'rubygems'
 require 'rake'
  
@@ -27,7 +27,8 @@ class Product
       {:name => {:type => :text, :boost => 2.0}},
       {:description => :text}, {:category_full_name => :text},
       # filtered fields
-      {:solr_plugin_public => :boolean}, {:environment_id => :integer},
+      {:solr_plugin_public => :boolean},
+      {:environment_id => :integer}, {:profile_id => :integer},
       {:enabled => :boolean}, {:solr_plugin_category_filter => :integer},
       # ordered/query-boosted fields
       {:solr_plugin_price_sortable => :decimal}, {:solr_plugin_name_sortable => :string},
@@ -42,7 +42,7 @@ class Profile
   handle_asynchronously :solr_save
   handle_asynchronously :solr_destroy
  
-  class_inheritable_accessor :solr_plugin_extra_index_methods
+  class_attribute :solr_plugin_extra_index_methods
   self.solr_plugin_extra_index_methods = []
  
   def solr_plugin_extra_data_for_index
@@ -33,8 +33,8 @@ class SolrPlugin &lt; Noosfero::Plugin
  
     solr_options = solr_options(class_asset(klass), category)
     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[:filter_queries] += scopes_to_solr_options scope, klass, options
+    solr_options.merge! products_options(user) if asset == :products and empty_query
     solr_options.merge! options.except(:category, :filter)
  
     scope.find_by_contents query, paginate_options, solr_options
@@ -42,14 +42,14 @@ class SolrPlugin &lt; Noosfero::Plugin
  
   protected
  
-  def scopes_to_solr_filters scope, klass = nil, options = {}
+  def scopes_to_solr_options 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
+    scope.scope_attributes.each do |attr, value|
+      raise "Non-indexed attribute '#{attr}' speficied in scope_attributes" unless solr_fields.include? attr.to_sym
  
       # if the filter is present here, then prefer it
       scopes_applied.reject!{ |name| name == attr.to_sym }
+services: 
+  - mongodb
+
+language: ruby
+rvm:
+  - 1.8.7
+
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install default-jdk
+
 before_script:
   - mongo mydb_test --eval 'db.addUser("travis", "test");'
   - gem update --system 1.4.1 > /dev/null 2>&1
   - rake solr:download
   - RAILS_ENV=test rake solr:start
  
-script: "bundle exec rake $TASK --trace"
+script: 
+  - bundle exec rake test --trace
+  - bundle exec rake test:functional --trace
  
-rvm:
-  - 1.8.7
-env: 
-  - TASK=test
-  - TASK=test:functional
-source :rubygems
+source 'https://rubygems.org'
  
 gem 'ruby-debug'
+gem 'rdoc'
+
+gem 'jeweler'
  
 gem 'rails', '2.3.5'
  
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
  
 ENV['RAILS_ENV'] = "test"
 require File.expand_path("#{File.dirname(__FILE__)}/config/solr_environment")
  
 Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load ext }
  
-desc "Default Task"
-task :default => [:test]
-
-desc "Runs the unit tests"
-task :test => "test:unit"
-
-namespace :test do
-  task :setup do
-    DB ||= 'sqlite'
-    puts "Using " + DB
-    %x(mysql -u#{MYSQL_USER} < #{File.dirname(__FILE__) + "/test/fixtures/db_definitions/mysql.sql"}) if DB == 'mysql'
-
-    Rake::Task["test:migrate"].invoke
-  end
-
-  desc 'Measures test coverage using rcov'
-  task :rcov => :setup do
-    rm_f "coverage"
-    rm_f "coverage.data"
-    rcov = "rcov --rails --aggregate coverage.data --text-summary -Ilib"
-
-    system("#{rcov} --html #{Dir.glob('test/**/*_shoulda.rb').join(' ')}")
-    system("open coverage/index.html") if PLATFORM['darwin']
-  end
-
-  desc 'Runs the functional tests, testing integration with Solr'
-  Rake::TestTask.new(:functional => :setup) do |t|
-    t.pattern = "test/functional/*_test.rb"
-    t.verbose = true
-  end
-
-  desc "Unit tests"
-  Rake::TestTask.new(:unit => :setup) do |t|
-    t.libs << 'test/unit'
-    t.pattern = "test/unit/*_shoulda.rb"
-    t.verbose = true
-  end
-end
-
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_dir = "rdoc"
-  rd.rdoc_files.exclude("lib/solr/**/*.rb", "lib/solr.rb")
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "acts_as_solr_reloaded"
-    s.summary = "This gem adds full text search capabilities and many other nifty features from Apache Solr to any Rails model."
-    s.email = "dc.rec1@gmail.com"
-    s.homepage = "http://github.com/dcrec1/acts_as_solr_reloaded"
-    s.description = "This gem adds full text search capabilities and many other nifty features from Apache Solr to any Rails model."
-    s.authors = ["Diego Carrion"]
-    s.files =  FileList["[A-Z]*", "{bin,generators,config,lib,solr}/**/*"] +
-      FileList["test/**/*"].reject {|f| f.include?("test/log")}.reject {|f| f.include?("test/tmp")}
-  end
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end
@@ -6,23 +6,19 @@ require &#39;net/http&#39;
  
 dir = File.dirname(__FILE__)
 SOLR_PATH = File.expand_path("#{dir}/../solr") unless defined? SOLR_PATH
-config = YAML::load_file(RAILS_ROOT+'/plugins/solr/config/solr.yml')
+config = YAML::load_file("#{Rails.root}/plugins/solr/config/solr.yml")
  
-unless defined? RAILS_ROOT
-  # define RAILS_ROOT for test environment
-  RAILS_ROOT = defined?(Rails) ? Rails.root : File.expand_path("#{File.dirname(__FILE__)}/../test")
-end
 unless defined? RAILS_ENV
   RAILS_ENV = ENV['RAILS_ENV']
 end
 unless defined? SOLR_LOGS_PATH
-  SOLR_LOGS_PATH = ENV["SOLR_LOGS_PATH"] || "#{RAILS_ROOT}/log"
+  SOLR_LOGS_PATH = ENV["SOLR_LOGS_PATH"] || "#{Rails.root}/log"
 end
 unless defined? SOLR_PIDS_PATH
-  SOLR_PIDS_PATH = ENV["SOLR_PIDS_PATH"] || "#{RAILS_ROOT}/tmp/pids"
+  SOLR_PIDS_PATH = ENV["SOLR_PIDS_PATH"] || "#{Rails.root}/tmp/pids"
 end
 unless defined? SOLR_DATA_PATH
-  SOLR_DATA_PATH = ENV["SOLR_DATA_PATH"] || config[ENV['RAILS_ENV']]['data_path'] || "#{RAILS_ROOT}/solr/#{ENV['RAILS_ENV']}"
+  SOLR_DATA_PATH = ENV["SOLR_DATA_PATH"] || config[ENV['RAILS_ENV']]['data_path'] || "#{Rails.root}/solr/#{ENV['RAILS_ENV']}"
 end
 unless defined? SOLR_CONFIG_PATH
   SOLR_CONFIG_PATH = ENV["SOLR_CONFIG_PATH"] || "#{SOLR_PATH}/solr"
@@ -20,6 +20,7 @@ require File.dirname(__FILE__) + &#39;/acts_as_solr/search_results&#39;
 require File.dirname(__FILE__) + '/acts_as_solr/lazy_document'
 require File.dirname(__FILE__) + '/acts_as_solr/mongo_mapper'
 require File.dirname(__FILE__) + '/acts_as_solr/post'
+require File.dirname(__FILE__) + '/acts_as_solr/scope_with_applied_names'
  
 # reopen ActiveRecord and include the acts_as_solr method
 ActiveRecord::Base.extend ActsAsSolr::ActsMethods
@@ -178,6 +178,8 @@ module ActsAsSolr #:nodoc:
       include CommonMethods
       include ParserMethods
  
+      attr_accessor :solr_score
+
       define_solr_configuration_methods
  
       acts_as_taggable_on :tags if options[:taggable]
 module ActsAsSolr #:nodoc:
-  
+
   module CommonMethods
  
     TypeMapping = {
@@ -14,6 +14,7 @@ module ActsAsSolr #:nodoc:
       :range_integer => "ri",
       :facet => "facet",
       :text => "t",
+      :ngram_text => "nt",
     }
  
     # Converts field types into Solr types
@@ -39,39 +40,39 @@ module ActsAsSolr #:nodoc:
       result = [result] unless result.is_a?(Array)
       solr_batch_add result
     end
-    
+
     # Sends an add command to Solr
     def solr_add(add_xml)
       ActsAsSolr::Post.execute(Solr::Request::AddDocument.new(add_xml))
     end
-    
+
     # Sends the delete command to Solr
     def solr_delete(solr_ids)
       ActsAsSolr::Post.execute(Solr::Request::Delete.new(:id => solr_ids))
     end
-    
+
     # Sends the commit command to Solr
     def solr_commit
       ActsAsSolr::Post.execute(Solr::Request::Commit.new)
     end
-    
+
     # Optimizes the Solr index. Solr says:
-    # 
-    # Optimizations can take nearly ten minutes to run. 
-    # We are presuming optimizations should be run once following large 
+    #
+    # Optimizations can take nearly ten minutes to run.
+    # We are presuming optimizations should be run once following large
     # batch-like updates to the collection and/or once a day.
-    # 
-    # One of the solutions for this would be to create a cron job that 
+    #
+    # One of the solutions for this would be to create a cron job that
     # runs every day at midnight and optmizes the index:
     #   0 0 * * * /your_rails_dir/script/runner -e production "Model.solr_optimize"
-    # 
+    #
     def solr_optimize
       ActsAsSolr::Post.execute(Solr::Request::Optimize.new)
     end
-    
+
     # Returns the id for the given instance
-    def record_id(object)
-      eval "object.#{object.class.primary_key}"
+    def record_id object
+      object.send object.class.primary_key
     end
   end
 end
@@ -4,12 +4,16 @@ module ActsAsSolr #:nodoc:
  
     # Method used by mostly all the ClassMethods when doing a search
     def parse_query(query=nil, options={})
-      valid_options = [:models, :lazy, :core, :results_format, :sql_options,
+      valid_options = [
+        :models, :lazy, :core, :results_format, :sql_options,
         :alternate_query, :boost_functions, :filter_queries, :facets, :sort,
         :scores, :operator, :latitude, :longitude, :radius, :relevance, :highlight,
-        :offset, :per_page, :limit, :page,]
+        :offset, :per_page, :limit, :page,
+        :query_fields, :default_field,
+      ]
       query_options = {}
       options[:results_format] ||= :objects
+      options[:default_field] ||= 'text'
  
       return if query.nil?
       raise "Query should be a string" unless query.is_a?(String)
@@ -49,77 +53,95 @@ module ActsAsSolr #:nodoc:
         query_options[:rows] = per_page
         query_options[:start] = offset
  
+        query_options[:boost_functions] = replace_types([*options[:boost_functions]], '').join(' ') if options[:boost_functions]
+
+        parse_facets query_options, options
+        parse_highlight query_options, options
+        parse_sort query_options, options
+        parse_location query_options, options
+        parse_query_fields query_options, options
+
         query_options[:operator] = options[:operator]
+        not_dismax = query_options[:operator] == :or
+        request = if not_dismax then Solr::Request::Standard.new(query_options) else Solr::Request::Dismax.new query_options end
+        ActsAsSolr::Post.execute request, options[:core]
+      rescue
+        raise "#{$query} There was a problem executing your search\n#{query_options.inspect}\n: #{$!} in #{$!.backtrace.first}"
+      end
+    end
  
-        query_options[:boost_functions] = replace_types([*options[:boost_functions]], '').join(' ') if options[:boost_functions]
+    def parse_query_fields query_options, options
+      options[:query_fields] ||= []
+      query_options[:query_fields] = replace_types([*options[:query_fields]], '').join ' '
+    end
+
+    def parse_sort query_options, options
+      query_options[:sort] = replace_types([*options[:sort]], '')[0] if options[:sort]
+    end
  
-        # first steps on the facet parameter processing
-        if options[:facets]
-          query_options[:facets] = {}
-          query_options[:facets][:limit] = -1  # TODO: make this configurable
-          query_options[:facets][:sort] = :count if options[:facets][:sort]
-          query_options[:facets][:mincount] = 0
-          query_options[:facets][:mincount] = 1 if options[:facets][:zeros] == false
-          # override the :zeros (it's deprecated anyway) if :mincount exists
-          query_options[:facets][:mincount] = options[:facets][:mincount] if options[:facets][:mincount]
-          query_options[:facets][:fields] = options[:facets][:fields].map{ |k| "#{k}_facet" } if options[:facets][:fields]
-          query_options[:filter_queries] += replace_types([*options[:facets][:browse]]) if options[:facets][:browse]
-          query_options[:facets][:queries] = replace_types([*options[:facets][:query]]) if options[:facets][:query]
-
-          if options[:facets][:dates]
-            query_options[:date_facets] = {}
-            # if options[:facets][:dates][:fields] exists then :start, :end, and :gap must be there
-            if options[:facets][:dates][:fields]
-              [:start, :end, :gap].each { |k| raise "#{k} must be present in faceted date query" unless options[:facets][:dates].include?(k) }
-              query_options[:date_facets][:fields] = []
-              options[:facets][:dates][:fields].each { |f|
-                if f.kind_of? Hash
-                  key = f.keys[0]
-                  query_options[:date_facets][:fields] << {"#{key}_d" => f[key]}
-                  validate_date_facet_other_options(f[key][:other]) if f[key][:other]
-                else
-                  query_options[:date_facets][:fields] << "#{f}_d"
-                end
-              }
-            end
-
-            query_options[:date_facets][:start]   = options[:facets][:dates][:start] if options[:facets][:dates][:start]
-            query_options[:date_facets][:end]     = options[:facets][:dates][:end] if options[:facets][:dates][:end]
-            query_options[:date_facets][:gap]     = options[:facets][:dates][:gap] if options[:facets][:dates][:gap]
-            query_options[:date_facets][:hardend] = options[:facets][:dates][:hardend] if options[:facets][:dates][:hardend]
-            query_options[:date_facets][:filter]  = replace_types([*options[:facets][:dates][:filter]].collect{|k| "#{k.dup.sub!(/ *:(?!\d) */,"_d:")}"}) if options[:facets][:dates][:filter]
-
-            if options[:facets][:dates][:other]
-              validate_date_facet_other_options(options[:facets][:dates][:other])
-              query_options[:date_facets][:other] = options[:facets][:dates][:other]
-            end
+    def parse_location query_options, options
+      if options[:radius]
+        query_options[:radius] = options[:radius]
+        query_options[:filter_queries] << '{!geofilt}'
+      end
+      query_options[:latitude] = options[:latitude]
+      query_options[:longitude] = options[:longitude]
+    end
  
+    def parse_highlight query_options, options
+      if options[:highlight]
+        query_options[:highlighting] = {}
+        query_options[:highlighting][:field_list] = replace_types([*options[:highlight][:fields]], '') if options[:highlight][:fields]
+        query_options[:highlighting][:require_field_match] =  options[:highlight][:require_field_match] if options[:highlight][:require_field_match]
+        query_options[:highlighting][:max_snippets] = options[:highlight][:max_snippets] if options[:highlight][:max_snippets]
+        query_options[:highlighting][:prefix] = options[:highlight][:prefix] if options[:highlight][:prefix]
+        query_options[:highlighting][:suffix] = options[:highlight][:suffix] if options[:highlight][:suffix]
+      end
+    end
+
+    def parse_facets query_options, options
+      # first steps on the facet parameter processing
+      if options[:facets]
+        query_options[:facets] = {}
+        query_options[:facets][:limit] = -1  # TODO: make this configurable
+        query_options[:facets][:sort] = :count if options[:facets][:sort]
+        query_options[:facets][:mincount] = 0
+        query_options[:facets][:mincount] = 1 if options[:facets][:zeros] == false
+        # override the :zeros (it's deprecated anyway) if :mincount exists
+        query_options[:facets][:mincount] = options[:facets][:mincount] if options[:facets][:mincount]
+        query_options[:facets][:fields] = options[:facets][:fields].map{ |k| "#{k}_facet" } if options[:facets][:fields]
+        query_options[:filter_queries] += replace_types([*options[:facets][:browse]]) if options[:facets][:browse]
+        query_options[:facets][:queries] = replace_types([*options[:facets][:query]]) if options[:facets][:query]
+
+        if options[:facets][:dates]
+          query_options[:date_facets] = {}
+          # if options[:facets][:dates][:fields] exists then :start, :end, and :gap must be there
+          if options[:facets][:dates][:fields]
+            [:start, :end, :gap].each { |k| raise "#{k} must be present in faceted date query" unless options[:facets][:dates].include?(k) }
+            query_options[:date_facets][:fields] = []
+            options[:facets][:dates][:fields].each { |f|
+              if f.kind_of? Hash
+                key = f.keys[0]
+                query_options[:date_facets][:fields] << {"#{key}_d" => f[key]}
+                validate_date_facet_other_options(f[key][:other]) if f[key][:other]
+              else
+                query_options[:date_facets][:fields] << "#{f}_d"
+              end
+            }
           end
-        end
  
-        if options[:highlight]
-          query_options[:highlighting] = {}
-          query_options[:highlighting][:field_list] = replace_types([*options[:highlight][:fields]], '') if options[:highlight][:fields]
-          query_options[:highlighting][:require_field_match] =  options[:highlight][:require_field_match] if options[:highlight][:require_field_match]
-          query_options[:highlighting][:max_snippets] = options[:highlight][:max_snippets] if options[:highlight][:max_snippets]
-          query_options[:highlighting][:prefix] = options[:highlight][:prefix] if options[:highlight][:prefix]
-          query_options[:highlighting][:suffix] = options[:highlight][:suffix] if options[:highlight][:suffix]
-        end
+          query_options[:date_facets][:start]   = options[:facets][:dates][:start] if options[:facets][:dates][:start]
+          query_options[:date_facets][:end]     = options[:facets][:dates][:end] if options[:facets][:dates][:end]
+          query_options[:date_facets][:gap]     = options[:facets][:dates][:gap] if options[:facets][:dates][:gap]
+          query_options[:date_facets][:hardend] = options[:facets][:dates][:hardend] if options[:facets][:dates][:hardend]
+          query_options[:date_facets][:filter]  = replace_types([*options[:facets][:dates][:filter]].collect{|k| "#{k.dup.sub!(/ *:(?!\d) */,"_d:")}"}) if options[:facets][:dates][:filter]
  
-        query_options[:sort] = replace_types([*options[:sort]], '')[0] if options[:sort]
+          if options[:facets][:dates][:other]
+            validate_date_facet_other_options(options[:facets][:dates][:other])
+            query_options[:date_facets][:other] = options[:facets][:dates][:other]
+          end
  
-        if options[:radius]
-          query_options[:radius] = options[:radius]
-          query_options[:filter_queries] << '{!geofilt}'
         end
-        query_options[:latitude] = options[:latitude]
-        query_options[:longitude] = options[:longitude]
-
-        not_dismax = query_options[:operator] == :or
-        request = not_dismax ? Solr::Request::Standard.new(query_options) : Solr::Request::Dismax.new(query_options)
-        ActsAsSolr::Post.execute(request, options[:core])
-      rescue
-        raise "#{$query} There was a problem executing your search\n#{query_options.inspect}\n: #{$!} in #{$!.backtrace.first}"
       end
     end
  
@@ -148,21 +170,21 @@ module ActsAsSolr #:nodoc:
         results.update :start => header['params']['start']
       end
  
-      results.update(:facets => {'facet_fields' => []}) if options[:facets]
+      results.update(:facets => {'facet_fields' => {}}) if options[:facets]
       return SearchResults.new(results) if solr_data.total_hits == 0
  
       results.update(:facets => solr_data.data['facet_counts']) if options[:facets]
  
-      ids = solr_data.hits.collect {|doc| doc["#{solr_configuration[:primary_key_field]}"]}.flatten
-      result = find_objects(ids, options)
-      results.update(:docs => result)
+      ids = solr_data.hits.collect{ |doc| doc["#{solr_configuration[:primary_key_field]}"] }.flatten
+      result = find_objects ids, options
+      results.update :ids => ids, :docs => result
  
       add_scores(result, solr_data) if options[:results_format] == :objects and options[:scores]
  
       highlighted = {}
       solr_data.highlighting.map do |x,y|
         e={}
-        y1=y.map{|x1,y1| e[x1.gsub(/_[^_]*/,"")]=y1} unless y.nil?
+        y.map{ |x1,y1| e[x1.gsub(/_[^_]*/,"")]=y1 } unless y.nil?
         highlighted[x.gsub(/[^:]*:/,"").to_i]=e
       end unless solr_data.highlighting.nil?
       results.update(:highlights => highlighted)
@@ -179,8 +201,12 @@ module ActsAsSolr #:nodoc:
         ids.collect{ |id| ActsAsSolr::LazyDocument.new(id, self) }
       elsif options[:results_format] == :objects
         find_options = options[:sql_options] || {}
-        find_options[:conditions] = self.send :merge_conditions, {self.primary_key => ids}, (find_options[:conditions] || [])
-        result = self.all(find_options) || []
+        if Rails::VERSION::STRING >= '3.0'
+          result = self.scoped(find_options).where(self.primary_key => ids).all
+        else
+          find_options[:conditions] = self.send :merge_conditions, {self.primary_key => ids}, (find_options[:conditions] || [])
+          result = self.all(find_options)
+        end
         result = reorder(result, ids) unless find_options[:order]
         result
       elsif options[:results_format] == :none
@@ -226,22 +252,15 @@ module ActsAsSolr #:nodoc:
     def add_scores(results, solr_data)
       with_score = []
       solr_data.hits.each do |doc|
-        with_score.push([doc["score"],
-          results.find {|record| scorable_record?(record, doc) }])
-      end
-      with_score.each do |score, object|
-        class << object; attr_accessor :solr_score; end
-        object.solr_score = score
+        record = results.find do |result|
+          doc_id = doc["#{solr_configuration[:primary_key_field]}"].first rescue nil
+          record_id(result).to_s == doc_id
+        end
+        with_score.push [doc["score"], record]
       end
-    end
-
-    def scorable_record?(record, doc)
-      doc_id = doc["#{solr_configuration[:primary_key_field]}"]
-      if doc_id.nil?
-        doc_id = doc["id"]
-        "#{record.class.name}:#{record_id(record)}" == doc_id.first.to_s
-      else
-        record_id(record).to_s == doc_id.to_s
+      with_score.each do |score, record|
+        next unless record
+        record.solr_score = score
       end
     end
  
@@ -0,0 +1,91 @@
+
+if Rails::VERSION::STRING >= "3.2"
+  module ::ActiveRecord
+
+    class Relation
+      attr_accessor :scopes_applied
+    end
+
+    module Scoping
+      module Named
+        module ClassMethods
+          attr_accessor :scope_name, :scopes_applied
+
+          def scope_with_applied_names name, scope_options = {}
+            name = name.to_sym
+            valid_scope_name?(name)
+            extension = Module.new(&Proc.new) if block_given?
+
+            scope_proc = lambda do |*args|
+              options = scope_options.respond_to?(:call) ? unscoped { scope_options.call(*args) } : scope_options
+              options = scoped.apply_finder_options(options) if options.is_a?(Hash)
+
+              relation = scoped.merge(options)
+              relation.scopes_applied ||= Set.new
+              relation.scopes_applied << name
+
+              extension ? relation.extending(extension) : relation
+            end
+
+            singleton_class.send(:redefine_method, name, &scope_proc)
+          end
+          alias_method_chain :scope, :applied_names
+
+        end
+      end
+    end
+  end
+else
+  require_dependency 'active_record/named_scope'
+
+  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
@@ -12,13 +12,15 @@
  
 class Solr::Request::Dismax < Solr::Request::Standard
  
-  VALID_PARAMS.replace(VALID_PARAMS + [:tie_breaker, :query_fields, :minimum_match, :phrase_fields, :phrase_slop,
-                                       :alternate_query, :boost_query, :boost_functions])
+  VALID_PARAMS.replace VALID_PARAMS + [
+    :tie_breaker, :query_fields, :minimum_match, :phrase_fields, :phrase_slop,
+    :alternate_query, :boost_query, :boost_functions,
+  ]
  
   def initialize(params)
     super
   end
-  
+
   def to_hash
     hash = super
     hash[:defType] = 'edismax'
@@ -12,40 +12,42 @@
  
 class Solr::Request::Standard < Solr::Request::Select
  
-  VALID_PARAMS = [:query, :sort, :default_field, :operator, :start, :rows, :shards, :date_facets,
-    :filter_queries, :field_list, :debug_query, :explain_other, :facets, :highlighting, :mlt, :radius, 
-    :radius, :latitude, :longitude, :spellcheck]
-  
+  VALID_PARAMS = [
+    :query, :sort, :default_field, :operator, :start, :rows, :shards, :date_facets,
+    :filter_queries, :field_list, :debug_query, :explain_other, :facets, :highlighting, :mlt, :radius,
+    :radius, :latitude, :longitude, :spellcheck,
+  ]
+
   def initialize(params)
     super 'search'
-    
-    raise "Invalid parameters: #{(params.keys - VALID_PARAMS).join(',')}" unless 
+
+    raise "Invalid parameters: #{(params.keys - VALID_PARAMS).join(',')}" unless
       (params.keys - VALID_PARAMS).empty?
-    
+
     raise ":query parameter required" unless params[:query]
-    
+
     @params = params.dup
-    
+
     # Validate operator
     if params[:operator]
-      raise "Only :and/:or operators allowed" unless 
+      raise "Only :and/:or operators allowed" unless
         [:and, :or].include?(params[:operator])
-        
+
       @params[:operator] = params[:operator].to_s.upcase
     end
  
     # Validate start, rows can be transformed to ints
     @params[:start] = params[:start].to_i if params[:start]
     @params[:rows] = params[:rows].to_i if params[:rows]
-    
+
     @params[:field_list] ||= ["*","score"]
-    
+
     @params[:shards] ||= []
   end
-  
+
   def to_hash
     hash = {}
-    
+
     # standard request param processing
     hash[:sort] = @params[:sort]
     hash[:q] = @params[:query]
@@ -61,11 +63,11 @@ class Solr::Request::Standard &lt; Solr::Request::Select
     hash[:debugQuery] = @params[:debug_query]
     hash[:explainOther] = @params[:explain_other]
     hash[:shards] = @params[:shards].join(',') unless @params[:shards].empty?
-    
+
     hash[:sfield] = 'latlng'
     hash[:d] = @params[:radius]
     hash[:pt] = "#{@params[:latitude]}, #{@params[:longitude]}" if @params[:latitude] and @params[:longitude]
-    
+
     # facet parameter processing
     if @params[:facets]
       # TODO need validation of all that is under the :facets Hash too
@@ -95,7 +97,7 @@ class Solr::Request::Standard &lt; Solr::Request::Select
           end
         end
       end
-      
+
       if @params[:date_facets]
         hash["facet.date"] = []
         if @params[:date_facets][:fields]
@@ -125,7 +127,7 @@ class Solr::Request::Standard &lt; Solr::Request::Select
         end
       end
     end
-    
+
     # highlighting parameter processing - http://wiki.apache.org/solr/HighlightingParameters
     if @params[:highlighting]
       hash[:hl] = true
@@ -385,7 +387,7 @@ class Solr::Request::Standard &lt; Solr::Request::Select
       end
  
     end
-    
+
     if @params[:mlt]
       hash[:mlt] = true
       hash["mlt.count"] = @params[:mlt][:count]
@@ -398,10 +400,10 @@ class Solr::Request::Standard &lt; Solr::Request::Select
       hash["mlt.maxntp"] = @params[:mlt][:max_tokens_parsed]
       hash["mlt.boost"] = @params[:mlt][:boost]
     end
-    
+
     hash[:spellcheck] = true
     hash['spellcheck.collate'] = true
-    
+
     hash.merge(super.to_hash)
   end
  
@@ -14,13 +14,14 @@ class Solr::Response::Ruby &lt; Solr::Response::Base
   attr_reader :data, :header
  
   def initialize(ruby_code)
+    ruby_code.force_encoding('UTF-8') if RUBY_VERSION >= '1.9'
     super
     begin
       #TODO: what about pulling up data/header/response to ResponseBase,
       #      or maybe a new middle class like SelectResponseBase since
       #      all Select queries return this same sort of stuff??
       #      XML (&wt=xml) and Ruby (&wt=ruby) responses contain exactly the same structure.
-      #      a goal of solrb is to make it irrelevant which gets used under the hood, 
+      #      a goal of solrb is to make it irrelevant which gets used under the hood,
       #      but favor Ruby responses.
       @data = eval(ruby_code)
       @header = @data['responseHeader']
@@ -38,5 +39,5 @@ class Solr::Response::Ruby &lt; Solr::Response::Base
   def query_time
     @header['QTime']
   end
-  
+
 end
@@ -18,7 +18,7 @@ class Solr::Response::Xml &lt; Solr::Response::Base
     # parse the xml
     @doc = REXML::Document.new(xml)
  
-    # look for the result code and string 
+    # look for the result code and string
     # <?xml version="1.0" encoding="UTF-8"?>
     # <response>
     # <lst name="responseHeader"><int name="status">0</int><int name="QTime">2</int></lst>
@@ -5,12 +5,12 @@ namespace :db do
       begin
         ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "*:*"))
         ActsAsSolr::Post.execute(Solr::Request::Commit.new)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|    
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
           ActsAsSolr::SolrFixtures.load(File.basename(fixture_file, '.*'))
-        end 
-        puts "The fixtures loaded have been added to Solr"       
+        end
+        puts "The fixtures loaded have been added to Solr"
       rescue
       end
     end
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,15 @@
+begin
+  require 'jeweler'
+rescue LoadError
+end
+
+Jeweler::Tasks.new do |s|
+  s.name = "acts_as_solr_reloaded"
+  s.summary = "This gem adds full text search capabilities and many other nifty features from Apache Solr to any Rails model."
+  s.email = "dc.rec1@gmail.com"
+  s.homepage = "http://github.com/dcrec1/acts_as_solr_reloaded"
+  s.description = "This gem adds full text search capabilities and many other nifty features from Apache Solr to any Rails model."
+  s.authors = ["Diego Carrion"]
+  s.files =  FileList["[A-Z]*", "{bin,generators,config,lib,solr}/**/*"] +
+    FileList["test/**/*"].reject {|f| f.include?("test/log")}.reject {|f| f.include?("test/tmp")}
+end if defined? Jeweler
@@ -0,0 +1,10 @@
+require 'rake/testtask'
+require 'rdoc/task'
+
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_dir = "rdoc"
+  rd.rdoc_files.exclude("lib/solr/**/*.rb", "lib/solr.rb")
+  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+end
+
@@ -158,7 +158,7 @@ namespace :solr do
  
     logger = ActiveRecord::Base.logger = Logger.new(STDOUT)
     logger.level = ActiveSupport::BufferedLogger::INFO unless debug_output
-    Dir["#{RAILS_ROOT}/app/models/*.rb"].each{ |file| require file }
+    Dir["#{Rails.root}/app/models/*.rb"].each{ |file| require file }
  
     if start_server
       puts "Starting Solr server..."
@@ -1,5 +0,0 @@
-namespace :test do
-  task :migrate do
-    ActiveRecord::Migrator.migrate("test/db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-  end
-end
@@ -57,11 +57,9 @@
     <fieldType name="text"     class="solr.TextField" autoGeneratePhraseQueries="false">
       <analyzer type="index">
         <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-
         <filter class="solr.ASCIIFoldingFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
         <filter class="solr.StopFilterFactory" words="stopwords.pt.txt" />
  
         <!-- stemming
@@ -73,18 +71,12 @@
         <filter class="solr.HunspellStemFilterFactory" dictionary="en_US.dic" affix="en_US.aff" ignoreCase="true" />
         <filter class="solr.HunspellStemFilterFactory" dictionary="pt_PT.dic" affix="pt_PT.aff" ignoreCase="true" />
         -->
-
-        <!-- improvised stemming
-        <filter class="solr.EdgeNGramFilterFactory" minGramSize="3" maxGramSize="20" side="front"/>
-        -->
       </analyzer>
       <analyzer type="query">
         <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-
         <filter class="solr.ASCIIFoldingFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
         <filter class="solr.StopFilterFactory" words="stopwords.pt.txt" />
  
         <!-- stemming
@@ -96,10 +88,23 @@
         <filter class="solr.HunspellStemFilterFactory" dictionary="en_US.dic" affix="en_US.aff" ignoreCase="true" />
         <filter class="solr.HunspellStemFilterFactory" dictionary="pt_PT.dic" affix="pt_PT.aff" ignoreCase="true" />
         -->
+      </analyzer>
+    </fieldType>
  
-        <!-- improvised stemming
-        <filter class="solr.EdgeNGramFilterFactory" minGramSize="3" maxGramSize="20" side="front"/>
-        -->
+    <fieldType name="ngramText" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.ASCIIFoldingFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+
+        <filter class="solr.EdgeNGramFilterFactory" minGramSize="1" maxGramSize="20" side="front"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.ASCIIFoldingFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
     </fieldType>
  
@@ -151,6 +156,7 @@
    <dynamicField name="*sortable_do"        type="sdouble"   indexed="true"  stored="false" multiValued="false"/>
  
    <dynamicField name="*_t"                 type="text"      indexed="true"  stored="true"  multiValued="true"/>
+   <dynamicField name="*_nt"                type="ngramText" indexed="true"  stored="true"  multiValued="true"/>
    <dynamicField name="*_s"                 type="text"      indexed="true"  stored="true"  multiValued="false"/>
    <dynamicField name="*_i"                 type="integer"   indexed="true"  stored="false" multiValued="true"/>
    <dynamicField name="*_f"                 type="float"     indexed="true"  stored="true"  multiValued="false"/>
@@ -168,6 +174,7 @@
    <field        name="geo_distance"        type="sdouble"/> <!-- Optional but used for distributed searching -->
  
    <field        name="text"                type="text"      indexed="true"  stored="false" multiValued="true"/>
+   <field        name="ngramText"           type="ngramText" indexed="true"  stored="false" multiValued="true"/>
    <field        name="spell"               type="textSpell" indexed="true"  stored="true"  multiValued="true"/>
  
    <dynamicField name="*_s_mv"              type="string"    indexed="true"  stored="false" multiValued="true"/>
@@ -187,6 +194,10 @@
  <copyField source="*_do"    dest="text"/>
  <copyField source="*_facet" dest="text"/>
  
+ <copyField source="*_s"     dest="ngramText"/>
+ <copyField source="*_t"     dest="ngramText"/>
+ <copyField source="*_nt"    dest="ngramText"/>
+
  <copyField source="*_s"     dest="spell"/>
  <copyField source="*_t"     dest="spell"/>
  <copyField source="*_facet" dest="spell"/>
@@ -2,5 +2,4 @@ require &#39;rubygems&#39;
 require 'rake'
 dir = File.dirname(__FILE__)
 $:.unshift("#{dir}/lib")
-RAILS_ROOT = dir
 require "acts_as_solr/tasks"
@@ -0,0 +1,9 @@
+home:
+  id: 1
+  longitude: -77.4027
+  latitude: 39.36
+  
+work:
+  id: 2
+  longitude: -77.4027
+  latitude: 38.36
@@ -16,7 +16,7 @@ require &#39;mongo_mapper&#39;
  
 class Rails
   def self.root
-    RAILS_ROOT
+    Rails.root
   end
  
   def self.env
@@ -26,13 +26,14 @@ end
  
 MongoMapper.database = "acts_as_solr_reloaded-test"
  
-RAILS_ROOT = File.dirname(__FILE__) unless defined? RAILS_ROOT
-RAILS_ENV  = 'test' unless defined? RAILS_ENV
+RAILS_ENV = 'test' unless defined? RAILS_ENV
 ENV["RAILS_ENV"] = "test"
  
 require File.expand_path(File.dirname(__FILE__) + '/../config/solr_environment')
 require File.expand_path(File.dirname(__FILE__) + '/../lib/acts_as_solr')
  
+ActiveRecord::Base.logger = Logger.new('/dev/null')
+
 # Load Models
 models_dir = File.join(File.dirname( __FILE__ ), 'models')
 require "#{models_dir}/book.rb"
@@ -60,10 +61,10 @@ class Test::Unit::TestCase
       klass = instance_eval table_name.to_s.capitalize.singularize
       klass.find(:all).each{|content| content.solr_save}
     end
-    
+
     clear_from_solr(:novels)
   end
-  
+
   private
   def self.clear_from_solr(table_name)
     ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "type_s:#{table_name.to_s.capitalize.singularize}"))
1	1	--ignore-dir=log
2	2	--ignore-dir=tmp
3	3	--ignore-dir=pkg
	4	+--ignore-dir=public/javascripts/cache
	5	+--ignore-dir=public/stylesheets/cache
...	...
...	...	@@ -41,6 +41,7 @@ Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
41	41	Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
42	42	Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
43	43	Ana Losnak <analosnak@gmail.com>
	44	+Andre Bernardes <andrebsguedes@gmail.com>
44	45	Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
45	46	Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
46	47	Antonio Terceiro <terceiro@colivre.coop.br>
...	...	@@ -132,6 +133,7 @@ Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
132	133	Gabriela Navarro <navarro1703@gmail.com>
133	134	Grazieno Pellegrino <grazieno@gmail.com>
134	135	Gust <darksshades@hotmail.com>
	136	+Hebert Douglas <hebertdougl@gmail.com>
135	137	Hugo Melo <hugo@riseup.net>
136	138	Isaac Canan <isaac@intelletto.com.br>
137	139	Italo Valcy <italo@dcc.ufba.br>
...	...	@@ -230,6 +232,8 @@ Rodrigo Souto <rodrigo@colivre.coop.br>
230	232	Ronny Kursawe <kursawe.ronny@googlemail.com>
231	233	root <root@debian.sdr.serpro>
232	234	Samuel R. C. Vale <srcvale@holoscopio.com>
	235	+Tallys Martins <tallysmartins@gmail.com>
	236	+tallys <tallys@tallys.(none)>
233	237	Valessio Brito <contato@valessiobrito.com.br>
234	238	Valessio Brito <contato@valessiobrito.info>
235	239	Valessio Brito <valessio@gmail.com>
...	...
1	1	source "https://rubygems.org"
2		-gem 'rails'
3		-gem 'fast_gettext'
4		-gem 'acts-as-taggable-on'
5		-gem 'prototype-rails'
6		-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
7		-gem 'rails_autolink'
8		-gem 'pg'
9		-gem 'rmagick'
10		-gem 'RedCloth'
11		-gem 'will_paginate'
12		-gem 'ruby-feedparser'
13		-gem 'daemons'
14		-gem 'thin'
15		-gem 'hpricot'
16		-gem 'nokogiri'
	2	+gem 'rails', '~> 3.2.19'
	3	+gem 'fast_gettext', '~> 0.6.8'
	4	+gem 'acts-as-taggable-on', '~> 3.0.2'
	5	+gem 'prototype-rails', '~> 3.2.1'
	6	+gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
	7	+gem 'rails_autolink', '~> 1.1.5'
	8	+gem 'pg', '~> 0.13.2'
	9	+gem 'rmagick', '~> 2.13.1'
	10	+gem 'RedCloth', '~> 4.2.9'
	11	+gem 'will_paginate', '~> 3.0.3'
	12	+gem 'ruby-feedparser', '~> 0.7'
	13	+gem 'daemons', '~> 1.1.5'
	14	+gem 'thin', '~> 1.3.1'
	15	+gem 'hpricot', '~> 0.8.6'
	16	+gem 'nokogiri', '~> 1.5.5'
17	17	gem 'rake', :require => false
18		-gem 'rest-client'
19		-gem 'exception_notification'
	18	+gem 'rest-client', '~> 1.6.7'
	19	+gem 'exception_notification', '~> 4.0.1'
	20	+gem 'gettext', '~> 2.2.1', :require => false, :group => :development
20	21
21	22	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
22	23	# with their GEM names (not the Debian package names)
23	24
24	25	group :production do
25		- gem 'dalli'
	26	+ gem 'dalli', '~> 2.7.0'
26	27	end
27	28
28	29	group :test do
29		- gem 'rspec'
30		- gem 'rspec-rails'
31		- gem 'mocha', :require => false
	30	+ gem 'rspec', '~> 2.10.0'
	31	+ gem 'rspec-rails', '~> 2.10.1'
	32	+ gem 'mocha', '~> 1.1.0', :require => false
32	33	end
33	34
34	35	group :cucumber do
35		- gem 'cucumber-rails', :require => false
36		- gem 'capybara'
37		- gem 'cucumber'
38		- gem 'database_cleaner'
39		- gem 'selenium-webdriver'
	36	+ gem 'cucumber-rails', '~> 1.0.6', :require => false
	37	+ gem 'capybara', '~> 2.1.0'
	38	+ gem 'cucumber', '~> 1.0.6'
	39	+ gem 'database_cleaner', '~> 1.2.0'
	40	+ gem 'selenium-webdriver', '~> 2.39.0'
40	41	end
41	42
42	43	# include plugin gemfiles
...	...
...	...	@@ -1,191 +0,0 @@
1		-PATH
2		- remote: vendor/prototype_legacy_helper
3		- specs:
4		- prototype_legacy_helper (0.0.0)
5		-
6		-GEM
7		- remote: https://rubygems.org/
8		- specs:
9		- RedCloth (4.2.9)
10		- actionmailer (3.2.6)
11		- actionpack (= 3.2.6)
12		- mail (~> 2.4.4)
13		- actionpack (3.2.6)
14		- activemodel (= 3.2.6)
15		- activesupport (= 3.2.6)
16		- builder (~> 3.0.0)
17		- erubis (~> 2.7.0)
18		- journey (~> 1.0.1)
19		- rack (~> 1.4.0)
20		- rack-cache (~> 1.2)
21		- rack-test (~> 0.6.1)
22		- sprockets (~> 2.1.3)
23		- activemodel (3.2.6)
24		- activesupport (= 3.2.6)
25		- builder (~> 3.0.0)
26		- activerecord (3.2.6)
27		- activemodel (= 3.2.6)
28		- activesupport (= 3.2.6)
29		- arel (~> 3.0.2)
30		- tzinfo (~> 0.3.29)
31		- activeresource (3.2.6)
32		- activemodel (= 3.2.6)
33		- activesupport (= 3.2.6)
34		- activesupport (3.2.6)
35		- i18n (~> 0.6)
36		- multi_json (~> 1.0)
37		- acts-as-taggable-on (3.0.2)
38		- rails (>= 3, < 5)
39		- arel (3.0.2)
40		- builder (3.0.0)
41		- capybara (2.1.0)
42		- mime-types (>= 1.16)
43		- nokogiri (>= 1.3.3)
44		- rack (>= 1.0.0)
45		- rack-test (>= 0.5.4)
46		- xpath (~> 2.0)
47		- childprocess (0.3.3)
48		- ffi (~> 1.0.6)
49		- cucumber (1.0.6)
50		- builder (>= 2.1.2)
51		- diff-lcs (>= 1.1.2)
52		- gherkin (~> 2.4.18)
53		- json (>= 1.4.6)
54		- term-ansicolor (>= 1.0.6)
55		- cucumber-rails (1.0.6)
56		- capybara (>= 1.1.1)
57		- cucumber (>= 1.0.6)
58		- nokogiri (>= 1.5.0)
59		- daemons (1.1.5)
60		- dalli (2.7.0)
61		- database_cleaner (1.2.0)
62		- diff-lcs (1.1.3)
63		- erubis (2.7.0)
64		- eventmachine (0.12.10)
65		- exception_notification (4.0.1)
66		- actionmailer (>= 3.0.4)
67		- activesupport (>= 3.0.4)
68		- fast_gettext (0.6.8)
69		- ffi (1.0.11)
70		- gherkin (2.4.21)
71		- json (>= 1.4.6)
72		- hike (1.2.1)
73		- hpricot (0.8.6)
74		- i18n (0.6.0)
75		- journey (1.0.3)
76		- json (1.7.3)
77		- mail (2.4.4)
78		- i18n (>= 0.4.0)
79		- mime-types (~> 1.16)
80		- treetop (~> 1.4.8)
81		- metaclass (0.0.1)
82		- mime-types (1.19)
83		- mocha (0.11.3)
84		- metaclass (~> 0.0.1)
85		- multi_json (1.3.6)
86		- nokogiri (1.5.5)
87		- pg (0.13.2)
88		- polyglot (0.3.3)
89		- prototype-rails (3.2.1)
90		- rails (~> 3.2)
91		- rack (1.4.1)
92		- rack-cache (1.2)
93		- rack (>= 0.4)
94		- rack-ssl (1.3.2)
95		- rack
96		- rack-test (0.6.1)
97		- rack (>= 1.0)
98		- rails (3.2.6)
99		- actionmailer (= 3.2.6)
100		- actionpack (= 3.2.6)
101		- activerecord (= 3.2.6)
102		- activeresource (= 3.2.6)
103		- activesupport (= 3.2.6)
104		- bundler (~> 1.0)
105		- railties (= 3.2.6)
106		- rails_autolink (1.1.5)
107		- rails (> 3.1)
108		- railties (3.2.6)
109		- actionpack (= 3.2.6)
110		- activesupport (= 3.2.6)
111		- rack-ssl (~> 1.3.2)
112		- rake (>= 0.8.7)
113		- rdoc (~> 3.4)
114		- thor (>= 0.14.6, < 2.0)
115		- rake (0.9.2.2)
116		- rdoc (3.9.4)
117		- rest-client (1.6.7)
118		- mime-types (>= 1.16)
119		- rmagick (2.13.1)
120		- rspec (2.10.0)
121		- rspec-core (~> 2.10.0)
122		- rspec-expectations (~> 2.10.0)
123		- rspec-mocks (~> 2.10.0)
124		- rspec-core (2.10.1)
125		- rspec-expectations (2.10.0)
126		- diff-lcs (~> 1.1.3)
127		- rspec-mocks (2.10.1)
128		- rspec-rails (2.10.1)
129		- actionpack (>= 3.0)
130		- activesupport (>= 3.0)
131		- railties (>= 3.0)
132		- rspec (~> 2.10.0)
133		- ruby-feedparser (0.7)
134		- rubyzip (1.1.2)
135		- selenium-webdriver (2.39.0)
136		- childprocess (>= 0.2.5)
137		- multi_json (~> 1.0)
138		- rubyzip (~> 1.0)
139		- websocket (~> 1.0.4)
140		- sprockets (2.1.3)
141		- hike (~> 1.2)
142		- multi_json (~> 1.0)
143		- rack (~> 1.0)
144		- tilt (~> 1.1, != 1.3.0)
145		- term-ansicolor (1.0.7)
146		- thin (1.3.1)
147		- daemons (>= 1.0.9)
148		- eventmachine (>= 0.12.6)
149		- rack (>= 1.0.0)
150		- thor (0.15.3)
151		- tilt (1.3.3)
152		- treetop (1.4.10)
153		- polyglot
154		- polyglot (>= 0.3.1)
155		- tzinfo (0.3.33)
156		- websocket (1.0.7)
157		- will_paginate (3.0.3)
158		- xpath (2.0.0)
159		- nokogiri (~> 1.3)
160		-
161		-PLATFORMS
162		- ruby
163		-
164		-DEPENDENCIES
165		- RedCloth
166		- acts-as-taggable-on
167		- capybara
168		- cucumber
169		- cucumber-rails
170		- daemons
171		- dalli
172		- database_cleaner
173		- exception_notification
174		- fast_gettext
175		- hpricot
176		- mocha
177		- nokogiri
178		- pg
179		- prototype-rails
180		- prototype_legacy_helper (= 0.0.0)!
181		- rails
182		- rails_autolink
183		- rake
184		- rest-client
185		- rmagick
186		- rspec
187		- rspec-rails
188		- ruby-feedparser
189		- selenium-webdriver
190		- thin
191		- will_paginate
...	...	@@ -6,3 +6,13 @@
6	6	require File.expand_path('../config/application', __FILE__)
7	7
8	8	Noosfero::Application.load_tasks
	9	+
	10	+[
	11	+ "baseplugins//{tasks,lib/tasks,rails/tasks}//.rake",
	12	+ "config/plugins//{tasks,lib/tasks,rails/tasks}//.rake",
	13	+ "config/plugins//vendor/plugins//{tasks,lib/tasks,rails/tasks}/*/.rake",
	14	+].map do \|pattern\|
	15	+ Dir.glob(pattern).sort
	16	+end.flatten.each do \|taskfile\|
	17	+ load taskfile
	18	+end
...	...
...	...	@@ -3,7 +3,7 @@
3	3
4	4	VAGRANTFILE_API_VERSION = "2"
5	5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
6		- config.vm.box = "debian-wheezy"
	6	+ config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
7	7	config.vm.network :forwarded_port, host: 3000, guest: 3000
8	8	config.vm.provision :shell do \|shell\|
9	9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'
...	...
...	...	@@ -3,9 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
3	3	protect 'edit_environment_design', :environment
4	4
5	5	def available_blocks
6		- # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
7		- # the Noosfero core soon, see ActionItem3045
8		- @available_blocks \|\|= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
	6	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
9	7	@available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
10	8	end
11	9
...	...
...	...	@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
8	8	before_filter :init_noosfero_plugins
9	9	before_filter :allow_cross_domain_access
10	10	before_filter :login_required, :if => :private_environment?
11		- before_filter :verify_members_whitelist, :if => :user
	11	+ before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
12	12
13	13	def verify_members_whitelist
14	14	render_access_denied unless user.is_admin? \|\| environment.in_whitelist?(user)
...	...	@@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base
40	40
41	41	theme_layout = theme_option(:layout)
42	42	if theme_layout
43		- theme_view_file('layouts/'+theme_layout) \|\| theme_layout
	43	+ (theme_view_file('layouts/'+theme_layout) \|\| theme_layout).to_s
44	44	else
45	45	'application'
46	46	end
...	...
...	...	@@ -4,6 +4,12 @@ class CmsController < MyProfileController
4	4
5	5	include ArticleHelper
6	6
	7	+ def search_tags
	8	+ arg = params[:term].downcase
	9	+ result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
	10	+ render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
	11	+ end
	12	+
7	13	def self.protect_if(*args)
8	14	before_filter(*args) do \|c\|
9	15	user, profile = c.send(:user), c.send(:profile)
...	...	@@ -221,7 +227,7 @@ class CmsController < MyProfileController
221	227	@article = profile.articles.find(params[:id])
222	228	if request.post?
223	229	@article.destroy
224		- session[:notice] = _("\"#{@article.name}\" was removed.")
	230	+ session[:notice] = _("\"%s\" was removed." % @article.name)
225	231	referer = Rails.application.routes.recognize_path URI.parse(request.referer).path rescue nil
226	232	if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
227	233	redirect_to referer
...	...
...	...	@@ -20,7 +20,7 @@ class FriendsController < MyProfileController
20	20
21	21	class << self
22	22	def per_page
23		- 10
	23	+ 12
24	24	end
25	25	end
26	26	def per_page
...	...