fix merge conflit

Leandro Santos
2 parents 62acc5f2 98bbf65c
Showing 278 changed files with 9373 additions and 2046 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
Gemfile
HACKING.md
app/api/entities.rb
app/api/helpers.rb
app/api/v1/communities.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/profile_editor_helper.rb
app/helpers/tags_helper.rb
app/helpers/tinymce_helper.rb
app/helpers/token_helper.rb
app/jobs/notify_activity_to_profiles_job.rb
app/models/article.rb
app/models/circle.rb
app/models/event.rb
@@ -59,18 +59,18 @@ selenium-6:
 # NOOSFERO_BUNDLE_OPTS=install makes migrations fails
 # probably because of rubygems-integration
 plugins-1:
-  script: SLICE=1/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=1/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-2:
-  script: SLICE=2/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=2/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-3:
-  script: SLICE=3/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=3/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-4:
-  script: SLICE=4/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=4/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-5:
-  script: SLICE=5/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=5/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
  
@@ -19,6 +19,10 @@ language: ruby
 rvm:
   - 2.3.1
  
+services:
+  - postgresql
+  - elasticsearch
+
 addons:
   apt:
     packages:
@@ -84,7 +84,7 @@ group :cucumber do
   gem 'cucumber'
   gem 'cucumber-rails',         '~> 1.4.2', :require => false
   gem 'database_cleaner',       '~> 1.3'
-  gem 'selenium-webdriver',     '>= 2.50'
+  gem 'selenium-webdriver',     '>= 2.53'
   gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'
 end
  
@@ -31,7 +31,7 @@ If you want to use a different port than 3000, pass `-p &lt;PORT&gt;` to `./script/dev
 Instructions for other systems
 ------------------------------
  
-On other OS, you have 2 options:
+On other OS, you have many options:
  
 ### 1) using a chroot or a VM with Debian stable (easier)
  
@@ -45,6 +45,14 @@ You can check `./script/install-dependencies/debian-squeeze.sh` to have an idea 
  
 If you write such script for your own OS, *please* share it with us at the development mailing list so that we can include it in the official repository. This way other people using the same OS will have to put less effort to develop Noosfero.
  
+### 3) Installing dependencies via Rubygems and RVM
+
+To setup the development environment through Rubygems you just need to install some basic deps and then install the gems defined on the Gemfile. Further instructions can be found on: http://noosfero.org/bin/view/Development/DepsWithRVMAndGems
+
+### 4) Using a docker image
+
+Use a docker image to run an out-of-the-box development environment. Further information can be found on: https://hub.docker.com/r/noosfero/dev-rails4/
+
 Submitting your changes back
 ----------------------------
  
@@ -38,6 +38,13 @@ module Api
       PERMISSIONS[current_permission] <= PERMISSIONS[permission]
     end
  
+    def self.expose_optional_field?(field, options = {})
+      return false if options[:params].nil? 
+      optional_fields = options[:params][:optional_fields] || []
+      optional_fields.include?(field.to_s)
+    end
+
+
     class Image < Entity
       root 'images', 'image'
  
@@ -166,7 +173,8 @@ module Api
         community.admins.map{|admin| {"name"=>admin.name, "id"=>admin.id, "username" => admin.identifier}}
       end
       expose :categories, :using => Category
-      expose :members, :using => Person , :if => lambda{ |community, options| community.display_info_to? options[:current_person] }
+      expose :members_count
+      expose :members, :if => lambda {|community, options| Entities.expose_optional_field?(:members, options)}
     end
  
     class CommentBase < Entity
@@ -213,7 +221,7 @@ module Api
       expose :comments_count
       expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
       expose :type
-      expose :comments, using: CommentBase, :if => lambda{|obj,opt| opt[:params] && ['1','true',true].include?(opt[:params][:show_comments])}
+      expose :comments, using: CommentBase, :if => lambda{|comment,options| Entities.expose_optional_field?(:comments, options)}
       expose :published
       expose :accept_comments?, as: :accept_comments
     end
@@ -57,9 +57,11 @@ module Api
     def present_partial(model, options)
       if(params[:fields].present?)
         begin
-          fields = JSON.parse(params[:fields])
+          fields = JSON.parse((params.to_hash[:fields] || params.to_hash['fields']).to_json)
           if fields.present?
-            options.merge!(fields.symbolize_keys.slice(:only, :except))
+            fields = fields.symbolize_keys
+            options.merge!(:only => fields[:only]) if fields[:only].present?
+            options.merge!(:except => fields[:except]) if fields[:except].present?
           end
         rescue
           fields = params[:fields]
@@ -116,7 +118,7 @@ module Api
     def post_article(asset, params)
       return forbidden! unless current_person.can_post_content?(asset)
  
-      klass_type = params[:content_type] || params[:article].delete(:type) || TinyMceArticle.name
+      klass_type = params[:content_type] || params[:article].delete(:type) || TextArticle.name
       return forbidden! unless klass_type.constantize <= Article
  
       article = klass_type.constantize.new(params[:article])
@@ -503,11 +505,9 @@ module Api
  
     def parse_content_type(content_type)
       return nil if content_type.blank?
-      content_types = content_type.split(',').map do |content_type|
-        content_type = content_type.camelcase
-        content_type == 'TextArticle' ? Article.text_article_types : content_type
+      content_type.split(',').map do |content_type|
+        content_type.camelcase
       end
-      content_types.flatten.uniq
     end
  
     def period(from_date, until_date)
@@ -18,7 +18,7 @@ module Api
           communities = select_filtered_collection_of(environment, 'communities', params)
           communities = profiles_for_person(communities, current_person)
           communities = communities.by_location(params) # Must be the last. May return Exception obj
-          present communities, :with => Entities::Community, :current_person => current_person
+          present communities, :with => Entities::Community, :current_person => current_person, :params => params
         end
  
  
@@ -49,7 +49,7 @@ module Api
  
         get ':id' do
           community = profiles_for_person(environment.communities, current_person).find_by_id(params[:id])
-          present community, :with => Entities::Community, :current_person => current_person
+          present community, :with => Entities::Community, :current_person => current_person, :params => params
         end
  
       end
@@ -151,6 +151,7 @@ class CmsController &lt; MyProfileController
  
     @article.profile = profile
     @article.author = user
+    @article.editor = current_person.editor
     @article.last_changed_by = user
     @article.created_by = user
  
@@ -399,8 +400,7 @@ class CmsController &lt; MyProfileController
  
   def available_article_types
     articles = [
-      TinyMceArticle,
-      TextileArticle,
+      TextArticle,
       Event
     ]
     articles += special_article_types if params && params[:cms]
@@ -408,9 +408,6 @@ class CmsController &lt; MyProfileController
     if @parent && @parent.blog?
       articles -= Article.folder_types.map(&:constantize)
     end
-    if user.is_admin?(profile.environment)
-      articles << RawHTMLArticle
-    end
     articles
   end
  
@@ -95,7 +95,7 @@ class ProfileEditorController &lt; MyProfileController
   end
  
   def welcome_page
-    @welcome_page = profile.welcome_page || TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
+    @welcome_page = profile.welcome_page || TextArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
     if request.post?
       begin
         @welcome_page.update!(params[:welcome_page])
@@ -19,6 +19,11 @@ class ProfileController &lt; PublicController
       @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
       @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
     end
+
+    # TODO Find a way to filter these through sql
+    @network_activities = filter_private_scraps(@network_activities)
+    @activities = filter_private_scraps(@activities)
+
     @tags = profile.article_tags
     allow_access_to_page
   end
@@ -231,6 +236,7 @@ class ProfileController &lt; PublicController
     @scrap = Scrap.new(params[:scrap])
     @scrap.sender= sender
     @scrap.receiver= receiver
+    @scrap.marked_people = treat_followed_entries(params[:filter_followed])
     @tab_action = params[:tab_action]
     @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
     activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
@@ -253,6 +259,14 @@ class ProfileController &lt; PublicController
     end
   end
  
+  def search_followed
+    result = []
+    circles = find_by_contents(:circles, user, user.circles.where(:profile_type => 'Person'), params[:q])[:results]
+    followed = find_by_contents(:followed, user, Profile.followed_by(user), params[:q])[:results]
+    result = circles + followed
+    render :text => prepare_to_token_input_by_class(result).to_json
+  end
+
   def view_more_activities
     @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_activities_list', :locals => {:activities => @activities}
@@ -434,7 +448,6 @@ class ProfileController &lt; PublicController
     end
   end
  
-
   protected
  
   def check_access_to_profile
@@ -480,4 +493,39 @@ class ProfileController &lt; PublicController
     render_not_found unless profile.allow_followers?
   end
  
+  def treat_followed_entries(entries)
+    return [] if entries.blank? || profile != user
+
+    followed = []
+    entries.split(',').map do |entry|
+      klass, identifier = entry.split('_')
+      case klass
+      when 'Person'
+        followed << Person.find(identifier)
+      when 'Circle'
+        circle = Circle.find(identifier)
+        followed += Profile.in_circle(circle)
+      end
+    end
+    followed.uniq
+  end
+
+  def filter_private_scraps(activities)
+    activities = Array(activities)
+    activities.delete_if do |item|
+      if item.kind_of?(ProfileActivity)
+        target = item.activity
+        owner = profile
+      else
+        target = item.target
+        owner = item.user
+      end
+      !environment.admins.include?(user) &&
+      owner != user &&
+      target.is_a?(Scrap) &&
+      target.marked_people.present? &&
+      !target.marked_people.include?(user)
+    end
+    activities
+  end
 end
@@ -111,10 +111,6 @@ module ApplicationHelper
       content = capture(&block)
     end
  
-    if options[:type] == :textile
-      content = RedCloth.new(content).to_html
-    end
-
     options[:class] = '' if ! options[:class]
     options[:class] += ' button icon-help' # with-text
  
@@ -132,13 +128,6 @@ module ApplicationHelper
     text
   end
  
-  # alias for <tt>help(content, :textile)</tt>. You can pass a block in the
-  # same way you would do if you called <tt>help</tt> directly.
-  def help_textile(content = nil, link_name = nil, options = {}, &block)
-    options[:type] = :textile
-    help(content, link_name, options, &block)
-  end
-
   # TODO: do something more useful here
   # TODO: test this helper
   # TODO: add an icon?
@@ -1245,4 +1234,15 @@ module ApplicationHelper
     content.html_safe
   end
  
+  def current_editor_is?(editor)
+    editor.blank? ? false : current_editor == editor
+  end
+
+  def current_editor(mode = '')
+    editor = @article.editor || Article::Editor::TINY_MCE unless @article.nil?
+    editor ||= (current_person.nil? || current_person.editor.nil?) ? Article::Editor::TINY_MCE : current_person.editor
+    editor += '_' + mode unless mode.blank?
+    editor
+  end
+
 end
@@ -161,6 +161,10 @@ module ArticleHelper
     array.map { |object| {:label => object.name, :value => object.name} }
   end
  
+  def prepare_to_token_input_by_class(array)
+    array.map { |object| {:id => "#{object.class.name}_#{object.id || object.name}", :name => "#{object.name} (#{_(object.class.name)})", :class => object.class.name}}
+  end
+
   def cms_label_for_new_children
     _('New article')
   end
@@ -158,4 +158,8 @@ module ProfileEditorHelper
     end
   end
  
+  def select_editor(title, object, method, options)
+    labelled_form_field(title, select(object, method, current_person.available_editors.map { |k,v| [v, k] }))
+  end
+
 end
@@ -67,4 +67,17 @@ module TagsHelper
     end.join("\n").html_safe
   end
  
+  def linked_article_tags(article)
+    if @profile
+      # We are rendering a page inside a profile, so link to the profile tag search.
+      url = { :controller => 'profile', :profile => @profile.identifier, :action => 'tags' }
+      tagname_option = :id
+    else
+      # We are rendering a page outside a profile, so link to the global tag search.
+      url = { :action => 'tag' }
+      tagname_option = :tag
+    end
+    article.tags.map { |t| link_to(t, url.merge(tagname_option=>t.name) ) }.join("\n")
+  end
+
 end
@@ -18,7 +18,8 @@ module TinymceHelper
         insertdatetime media nonbreaking save table contextmenu directionality
         emoticons template paste textcolor colorpicker textpattern],
       :image_advtab => true,
-      :language => tinymce_language
+      :language => tinymce_language,
+      :selector => '.' + current_editor(options[:mode])
  
     options[:toolbar1] = toolbar1(options[:mode])
     options[:menubar] = menubar(options[:mode])
@@ -5,10 +5,11 @@ module TokenHelper
   end
  
   def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
-    options[:min_chars] ||= 3
+    options[:min_chars] ||= 2
     options[:hint_text] ||= _("Type in a search term")
     options[:no_results_text] ||= _("No results")
     options[:searching_text] ||= _("Searching...")
+    options[:placeholder] ||= 'null'
     options[:search_delay] ||= 1000
     options[:prevent_duplicates] ||=  true
     options[:backspace_delete_item] ||= false
@@ -20,6 +21,9 @@ module TokenHelper
     options[:on_delete] ||= 'null'
     options[:on_ready] ||= 'null'
     options[:query_param] ||= 'q'
+    options[:theme] ||= 'null'
+    options[:results_formatter] ||= 'null'
+    options[:token_formatter] ||= 'null'
  
     result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
     result += javascript_tag("jQuery('##{element_id}')
@@ -29,6 +33,7 @@ module TokenHelper
         hintText: #{options[:hint_text].to_json},
         noResultsText: #{options[:no_results_text].to_json},
         searchingText: #{options[:searching_text].to_json},
+        placeholder: #{options[:placeholder].to_json},
         searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
@@ -39,6 +44,9 @@ module TokenHelper
         onAdd: #{options[:on_add]},
         onDelete: #{options[:on_delete]},
         onReady: #{options[:on_ready]},
+        theme: #{options[:theme] == 'null' ? options[:theme] : options[:theme].to_json},
+        resultsFormater: #{options[:results_formatter]},
+        tokenFormater: #{options[:token_formatter]},
       });
     ")
     result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
@@ -19,8 +19,13 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
     # Notify the user
     ActionTrackerNotification.create(:profile_id => tracked_action.user.id, :action_tracker_id => tracked_action.id)
  
-    # Notify all followers
-    ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
+    if target.is_a?(Scrap) && target.marked_people.present?
+      # Notify only marked people
+      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT profiles.id, #{tracked_action.id} FROM profiles WHERE profiles.id IN (#{target.marked_people.map(&:id).join(',')})")
+    else
+      # Notify all followers
+      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
+    end
  
     if tracked_action.user.is_a? Organization
       ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " +
  
 class Article < ApplicationRecord
  
+  module Editor
+    TEXTILE = 'textile'
+    TINY_MCE = 'tiny_mce'
+    RAW_HTML = 'raw_html'
+  end
+
   include SanitizeHelper
  
   attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent,
@@ -11,7 +17,7 @@ class Article &lt; ApplicationRecord
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :image_builder, :show_to_followers, :archived,
-                  :author, :display_preview, :published_at, :person_followers
+                  :author, :display_preview, :published_at, :person_followers, :editor
  
   extend ActsAsHavingImage::ClassMethods
   acts_as_having_image
@@ -518,17 +524,12 @@ class Article &lt; ApplicationRecord
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
  
-  def self.text_article_types
-    ['TextArticle', 'TextileArticle', 'TinyMceArticle']
-  end
-
   scope :published, -> { where 'articles.published = ?', true }
   scope :folders, -> profile { where 'articles.type IN (?)', profile.folder_types }
   scope :no_folders, -> profile { where 'articles.type NOT IN (?)', profile.folder_types }
   scope :galleries, -> { where "articles.type IN ('Gallery')" }
   scope :images, -> { where :is_image => true }
   scope :no_images, -> { where :is_image => false }
-  scope :text_articles, -> { where 'articles.type IN (?)', text_article_types }
   scope :files, -> { where :type => 'UploadedFile' }
   scope :with_types, -> types { where 'articles.type IN (?)', types }
  
@@ -711,10 +712,6 @@ class Article &lt; ApplicationRecord
     false
   end
  
-  def tiny_mce?
-    false
-  end
-
   def folder?
     false
   end
@@ -879,6 +876,10 @@ class Article &lt; ApplicationRecord
     true
   end
  
+  def editor?(editor)
+    self.editor == editor
+  end
+
   private
  
   def sanitize_tag_list
 class Circle < ApplicationRecord
+  SEARCHABLE_FIELDS = {
+    :name => {:label => _('Name'), :weight => 1}
+  }
+
+  _('Circle')
+
   has_many :profile_followers
   belongs_to :person
  
@@ -122,10 +122,6 @@ class Event &lt; Article
     true
   end
  
-  def tiny_mce?
-    true
-  end
-
   def notifiable?
     true
   end
@@ -25,7 +25,7 @@ class ExternalFeed &lt; ApplicationRecord
     end
     content = doc.to_s
  
-    article = TinyMceArticle.new
+    article = TextArticle.new
     article.name = title
     article.profile = blog.profile
     article.body = content
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
  
-  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles
+  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles, :editor
  
   SEARCH_FILTERS = {
     :order => %w[more_recent more_popular more_active],
@@ -124,6 +124,8 @@ class Person &lt; Profile
     where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true
   }, through: :suggested_profiles, source: :suggestion
  
+  has_and_belongs_to_many :marked_scraps, :join_table => :private_scraps, :class_name => 'Scrap'
+
   scope :more_popular, -> { order 'friends_count DESC' }
  
   scope :abusers, -> {
@@ -344,6 +346,8 @@ class Person &lt; Profile
  
   validates_associated :user
  
+  validates :editor, inclusion: { in: lambda { |p| p.available_editors } }
+
   def email
     self.user.nil? ? nil : self.user.email
   end
@@ -616,8 +620,21 @@ class Person &lt; Profile
     Profile.followed_by self
   end
  
+  def editor?(editor)
+    self.editor == editor
+  end
+
   def in_social_circle?(person)
     self.is_a_friend?(person) || super
   end
  
+  def available_editors
+    available_editors = {
+      Article::Editor::TINY_MCE => _('TinyMCE'),
+      Article::Editor::TEXTILE => _('Textile')
+    }
+    available_editors.merge!({Article::Editor::RAW_HTML => _('Raw HTML')}) if self.is_admin?
+    available_editors
+  end
+
 end
@@ -1,17 +0,0 @@
-class RawHTMLArticle < TextArticle
-
-  def self.type_name
-    _('HTML')
-  end
-
-  def self.short_description
-    _('Raw HTML text article')
-  end
-
-  def self.description
-    _('Allows HTML without filter (only for admins).')
-  end
-
-  xss_terminate :only => [  ]
-
-end
@@ -2,7 +2,7 @@ class Scrap &lt; ApplicationRecord
  
   include SanitizeHelper
  
-  attr_accessible :content, :sender_id, :receiver_id, :scrap_id
+  attr_accessible :content, :sender_id, :receiver_id, :scrap_id, :marked_people
  
   SEARCHABLE_FIELDS = {
     :content => {:label => _('Content'), :weight => 1},
@@ -19,6 +19,8 @@ class Scrap &lt; ApplicationRecord
     where profile_activities: {activity_type: 'Scrap'}
   }, foreign_key: :activity_id, dependent: :destroy
  
+  has_and_belongs_to_many :marked_people, :join_table => :private_scraps, :class_name => 'Person'
+
   after_create :create_activity
   after_update :update_activity
  
@@ -44,7 +44,7 @@ class SuggestArticle &lt; Task
       type = article[:type].constantize
       return type if type < Article
     end
-    TinyMceArticle
+    TextArticle
   end
  
   def perform
 # a base class for all text article types.
 class TextArticle < Article
  
-  xss_terminate :only => [ :name ], :on => 'validation'
+  def self.short_description
+    _('Text article')
+  end
+
+  def self.description
+    _('Text article to create user content.')
+  end
+
+  xss_terminate :only => [ :name, :body, :abstract ], :with => 'white_list', :on => 'validation', :if => lambda { |a| !a.editor?(Article::Editor::TEXTILE) && !a.editor?(Article::Editor::RAW_HTML) }
+
+  include WhiteListFilter
+  filter_iframes :abstract, :body
+  def iframe_whitelist
+    profile && profile.environment && profile.environment.trusted_sites_for_iframe
+  end
  
   def self.type_name
     _('Article')
@@ -21,6 +35,18 @@ class TextArticle &lt; Article
     true
   end
  
+  def can_display_media_panel?
+    true
+  end
+
+  def self.can_display_blocks?
+    false
+  end
+
+  def notifiable?
+    true
+  end
+
   before_save :set_relative_path
  
   def set_relative_path
@@ -43,4 +69,24 @@ class TextArticle &lt; Article
     parent && parent.kind_of?(Blog) && parent.display_preview
   end
  
+  def to_html(options ={})
+    content = super(options)
+    content = convert_textile_to_html(content) if self.editor?(Article::Editor::TEXTILE)
+    content
+  end
+
+  def lead(length = nil)
+    content = super(length)
+    content = convert_textile_to_html(content) if self.editor?(Article::Editor::TEXTILE)
+    content
+  end
+
+  protected
+
+  def convert_textile_to_html(textile)
+    converter = RedCloth.new(textile|| '')
+    converter.hard_breaks = false
+    sanitize_html(converter.to_html, :white_list)
+  end
+
 end
@@ -1,44 +0,0 @@
-class TextileArticle < TextArticle
-  include SanitizeHelper
-
-  def self.short_description
-    _('Text article with Textile markup language')
-  end
-
-  def self.description
-    _('Accessible alternative for visually impaired users.')
-  end
-
-  def to_html(options ={})
-    convert_to_html(body)
-  end
-
-  def lead(length = nil)
-    if abstract.blank?
-      super
-    else
-      convert_to_html(abstract)
-    end
-  end
-
-  def notifiable?
-    true
-  end
-
-  def can_display_media_panel?
-    true
-  end
-
-  def self.can_display_blocks?
-    false
-  end
-
-  protected
-
-  def convert_to_html(textile)
-    converter = RedCloth.new(textile|| '')
-    converter.hard_breaks = false
-    sanitize_html(converter.to_html, :white_list)
-  end
-
-end
@@ -1,37 +0,0 @@
-class TinyMceArticle < TextArticle
-
-  def self.short_description
-    _('Text article with visual editor')
-  end
-
-  def self.description
-    _('Not accessible for visually impaired users.')
-  end
-
-  xss_terminate :only => [  ]
-
-  xss_terminate :only => [ :name, :abstract, :body ], :with => 'white_list', :on => 'validation'
-
-  include WhiteListFilter
-  filter_iframes :abstract, :body
-  def iframe_whitelist
-    profile && profile.environment && profile.environment.trusted_sites_for_iframe
-  end
-
-  def notifiable?
-    true
-  end
-
-  def tiny_mce?
-    true
-  end
-
-  def can_display_media_panel?
-    true
-  end
-
-  def self.can_display_blocks?
-    false
-  end
-
-end
@@ -9,6 +9,12 @@ class UploadedFile &lt; Article
  
   attr_accessible :uploaded_data, :title
  
+  include Noosfero::Plugin::HotSpot
+
+  def environment
+    profile.environment
+  end
+
   def self.type_name
     _('File')
   end
@@ -2,4 +2,4 @@
   <%= _('This text will be shown to the user on the top of the sign up form.') %>
 </div>
  
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
 <div class='description'>
   <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %>
 </div>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
  
 <div class='description'>
   <%= _('If this content is left blank, the following page will be displayed to the user:') %>
@@ -4,4 +4,4 @@
 </div>
  
 <%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
@@ -31,4 +31,4 @@
 <%= balanced_table(fields)%>
  
 <br />
-<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
+<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => current_editor) %>
-<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => 'mceEditor' %>
+<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => current_editor %>
 <h2><%= _('Site info') %></h2>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for :environment, :url => {:action => 'site_info'} do |f| %>
  
-  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
+  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%', :class => current_editor %>
  
   <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
@@ -2,8 +2,6 @@
  
 <%= error_messages_for :environment %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for :environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
-_tiny_mce_article.html.erb
 \ No newline at end of file
+_text_article.html.erb
 \ No newline at end of file
@@ -2,8 +2,6 @@
  
 <h1><%= _('My Blog') %></h1>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
  
 <%= render :partial => 'general_fields' %>
@@ -53,7 +51,7 @@
   %>
 </div>
  
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10, :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10, :class => current_editor)) %>
  
 <div id="blog-image-builder">
   <%= f.fields_for :image_builder, @article.image do |i| %>
-<%= render :file => 'shared/tiny_mce' %>
-
-<%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 40, :style => 'width:99%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 40, :style => 'width:99%', :class => current_editor)) %>
  
 <%= required_fields_message %>
  
-<%# TODO add Textile help here %>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
  
 <%= render :partial => 'general_fields' %>
@@ -16,4 +13,4 @@
  
 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %>
  
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Information about the event:'} %>
+<%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Information about the event:'} %>
@@ -4,18 +4,16 @@
  
 <%= required_fields_message %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
  
 <%= render :partial => 'general_fields' %>
  
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :class => 'mceEditor', :cols => 64, :rows => 10)) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :class => current_editor, :cols => 64, :rows => 10)) %>
  
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Forum.posts_per_page_options)) %>
  
 <%= labelled_form_field(_('Has terms of use:'), check_box(:article, :has_terms_of_use))%>
  
 <div id="text_area_terms_of_use">
-  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => 'mceEditor',:cols => 64, :rows => 10)) %>
+  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => current_editor,:cols => 64, :rows => 10)) %>
 </div>
@@ -1,8 +0,0 @@
-<%= required_fields_message %>
-
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
-
-<%= render :partial => 'text_fields' %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-<%= render :partial => 'shared/lead_and_body' %>
@@ -0,0 +1,10 @@
+<%= required_fields_message %>
+
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
+
+<%= render :partial => 'text_fields' %>
+<%= render :partial => 'general_fields' %>
+<%= render :partial => 'translatable' %>
+
+<%= render :partial => 'shared/lead_and_body' %>
+
@@ -7,7 +7,7 @@
  
   <div class='header'><strong><%= _('Insert media') %></strong><%= button('vertical-toggle', _('Show/Hide'), '#') %></div>
  
-  <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
+  <%= render(:partial => 'textile_quick_reference') if @article.editor?(Article::Editor::TEXTILE) %>
   <div class='text-editor-sidebar-box' id='media-upload-box'>
     <div id='media-upload-form'>
       <%= form_tag({ :action => 'media_upload' }, :multipart => true) do %>
@@ -1,10 +0,0 @@
-<%= required_fields_message %>
-
-<%# TODO add Textile help here %>
-
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
-
-<%= render :partial => 'text_fields' %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-<%= render :partial => 'shared/lead_and_body' %>
@@ -1,12 +0,0 @@
-<%= required_fields_message %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<div>
-  <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
-
-  <%= render :partial => 'text_fields' %>
-  <%= render :partial => 'general_fields' %>
-  <%= render :partial => 'translatable' %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
-</div>
@@ -2,8 +2,6 @@
  
 <%= required_fields_message %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for 'task' do |f| %>
  
   <%= required labelled_form_field(_('Title'), text_field('task[article]', 'name', :size => 50)) %>
@@ -17,7 +15,7 @@
     <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
   <% end %>
  
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => 'task[article]'} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:object => 'task[article]'} %>
  
   <%= hidden_field_tag('back_to', @back_to) %>
  
@@ -25,8 +25,7 @@
  
   <%= required f.text_field(:subject) %>
  
-  <%= render :file => 'shared/tiny_mce' %>
-  <%= required f.text_area(:message, :class => 'mceEditor') %>
+  <%= required f.text_area(:message, :class => current_editor) %>
  
   <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
  
@@ -19,8 +19,7 @@
         <%= @template_params_allowed %>
       </div>
     </div>
-    <%= render :file => 'shared/tiny_mce' %>
-    <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+    <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => current_editor)) %>
   </div>
  
   <div class="actions">
@@ -35,6 +35,9 @@
       noosfero.profile = <%= (@profile.identifier if @profile).to_json.html_safe %>
     </script>
  
+    <% if current_editor_is?(Article::Editor::TINY_MCE) %>
+      <%= render :file => 'shared/tiny_mce' %>
+    <% end %>
   </head>
   <body class="<%= h body_classes %>">
     <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "jQuery('#leave_scrap_content').val('')", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
-    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2, :class => 'autogrow' %>
+  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "jQuery('#leave_scrap_content').val(''); jQuery('#filter-followed').tokenInput('clear')", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
+    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :rows => 2, :class => 'autogrow' %>
+    <% if profile == user %>
+      <%= token_input_field_tag(:filter_followed, 'filter-followed', {:action => 'search_followed'}, {:theme => 'facebook', :placeholder => _('Filter followed, friends or group of friends to send them a private scrap...')}) %>
+    <% end %>
     <%= submit_button :new, _('Share') %>
   <% end %>
 </div>
@@ -22,8 +22,7 @@
  
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
  
-  <%= render :file => 'shared/tiny_mce' %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'body ' + current_editor)) %>
  
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :back %>
@@ -16,6 +16,8 @@
     </div>
   </div>
  
+  <%= select_editor(_('Editor'), 'profile_data', 'editor', {}) %>
+
   <%= safe_join(@plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_exec(&content) }, "") %>
  
   <div class="formfieldline">
-<%= render :file => 'shared/tiny_mce' %>
-
 <h1><%= _('Editing header and footer') %></h1>
  
 <%= form_tag do %>
@@ -21,9 +19,9 @@
       </div>
     <% end %>
     <h2><%= _('Content for header ') %></h2>
-    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => current_editor) %>
     <h2><%= _('Content for footer') %></h2>
-    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => current_editor) %>
     <%= button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= button(:cancel, _('Cancel'), :action => 'index') %>
@@ -8,7 +8,7 @@
     <%= _('Your welcome page will only be displayed if this options is selected.') %>
   </div>
  
-  <%= f.text_area(:body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor') %>
+  <%= f.text_area(:body, :cols => 40, :style => 'width: 100%', :class => current_editor) %>
   <div class='explanation'>
     <%= _('This page will be displayed to the user after his signup with this template.') %>
   </div>
@@ -17,5 +17,3 @@
     <%= submit_button('save',  _('Save'), :cancel => @back_to) %>
   <% end %>
 <% end %>
-
-<%= render :file => 'shared/tiny_mce' %>
@@ -3,7 +3,7 @@
 <% abstract_method ||= :abstract %>
 <% body_label ||= 'Text' %>
 <% body_method ||= :body %>
-<% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %>
+<% editor_type = current_editor %>
 <% lead_id ||= 0%>
 <% f ||= false%>
  
@@ -47,7 +47,9 @@ function tinymce_macros_setup(editor) {
 tinymce.PluginManager.add('macrosPlugin', tinymce.plugins.MacrosPlugin);
  
 jQuery(document).ready(function () {
-  <%= tinymce_init_js :mode => mode %>
+  <%= tinymce_init_js %>
+  <%= tinymce_init_js :mode => 'simple' %>
+  <%= tinymce_init_js :mode => 'restricted' %>
 });
 </script>
  
 <%= task_email_template(_('Select an acceptance email template:'), @acceptance_email_templates, task) %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_field(_('Create a link'), f.check_box(:create_link)) %>
  
 <%= labelled_form_field(_('Name for publishing'), f.text_field(:name)) %>
 <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
  
-<% tiny = task.article && task.article.tiny_mce? ? {:tiny_mce => true} : {} %>
-<%= render :partial => 'shared/lead_and_body', :locals => {:lead_id => task.id, :f => f}.merge(tiny)%>
+<%= render :partial => 'shared/lead_and_body', :locals => {:lead_id => task.id, :f => f}%>
  
 <%= labelled_form_field _('Comment for author'), f.text_field(:closing_statment, :style => 'width: 488px;') %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <% unless task.requestor %>
   <%= labelled_form_field(_("Sent by: "), f.text_field(:name)) %>
   <p><%= label_tag(_("Email: %s") % task.email) %> </p>
@@ -14,5 +12,5 @@
   <%= labelled_form_field(_('Highlight this article'), a.check_box(:highlighted)) %>
  
   <%= a.hidden_field(:type) %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => a, :lead_id => task.id} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:f => a, :lead_id => task.id} %>
 <% end %>
@@ -2,7 +2,6 @@
  
 <%= error_messages_for :mailing %>
  
-<%= render :file => 'shared/tiny_mce' %>
 <%= form_for :mailing do |f| %>
   <div class="recipients">
     <%= label_tag(_("Recipients: "), nil, { class: "formlabel" }) %>
@@ -14,7 +13,7 @@
     </div>
   </div>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => current_editor)) %>
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :controller => 'users' %>
 <% end %>
@@ -0,0 +1,8 @@
+class CreatePrivateScraps < ActiveRecord::Migration
+  def change
+    create_table :private_scraps do |t|
+      t.references :person
+      t.references :scrap
+    end
+  end
+end
@@ -0,0 +1,9 @@
+class AddPeopleAndArticleEditor < ActiveRecord::Migration
+  def change
+    add_column :profiles, :editor, :string, :null => false, :default => Article::Editor::TINY_MCE
+    add_column :articles, :editor, :string, :null => false, :default => Article::Editor::TINY_MCE
+    Article.where(:type => 'TextileArticle').update_all(:type => 'TextArticle', :editor => Article::Editor::TEXTILE)
+    Article.where(:type => 'TinyMceArticle').update_all(:type => 'TextArticle', :editor => Article::Editor::TINY_MCE)
+    Article.where(:type => 'RawHTMLArticle').update_all(:type => 'TextArticle', :editor => Article::Editor::RAW_HTML)
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
  
-ActiveRecord::Schema.define(version: 20160608123748) do
+ActiveRecord::Schema.define(version: 20160809123835) do
  
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -168,6 +168,7 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.boolean  "show_to_followers",    default: true
     t.integer  "followers_count",      default: 0
     t.boolean  "archived",             default: false
+    t.string   "editor",               default: "tiny_mce", null: false
   end
  
   add_index "articles", ["comments_count"], name: "index_articles_on_comments_count", using: :btree
@@ -528,6 +529,11 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.datetime "updated_at"
   end
  
+  create_table "private_scraps", force: :cascade do |t|
+    t.integer "person_id"
+    t.integer "scrap_id"
+  end
+
   create_table "product_qualifiers", force: :cascade do |t|
     t.integer  "product_id"
     t.integer  "qualifier_id"
@@ -630,15 +636,16 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.boolean  "is_template",                        default: false
     t.integer  "template_id"
     t.string   "redirection_after_login"
-    t.integer  "friends_count",                      default: 0,     null: false
-    t.integer  "members_count",                      default: 0,     null: false
-    t.integer  "activities_count",                   default: 0,     null: false
+    t.integer  "friends_count",                      default: 0,          null: false
+    t.integer  "members_count",                      default: 0,          null: false
+    t.integer  "activities_count",                   default: 0,          null: false
     t.string   "personal_website"
     t.string   "jabber_id"
     t.integer  "welcome_page_id"
     t.boolean  "allow_members_to_invite",            default: true
     t.boolean  "invite_friends_only",                default: false
     t.boolean  "secret",                             default: false
+    t.string   "editor",                             default: "tiny_mce", null: false
   end
  
   add_index "profiles", ["activities_count"], name: "index_profiles_on_activities_count", using: :btree
@@ -155,7 +155,7 @@ Feature: edit article
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    When I follow "Text article with Textile markup language"
+    When I follow "Text article"
     Then I should see "Tag list"
     When I fill in "Title" with "Article with tags"
     And I fill in "Tag list" with "aurium, bug"
@@ -168,7 +168,7 @@ Feature: edit article
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
     When I follow "New content"
-    When I follow "Text article with visual editor"
+    When I follow "Text article"
     And I fill in "Title" with "My Article"
     And I press "Save"
     Then I should see "My Article"
@@ -203,8 +203,8 @@ Feature: edit article
     And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in "Title" with "My Article"
     And I press "Save"
     Then I should see "My Article"
@@ -222,12 +222,11 @@ Feature: edit article
     And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I follow "Cancel" within ".no-boxes"
     Then I should be on /joaosilva/my-folder
  
-  @selenium
   Scenario: save and continue
     Given I am on /joaosilva/save-the-whales
     And I follow "Edit"
@@ -240,8 +239,8 @@ Feature: edit article
     Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in "Title" with "My new article"
     And I fill in "Text" with "text for the new article"
     And I press "Save and continue"
@@ -287,7 +286,7 @@ Feature: edit article
     Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    When I follow "Text article with visual editor"
+    When I follow "Text article"
     And I fill in "Title" with "My time testing Article"
     And I fill in "Publish date" with "1980-11-15 20:37"
     And I press "Save"
@@ -99,8 +99,8 @@ Feature: forum
     And I check "Has terms of use:"
     And I press "Save"
     When I follow "New discussion topic"
-    And I should see "Text article with visual editor"
-    And I follow "Text article with visual editor"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in "Title" with "Topic"
     And I press "Save"
     And I am logged in as "mariasilva"
@@ -8,7 +8,7 @@ Feature: uploads items on media panel
       | joaosilva | Joao Silva |
     And feature "media_panel" is enabled on environment
     And I am logged in as "joaosilva"
-    And I am on /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    And I am on /myprofile/joaosilva/cms/new?type=TextArticle
  
   Scenario: see media panel collapsed
     Then I should see "Insert media"
@@ -123,7 +123,7 @@ Feature: uploads items on media panel
     Given the following files
       | owner     | file          | mime       |
       | joaosilva | other-pic.jpg | image/jpeg |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "Recent media" from "parent_id" within "#published-media"
     Then I should see div with title "other-pic.jpg" within ".items"
@@ -148,7 +148,7 @@ Feature: uploads items on media panel
       | owner      | file          | mime       | parent        |
       | joaosilva  | rails.png     | image/png  | other-gallery |
       | joaosilva  | other-pic.jpg | image/jpeg | gallery       |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "joaosilva/Gallery" from "parent_id" within "#published-media"
     Then I should see div with title "other-pic.jpg" within ".items"
@@ -165,7 +165,7 @@ Feature: uploads items on media panel
     And the following files
       | owner      | file          | mime       | parent        |
       | joaosilva  | other-pic.jpg | image/jpeg | gallery       |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "joaosilva/Gallery" from "parent_id" within "#published-media"
       And I select "joaosilva/Gallery" from "parent_id" within "#media-upload-form"
@@ -187,7 +187,7 @@ Feature: uploads items on media panel
     And the following files
       | owner      | file          | mime       | parent        |
       | joaosilva  | rails.png     | image/png  | other-gallery |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I select "Recent media" from "parent_id" within "#published-media"
       And I fill in "Search" with "rails" within "#published-media"
@@ -227,7 +227,7 @@ Feature: uploads items on media panel
       | joaosilva  | other-pic.jpg | image/jpeg | my-gallery    |
       | joaosilva  | rails.png     | image/png  | gallery       |
       | joaosilva  | other-pic.jpg | image/jpeg | gallery       |
-    When I go to /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    When I go to /myprofile/joaosilva/cms/new?type=TextArticle
       And I follow "Show/Hide"
       And I should not see "View all"
       And I attach the file "public/503.jpg" to "file"
@@ -15,8 +15,7 @@ Feature: create content on cms
  
   Scenario: list all content types
     Given I follow "New content"
-    Then I should see "Text article with visual editor"
-     And I should see "Text article with Textile markup"
+    Then I should see "Text article"
      And I should see "Folder"
      And I should see "Blog"
      And I should see "Uploaded file"
@@ -30,22 +29,6 @@ Feature: create content on cms
     And I go to joaosilva's cms
     Then I should see "My Folder"
  
-  Scenario: create a tiny_mce article
-    Given I follow "New content"
-    When I follow "Text article with visual editor"
-    And I fill in "Title" with "My tiny_mce article"
-    And I press "Save"
-    And I go to joaosilva's cms
-    Then I should see "My tiny_mce article"
-
-  Scenario: create a textile article
-    Given I follow "New content"
-    When I follow "Text article with Textile markup"
-    And I fill in "Title" with "My textile article"
-    And I press "Save"
-    And I go to joaosilva's cms
-    Then I should see "My textile article"
-
   Scenario: create a Blog
     Given I follow "New content"
     When I follow "Blog"
@@ -47,8 +47,8 @@ Feature: search inside a profile
     And I go to joaosilva's profile
     And I fill in "q" with "article"
     And I press "Search"
-    Then I should see "public article" within ".main-block"
-    And I should not see "private article" within ".main-block"
+    Then I should see "published article" within ".main-block"
+    And I should not see "unpublished article" within ".main-block"
  
   Scenario: search on environment
     Given I go to joaosilva's profile
@@ -60,11 +60,10 @@ Feature: publish article
     And I am on mariasilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    And I should see "Text article with Textile markup language"
-    And I follow "Text article with Textile markup language"
+    And I should see "Text article"
+    And I follow "Text article"
     And I fill in the following:
       | Title | Sample Article |
-      | Text | this is Maria's first published article |
     And I press "Save"
     And I follow "Spread"
     And I type in "Sample Community" into autocomplete list "search-communities-to-publish" and I choose "Sample Community"
@@ -22,7 +22,6 @@ Feature: search contents
     Then I should see "whales and dolphins" within ".search-text-article-item"
     And I should see "whales and dolphins" within ".only-one-result-box"
     And I should not see "bees and butterflies"
-    And The page should contain ".icon-content-textile-article"
     When I follow "whales and dolphins"
     Then I should be on article "whales and dolphins"
  
@@ -52,7 +52,7 @@ Feature: Use a secret community
     And I go to mycommunity's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    And I follow "Text article with visual editor"
+    And I follow "Text article"
     And I fill in "Title" with "My public article"
     And I choose "Public"
     And I press "Save and continue"
@@ -101,7 +101,7 @@ end
  
 Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded files|rss feeds)$/ do |content, table|
   klass = {
-    'articles' => TextileArticle,
+    'articles' => TextArticle,
     'events' => Event,
     'blogs' => Blog,
     'folders' => Folder,
@@ -118,6 +118,7 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
     language = item.delete("language")
     category = item.delete("category")
     filename = item.delete("filename")
+    mime = item.delete("mime") || 'binary/octet-stream'
     translation_of_id = nil
     if item["translation_of"]
       if item["translation_of"] != "nil"
@@ -131,7 +132,7 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
       :language => language,
       :translation_of_id => translation_of_id)
     if !filename.blank?
-      item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", 'binary/octet-stream'))
+      item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", mime))
     end
     result = klass.new(item)
     if !parent.blank?
@@ -178,7 +179,7 @@ Given /^the following articles? with images?$/ do |table|
     img_tag = "<img "
     img.each { |attr, value| img_tag += "#{attr}=\"#{value}\" " }
     img_tag += "/>"
-    article = TinyMceArticle.new(:profile => owner, :name => item[:name], :body => img_tag)
+    article = TextArticle.new(:profile => owner, :name => item[:name], :body => img_tag)
     if item[:parent]
       article.parent = Article.find_by slug: item[:parent]
     end
@@ -366,6 +367,10 @@ Then /^The page should not contain &quot;(.*)&quot;$/ do |selector|
   page.should have_no_css("#{selector}")
 end
  
+Then /^The page should contain only (\d+) "(.*)"$/ do |count, selector|
+  page.should have_css(selector, :count => count)
+end
+
 Given /^the mailbox is empty$/ do
   ActionMailer::Base.deliveries = []
 end
@@ -653,6 +658,15 @@ Given /^the environment is configured to (.*) after signup$/ do |option|
   environment.save
 end
  
+When /^I click "(.*?)"$/ do |selector|
+  find(selector).click
+end
+
+Then /^the element "(.*)" has class "(.*)"$/ do |el_selector, el_class|
+  class_list = find(el_selector)[:class].split(' ')
+  class_list.should include(el_class)
+end
+
 When /^wait for the captcha signup time$/ do
   environment = Environment.default
   sleep environment.min_signup_delay + 1
@@ -671,3 +685,7 @@ Given /^the field (.*) is public for all users$/ do |field|
     person.save!
   end
 end
+
+When(/^I press "(.*?)" by selector$/) do |selector|
+   page.execute_script("jQuery('#{selector}').click();")
+end
@@ -10,7 +10,7 @@ Feature: Create tinyMCE article
  
   @selenium
   Scenario: mce complete  mode should show on message creation
-    Given I am on /myprofile/joaosilva/cms/new?type=TinyMceArticle
+    Given I am on /myprofile/joaosilva/cms/new?type=TextArticle
     Then The tinymce "toolbar1" should be "fullscreen | insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
     And The tinymce "menubar" should be "edit insert view tools"
     And The tinymce "toolbar2" should contain "print preview code media | table"
@@ -124,3 +124,8 @@ end
 Dir.glob(File.join('app', 'presenters', '*.rb')) do |file|
   load file
 end
+
+# Preload FilePresenters from plugins to allow `FilePresenter.for()` to work
+Dir.glob(File.join('plugins', '*', 'lib', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -10,7 +10,8 @@ class Noosfero::Plugin::Settings
   end
  
   def settings
-    @base.settings["#{@plugin.public_name}_plugin".to_sym] ||= {}
+    settings_field = @base.class.settings_field
+    @base.send(settings_field)["#{@plugin.public_name}_plugin".to_sym] ||= {}
   end
  
   def method_missing(method, *args, &block)
 <div class="notification-plugin-form">
  
-  <% abstract_options = {:value => @notification.message, :style => 'width: 100%; height: 200px;', :class => 'mceEditor'} %>
+  <% abstract_options = {:value => @notification.message, :style => 'width: 100%; height: 200px;', :class => current_editor('restricted')} %>
  
   <%= button :back, _('Back'), :controller => 'admin_notifications_plugin_admin' %>
  
   <%= form_for :notifications do |f| %>
  
-    <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'restricted'} %>
-
     <%= labelled_form_field(_("Optional Title:"), f.text_field(:title, value: @notification.title)) %>
  
     <%= labelled_form_field(_("Enter your message here:"), f.text_area(:message, abstract_options)) %>
 class Application < Rails::Application
-  config.action_view.sanitized_allowed_attributes << 'data-macro-paragraph_uuid'
+  config.action_view.sanitized_allowed_attributes << 'data-macro-paragraph_uuid' unless config.action_view.sanitized_allowed_attributes.include?('data-macro-paragraph_uuid')
 end
  
 class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro
@@ -5,7 +5,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
  
   def setup
     @profile = fast_create(Community)
-    @article = fast_create(TinyMceArticle, :profile_id => profile.id)
+    @article = fast_create(TextArticle, :profile_id => profile.id)
     @environment = Environment.default
     @environment.enable_plugin(CommentParagraphPlugin)
   end
@@ -74,7 +74,7 @@ class DiscussionBlockTest &lt; ActiveSupport::TestCase
     b.save
     a1 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     fast_create(Event, :profile_id => community.id)
-    fast_create(TinyMceArticle, :profile_id => community.id)
+    fast_create(TextArticle, :profile_id => community.id)
     a2 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     assert_equivalent [a1, a2], b.discussions
   end
@@ -183,7 +183,7 @@ class DiscussionBlockViewTest &lt; ActionView::TestCase
     b.save
     a1 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     fast_create(Event, :profile_id => community.id)
-    fast_create(TinyMceArticle, :profile_id => community.id)
+    fast_create(TextArticle, :profile_id => community.id)
     a2 = fast_create(CommentParagraphPlugin::Discussion, :profile_id => community.id)
     assert_equivalent [a2.id, a1.id], b.api_content['articles'].map {|a| a[:id]}
   end
@@ -7,6 +7,7 @@ class TinymceHelperTest &lt; ActiveSupport::TestCase
   def setup
     expects(:top_url).returns('/')
     expects(:tinymce_language).returns('en')
+    expects(:current_editor).returns(Article::Editor::TINY_MCE)
     @plugins = mock
     @plugins.expects(:dispatch).returns([]).at_least_once
     @environment = Environment.default
@@ -61,7 +61,7 @@ class CommunityTrackPlugin::Step &lt; Folder
   end
  
   def enabled_tools
-    tools = [TinyMceArticle, Forum]
+    tools = [TextArticle, Forum]
     tools << CommunityHubPlugin::Hub if environment.plugin_enabled?('CommunityHubPlugin')
     tools << ProposalsDiscussionPlugin::Discussion if environment.plugin_enabled?('ProposalsDiscussionPlugin')
     tools << PairwisePlugin::PairwiseContent if environment.plugin_enabled?('PairwisePlugin')
@@ -5,7 +5,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   def setup
     @profile = Community.create!(:name => 'Sample community', :identifier => 'sample-community')
     @track = create_track('track', @profile)
-    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day, :tool_type => TinyMceArticle.name)
+    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day, :tool_type => TextArticle.name)
  
     user = create_user('testinguser')
     login_as(user.login)
@@ -49,7 +49,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
  
   should 'show tools for a step' do
-    TinyMceArticle.create!(:profile => @profile, :name => 'article', :parent => @step)
+    TextArticle.create!(:profile => @profile, :name => 'article', :parent => @step)
     get :view_page, @step.url
     assert_tag :tag => 'div', :attributes => { :class => 'tools' }, :descendant => { :tag => 'div', :attributes => { :class => 'item' } }
   end
@@ -237,7 +237,7 @@ class StepTest &lt; ActiveSupport::TestCase
   end
  
   should 'return enabled tools for a step' do
-    assert_includes @step.enabled_tools, TinyMceArticle
+    assert_includes @step.enabled_tools, TextArticle
     assert_includes @step.enabled_tools, Forum
   end
  
 <%= required_fields_message %>
  
-<%= render :file => 'shared/tiny_mce' %>
-
 <div>
   <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
   <%= labelled_form_field(_('Period'), (
@@ -19,4 +17,4 @@
  
 <%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
  
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
+<%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Description:'} %>
 <div class='community-track'>
   <%= required_fields_message %>
  
-  <%= render :file => 'shared/tiny_mce' %>
-
   <div>
     <%= required labelled_form_field(c_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
   </div>
  
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Description:'} %>
  
   <div>
     <%= labelled_form_field(_('Goals:'), text_area(:article, :goals, :rows => 3, :cols => 64)) %>
@@ -22,7 +22,7 @@ class ContextContentPlugin::ContextContentBlock &lt; Block
   end
  
   def available_content_types
-    @available_content_types ||= [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
+    @available_content_types ||= [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
     checked_types = types.map {|t| t.constantize}
     checked_types + (@available_content_types - checked_types)
   end
@@ -8,7 +8,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
  
     box = Box.create!(:owner => @profile)
     @block = ContextContentPlugin::ContextContentBlock.new(:box_id => box.id)
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
     @block.limit = 1
     @block.title = "New Context Block"
     @block.save!
@@ -21,7 +21,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   end
  
   should 'display context content block if it has contents' do
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     get :view_page, @page.url
     assert_tag 'div', :attributes => {:id => "context_content_#{@block.id}", :class => 'contents'}
     assert_no_tag 'div', :attributes => {:id => "context_content_more_#{@block.id}", :class => 'more_button'}, :descendant => {:tag => 'a'}
@@ -31,7 +31,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display context content block title if it is not configured to use_parent_title' do
     @block.use_parent_title = false
     @block.save
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     get :view_page, @page.url
     assert_tag 'h3', :attributes => {:class => 'block-title'}, :content => @block.title
     assert_no_tag 'h3', :attributes => {:class => 'block-title'}, :content => @page.name
@@ -40,15 +40,15 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display context content with folder title if it is configured to use_parent_title' do
     @block.use_parent_title = true
     @block.save
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     get :view_page, @page.url
     assert_tag 'h3', :attributes => {:class => 'block-title'}, :content => @page.name
     assert_no_tag 'h3', :attributes => {:class => 'block-title'}, :content => @block.title
   end
  
   should 'display context content block with pagination' do
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
+    article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
+    article2 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
     get :view_page, @page.url
     assert_tag 'div', :attributes => {:id => "context_content_#{@block.id}", :class => 'contents'}
     assert_tag 'div', :attributes => {:id => "context_content_more_#{@block.id}", :class => 'more_button'}, :descendant => {:tag => 'a', :attributes => {:class => 'button icon-button icon-left disabled'} }
@@ -9,7 +9,7 @@ class ContextContentPluginProfileControllerTest &lt; ActionController::TestCase
     box = create(Box, :owner_type => 'Profile', :owner_id => @profile.id)
     @block = ContextContentPlugin::ContextContentBlock.new
     @block.box = box
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
     @block.limit = 1
     owner = create_user('block-owner').person
     @block.box = owner.boxes.last
@@ -23,14 +23,14 @@ class ContextContentPluginProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'render error if page do not exists' do
-    article = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id)
+    article = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id)
     xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
     assert_response 500
   end
  
   should 'replace div with content for page passed as parameter' do
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
-    article2 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article2')
+    article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article2 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article2')
     xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
     assert_response :success
     assert_match /context_content_#{@block.id}/, @response.body
@@ -39,7 +39,7 @@ class ContextContentPluginProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'do not render pagination buttons if it has only one page' do
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
+    article1 = fast_create(TextArticle, :parent_id => @page.id, :profile_id => @profile.id, :name => 'article1')
     xhr :get, :view_content, :id => @block.id, :article_id => @page.id, :page => 2, :profile => @profile.identifier
     assert_no_match /context_content_more_#{@block.id}/, @response.body
   end
@@ -13,7 +13,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
  
     box = Box.create!(:owner => @profile)
     @block = ContextContentPlugin::ContextContentBlock.new(:box_id => box.id)
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
     @block.limit = 1
     @block.save!
  
@@ -38,11 +38,11 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     @block.show_parent_content = false
     @block.save!
     get :edit, :id => @block.id, :profile => @profile.identifier
-    post :save, :id => @block.id, :block => {:title => 'context', :show_image => '0', :show_name => '0', :show_parent_content => '0', :types => ['TinyMceArticle', '', nil, 'Folder'] }, :profile => @profile.identifier
+    post :save, :id => @block.id, :block => {:title => 'context', :show_image => '0', :show_name => '0', :show_parent_content => '0', :types => ['TextArticle', '', nil, 'Folder'] }, :profile => @profile.identifier
     @block.reload
     assert_equal 'context', @block.title
     refute @block.show_image && !@block.show_name && !@block.show_parent_content
-    assert_equal ['TinyMceArticle', 'Folder'], @block.types
+    assert_equal ['TextArticle', 'Folder'], @block.types
   end
  
 end
@@ -5,7 +5,7 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   def setup
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     @block = ContextContentPlugin::ContextContentBlock.create!
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
   end
  
   should 'describe itself' do
@@ -22,13 +22,13 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
  
   should 'return children of page' do
     folder = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal [article], @block.contents(folder)
   end
  
   should 'return parent name of the contents' do
     folder = fast_create(Folder, :name => " New Folder")
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal folder.name, @block.parent_title([article])
   end
  
@@ -39,40 +39,40 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   should 'limit number of children to display' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article1 = fast_create(TextArticle, :parent_id => folder.id)
+    article2 = fast_create(TextArticle, :parent_id => folder.id)
+    article3 = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal 2, @block.contents(folder).length
   end
  
   should 'show contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
+    article1 = fast_create(TextArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TextArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TextArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(folder, 2)
   end
  
   should 'show parent contents for next page' do
     @block.limit = 2
     folder = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
-    article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
-    article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
+    article1 = fast_create(TextArticle, :name => 'article 1', :parent_id => folder.id)
+    article2 = fast_create(TextArticle, :name => 'article 2', :parent_id => folder.id)
+    article3 = fast_create(TextArticle, :name => 'article 3', :parent_id => folder.id)
     assert_equal [article3], @block.contents(article1, 2)
   end
  
   should 'return parent children if page has no children' do
     folder = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal [article], @block.contents(article)
   end
  
   should 'do not return parent children if show_parent_content is false' do
     @block.show_parent_content = false
     folder = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => folder.id)
+    article = fast_create(TextArticle, :parent_id => folder.id)
     assert_equal [], @block.contents(article)
   end
  
@@ -82,13 +82,13 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   end
  
   should 'return available content types with checked types first' do
-    @block.types = ['TinyMceArticle', 'Folder']
-    assert_equal [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], @block.available_content_types
+    @block.types = ['TextArticle', 'Folder']
+    assert_equal [TextArticle, Folder, UploadedFile, Event, Blog, Forum, Gallery, RssFeed], @block.available_content_types
   end
  
   should 'return available content types' do
     @block.types = []
-    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], @block.available_content_types
+    assert_equal [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed], @block.available_content_types
   end
  
   should 'return first 2 content types' do
@@ -120,7 +120,7 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
  
     @block.types = []
-    assert_equal [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], @block.available_content_types
+    assert_equal [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], @block.available_content_types
   end
  
   should 'return box owner on profile method call' do
@@ -144,7 +144,7 @@ class ContextContentBlockViewTest &lt; ActionView::TestCase
   def setup
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     @block = ContextContentPlugin::ContextContentBlock.create!
-    @block.types = ['TinyMceArticle']
+    @block.types = ['TextArticle']
   end
  
   should 'render nothing if it has no content to show' do
@@ -153,7 +153,7 @@ class ContextContentBlockViewTest &lt; ActionView::TestCase
  
   should 'render context content block view' do
     @page = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => @page.id)
+    article = fast_create(TextArticle, :parent_id => @page.id)
     contents = [article]
     @block.use_parent_title = true
  
@@ -178,9 +178,9 @@ class ContextContentBlockViewTest &lt; ActionView::TestCase
   should 'display pagination links if it has more than one page' do
     @block.limit = 2
     @page = fast_create(Folder)
-    article1 = fast_create(TinyMceArticle, :parent_id => @page.id)
-    article2 = fast_create(TinyMceArticle, :parent_id => @page.id)
-    article3 = fast_create(TinyMceArticle, :parent_id => @page.id)
+    article1 = fast_create(TextArticle, :parent_id => @page.id)
+    article2 = fast_create(TextArticle, :parent_id => @page.id)
+    article3 = fast_create(TextArticle, :parent_id => @page.id)
     contents = [article1, article2, article3]
     contents.each do |article|
       article.expects(:view_url).returns('http://test.noosfero.plugins')
@@ -180,8 +180,9 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
  
     get :edit, :profile => profile.identifier, :id => form.id
+    expects(:current_editor).returns(Article::Editor::TINY_MCE)
  
-    assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => 'mceEditor' }
+    assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => /#{current_editor}/ }
   end
  
   should 'export submissions as csv' do
 <% self.extend(CustomFormsPlugin::Helper) %>
-<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
  
 <%= error_messages_for :form %>
 <%= required labelled_form_field _('Name'), f.text_field(:name) %>
@@ -17,7 +16,7 @@
   <%= labelled_check_box _('Triggered after membership'), 'form[on_membership]', '1', @form.on_membership %>
   </p>
 <% end %>
-<%= labelled_form_field c_('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
+<%= labelled_form_field c_('Description'), f.text_area(:description, :style => 'width: 100%', :class => current_editor('simple')) %>
  
 <h2><%= c_('Fields') %></h2>
  
@@ -12,7 +12,7 @@
   = labelled_field f, :name, t('delivery_plugin.models.method.name'), f.text_field(:name),
     help: t('delivery_plugin.models.method.name_help')
   = labelled_field f, :description, t('delivery_plugin.models.method.instructions'),
-    f.text_area(:description, rows: 5, class: 'mceEditor'), help: t('delivery_plugin.models.method.instructions_help')
+    f.text_area(:description, rows: 5, class: current_editor('simple')), help: t('delivery_plugin.models.method.instructions_help')
  
   fieldset
     legend= t'delivery_plugin.models.method.costs_legend'
@@ -34,5 +34,3 @@
     = submit_button :save, if delivery_method.new_record? then t('delivery_plugin.views.method.edit.add') else t('delivery_plugin.views.method.edit.save') end
     = link_to_function t('delivery_plugin.views.method.edit.back'), "delivery.method.view.toggle()"
  
-= render file: 'shared/tiny_mce', locals: {mode: 'simple'}
-
@@ -24,7 +24,7 @@ class DisplayContentBlock &lt; Block
                               {:value => 'title', :checked => true},
                               {:value => 'abstract', :checked => true}]
   settings_items :display_folder_children, :type => :boolean, :default => true
-  settings_items :types, :type => Array, :default => ['TextileArticle', 'TinyMceArticle', 'RawHTMLArticle']
+	  settings_items :types, :type => Array, :default => ['TextArticle']
   settings_items :order_by_recent, :type => :boolean, :default => :true
   settings_items :content_with_translations, :type => :boolean, :default => :true
   settings_items :limit_to_show, :type => :integer, :default => 6
@@ -61,7 +61,7 @@ class DisplayContentBlock &lt; Block
   end
  
   def available_content_types
-    @available_content_types ||= [TinyMceArticle, RawHTMLArticle, TextileArticle, UploadedFile, Event, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
+    @available_content_types ||= [TextArticle, UploadedFile, Event, Folder, Blog, Forum, Gallery, RssFeed] + plugins.dispatch(:content_types)
     checked_types = types.map {|t| t.constantize}
     checked_types + (@available_content_types - checked_types)
   end
@@ -108,7 +108,7 @@ class DisplayContentBlock &lt; Block
     @parent_nodes ||= self.holder.articles.where(:id => nodes).map { |article| get_parent(article) }.compact.flatten
   end
  
-  VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle', 'Folder', 'Blog', 'Forum']
+  VALID_CONTENT = ['TextArticle', 'Folder', 'Blog', 'Forum']
  
   include Noosfero::Plugin::HotSpot
  
@@ -39,7 +39,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node content' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
  
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -51,7 +51,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node checked if the node is in the nodes list' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id)
     block.nodes= [article.id]
     block.save!
  
@@ -67,8 +67,8 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    article2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    article2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
     block.nodes = [article.id]
     block.save!
  
@@ -81,7 +81,7 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node closed if the node has article with children' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
  
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -95,8 +95,8 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
     block.checked_nodes= {a1.id => true}
     block.save!
  
@@ -118,9 +118,9 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
     block.checked_nodes= {a2.id => true, a3.id => true}
     block.save!
  
@@ -148,9 +148,9 @@ class DisplayContentPluginAdminControllerTest &lt; ActionController::TestCase
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => environment.portal_community.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => environment.portal_community.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => environment.portal_community.id)
  
     get :index, :block_id => block.id
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -40,7 +40,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node content' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
  
     get :index, :block_id => block.id, :profile => profile.identifier
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -52,7 +52,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
  
   should 'index action returns an json with node checked if the node is in the nodes list' do
     Article.delete_all
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
     block.nodes= [article.id]
     block.save!
  
@@ -68,8 +68,8 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node undetermined if the node is in the parent nodes list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    article2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    article2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
     block.nodes = [article.id]
     block.save!
  
@@ -82,7 +82,7 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with node closed if the node has article with children' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    article = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    article = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
     block.save!
  
     get :index, :block_id => block.id, :profile => profile.identifier
@@ -97,8 +97,8 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes if some parent is in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
     block.checked_nodes = {a1.id => true}
     block.save!
  
@@ -120,9 +120,9 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json with all the children nodes and root nodes if some parent is in the parents list and there is others root articles' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
     block.checked_nodes = {a1.id => true}
     block.save!
  
@@ -150,9 +150,9 @@ class DisplayContentPluginMyprofileControllerTest &lt; ActionController::TestCase
   should 'index action returns an json without children nodes if the parent is not in the parents list' do
     Article.delete_all
     f = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
  
     get :index, :block_id => block.id, :profile => profile.identifier
     json_response = ActiveSupport::JSON.decode(@response.body)
@@ -2,7 +2,7 @@ require_relative &#39;../test_helper&#39;
 class DisplayContentBlockTest < ActiveSupport::TestCase
  
   INVALID_KIND_OF_ARTICLE = [Event, RssFeed, UploadedFile, Gallery]
-  VALID_KIND_OF_ARTICLE = [RawHTMLArticle, TextArticle, TextileArticle, TinyMceArticle, Folder, Blog, Forum]
+  VALID_KIND_OF_ARTICLE = [TextArticle, Folder, Blog, Forum]
  
   should 'describe itself' do
     assert_not_equal Block.description, DisplayContentBlock.description
@@ -39,9 +39,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'nodes be the article ids in hash of checked nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
  
     checked_articles= {a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -54,9 +54,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'nodes be save in database' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
  
     checked_articles= {a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -71,10 +71,10 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'be able to update nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id)
-    a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id)
+    a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id)
  
     checked_articles= {a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -95,13 +95,13 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "save selected folders and articles" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
     f2 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id, :parent_id => f1.id)
-    a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => f2.id)
-    a5 = fast_create(TextileArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => f2.id)
+    a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => f2.id)
+    a5 = fast_create(TextArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => f2.id)
  
     checked_articles= {a1.id => true, a2.id => true, f1.id => false}
  
@@ -115,13 +115,13 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "save selected articles and blogs" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
     b1 = fast_create(Blog, :name => 'test blog 1', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => b1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => b1.id)
     b2 = fast_create(Blog, :name => 'test blog 2', :profile_id => profile.id)
-    a4 = fast_create(TextileArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => b2.id)
-    a5 = fast_create(TextileArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => b2.id)
+    a4 = fast_create(TextArticle, :name => 'test article 4', :profile_id => profile.id, :parent_id => b2.id)
+    a5 = fast_create(TextArticle, :name => 'test article 5', :profile_id => profile.id, :parent_id => b2.id)
  
     checked_articles= {a1.id => true, a2.id => true, b1.id => false, b2.id => true}
  
@@ -132,36 +132,10 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert_equivalent [a1.id, a2.id, b1.id, b2.id], block.nodes
   end
  
-  should 'TextileArticle be saved as node' do
+  should 'TextArticle be saved as node' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-
-    checked_articles= {a1.id => true}
-    block = DisplayContentBlock.new
-    block.stubs(:holder).returns(profile)
-    block.checked_nodes= checked_articles
-    assert_equal [], [a1.id] - block.nodes
-    assert_equal [], block.nodes - [a1.id]
-  end
-
-  should 'TinyMceArticle be saved as node' do
-    profile = create_user('testuser').person
-    Article.delete_all
-    a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id)
-
-    checked_articles= {a1.id => true}
-    block = DisplayContentBlock.new
-    block.stubs(:holder).returns(profile)
-    block.checked_nodes= checked_articles
-    assert_equal [], [a1.id] - block.nodes
-    assert_equal [], block.nodes - [a1.id]
-  end
-
-  should 'RawHTMLArticle be saved as node' do
-    profile = create_user('testuser').person
-    Article.delete_all
-    a1 = fast_create(RawHTMLArticle, :name => 'test article 1', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
  
     checked_articles= {a1.id => true}
     block = DisplayContentBlock.new
@@ -230,9 +204,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "return all root articles from profile" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     block.nodes= [a1.id, a2.id, a3.id]
@@ -247,9 +221,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should "return all children of an articles's profile" do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     box = mock()
@@ -264,9 +238,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = fast_create(Community, :name => 'my test community', :identifier => 'mytestcommunity')
     environment = Environment.default
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     box = mock()
@@ -283,9 +257,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = fast_create(Community, :name => 'my test community', :identifier => 'mytestcommunity')
     environment = Environment.default
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => a2.id)
  
     block = DisplayContentBlock.new
     box = mock()
@@ -404,9 +378,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = create_user('testuser').person
     Article.delete_all
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
  
     checked_articles= {f1.id => true, a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -420,9 +394,9 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     profile = create_user('testuser').person
     Article.delete_all
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
-    a3 = fast_create(TextileArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :parent_id => f1.id)
+    a3 = fast_create(TextArticle, :name => 'test article 3', :profile_id => profile.id, :parent_id => f1.id)
  
     checked_articles= {f1.id => true, a1.id => true, a2.id => true, a3.id => false}
     block = DisplayContentBlock.new
@@ -472,37 +446,37 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   should 'return available content types with checked types first' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
  
-    block.types = ['TinyMceArticle', 'Folder']
-    assert_equivalent [TinyMceArticle, Folder, UploadedFile, Event, TextileArticle, RawHTMLArticle, Blog, Forum, Gallery, RssFeed], block.available_content_types
+    block.types = ['TextArticle', 'Folder']
+    assert_equivalent [TextArticle, Folder, UploadedFile, Event, Blog, Forum, Gallery, RssFeed], block.available_content_types
   end
  
   should 'return available content types' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     block.types = []
-    assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types
+    assert_equivalent [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed], block.available_content_types
   end
  
   should 'return first 2 content types' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     assert_equal 2, block.first_content_types.length
   end
  
   should 'return all but first 2 content types' do
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     assert_equal block.available_content_types.length - 2, block.more_content_types.length
   end
  
   should 'return 2 as default value for first_types_count' do
     block = DisplayContentBlock.create!
-    block.types = ['TinyMceArticle']
+    block.types = ['TextArticle']
     assert_equal 2, block.first_types_count
   end
  
@@ -527,14 +501,14 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([SomePlugin.new])
  
     block.types = []
-    assert_equivalent [UploadedFile, Event, TinyMceArticle, TextileArticle, RawHTMLArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
+    assert_equivalent [UploadedFile, Event, TextArticle, Folder, Blog, Forum, Gallery, RssFeed, SomePluginContent], block.available_content_types
   end
  
   should 'do not fail if a selected article was removed' do
     profile = create_user('testuser').person
     Article.delete_all
     f1 = fast_create(Folder, :name => 'test folder 1', :profile_id => profile.id)
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :parent_id => f1.id)
  
     checked_articles= {a1.id => true}
  
@@ -547,16 +521,16 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
  
 end
  
-require 'boxes_helper'
-
 class DisplayContentBlockViewTest < ActionView::TestCase
   include BoxesHelper
+  include DatesHelper
+  helper :dates
  
   should 'list links for all articles title defined in nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -572,8 +546,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'list content for all articles lead defined in nodes' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
-    a2 = fast_create(TinyMceArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}]
@@ -602,7 +576,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show title if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
  
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -616,7 +590,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show abstract if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
  
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -630,7 +604,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show body if defined by user' do
     profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
  
     block = DisplayContentBlock.new
     block.nodes = [a.id]
@@ -642,7 +616,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
     assert_match /#{a.body}/, render_block_content(block)
   end
  
-  should 'show publishd date if defined by user' do
+  should 'show published date if defined by user' do
     profile = create_user('testuser').person
     a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
  
@@ -658,7 +632,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'show image if defined by user' do
     profile = create_user('testuser').person
-    a = create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
+    a = create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
     a.save!
  
     process_delayed_job_queue
@@ -676,8 +650,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'show articles in recent order' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -697,8 +671,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'show articles in oldest order' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -718,8 +692,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
   should 'show articles in recent order with limit option' do
     profile = create_user('testuser').person
     Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :published_at => DateTime.current)
+    a2 = fast_create(TextArticle, :name => 'test article 2', :profile_id => profile.id, :published_at => (DateTime.current + 1))
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -741,10 +715,10 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
     profile = create_user('testuser').person
     Article.delete_all
  
-    en_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
-    en_article2 = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article 2', :language => 'en')
+    en_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
+    en_article2 = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article 2', :language => 'en')
  
-    pt_article = fast_create TextileArticle, profile_id: profile.id, name: 'pt_article', language: 'pt', translation_of_id: en_article.id
+    pt_article = fast_create TextArticle, profile_id: profile.id, name: 'pt_article', language: 'pt', translation_of_id: en_article.id
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -771,8 +745,8 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
     profile = create_user('testuser').person
     Article.delete_all
  
-    en_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
-    pt_article = fast_create(TextileArticle, :profile_id => profile.id, :name => 'pt_article', :language => 'pt', :translation_of_id => en_article)
+    en_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'en_article', :language => 'en')
+    pt_article = fast_create(TextArticle, :profile_id => profile.id, :name => 'pt_article', :language => 'pt', :translation_of_id => en_article)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'title', :checked => true}]
@@ -794,7 +768,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not escape abstract html of articles' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, abstract: "<p class='test-article-abstract'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, abstract: "<p class='test-article-abstract'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}] 
@@ -807,7 +781,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not raise if abstract of article is nil' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}] 
@@ -823,7 +797,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not escape body html of articles' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, body: "<p class='test-article-body'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, body: "<p class='test-article-body'>Test</p>", name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'body', :checked => true}] 
@@ -836,7 +810,7 @@ class DisplayContentBlockViewTest &lt; ActionView::TestCase
  
   should 'not raise if body of article is nil' do
     profile = create_user('testuser').person
-    a1 = fast_create(TextileArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
+    a1 = fast_create(TextArticle, name: 'test article 1', profile_id: profile.id, published_at: DateTime.current)
  
     block = DisplayContentBlock.new
     block.sections = [{:value => 'abstract', :checked => true}] 
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'elasticsearch-model'
+gem 'elasticsearch-rails'
@@ -0,0 +1,58 @@
+Elasticsearch Plugin
+====================
+
+Elasticsearch is as plugin to run searchs in noosfero through elasticsearch.
+
+The Version used is 1.7.5 due compatibility problems with gems and new versions.
+
+Download: https://www.elastic.co/downloads/past-releases/elasticsearch-1-7-5
+
+INSTALL
+=======
+
+Install elasticsearch and openjdk-7-jdk.
+
+    $ cd plugins/elasticsearch
+    $ rake install
+
+After install start the service, by default, the service runs on port 9200.
+
+Install gems listed in plugin Gemfile.
+
+    $ cd plugins/elasticsearch
+    $ bundle install
+
+If this step fail, just copy the gems to core Gemfile and run the command
+'bundle install'.
+
+Enable plugin
+-------------
+
+Execute the command to enable Elasticsearch Plugin at your noosfero:
+
+   ``sh $ ./script/noosfero-plugins enable elasticsearch ``
+
+Active plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "Elasticsearch" check-box
+
+DEVELOPMENT
+===========
+
+To run  tests for Elasticsearch:
+
+- All elasticsearch Tests:
+
+```
+$ rake test:noosfero_plugins:elasticsearch:units
+```
+
+- One Test:
+
+```
+$ rake test:units TEST=plugins/elasticsearch/test/unit/controllers/elasticsearch_plugin_controller_test.rb
+```
@@ -0,0 +1,36 @@
+#!/usr/bin/env rake
+
+require 'open-uri'
+
+desc "download elasticsearch"
+task :download do
+  unless File.exists? '/tmp/elasticsearch.deb'
+    puts "downloading elasticsearch Debian package..."
+    download = open('https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.deb')
+    IO.copy_stream(download, '/tmp/elasticsearch.deb')
+  end
+end
+
+desc "install elasticsearch"
+task :install => :download do
+  sh 'sudo apt-get install openjdk-7-jdk'
+  sh 'sudo dpkg -i /tmp/elasticsearch.deb || sudo apt-get install -f'
+end
+
+desc "start elasticsearch"
+task :start do
+  if not system 'sudo systemctl start elasticsearch > /dev/null'
+    Rake::Task['install'].invoke
+  end
+  puts "Enable Elasticsearch service"
+  sh 'sudo systemctl start elasticsearch >> /dev/null 2>&1'
+  sh 'sudo systemctl enable elasticsearch  >> /dev/null 2>&1'
+  sleep 10
+end
+
+desc "stop elasticsearch"
+task :stop do
+  puts "Disable elasticsearch service"
+  sh 'sudo systemctl stop elasticsearch >> /dev/null 2>&1'
+  sh 'sudo systemctl disable elasticsearch >> /dev/null 2>&1'
+end
...	...	@@ -59,18 +59,18 @@ selenium-6:
59	59	# NOOSFERO_BUNDLE_OPTS=install makes migrations fails
60	60	# probably because of rubygems-integration
61	61	plugins-1:
62		- script: SLICE=1/5 bundle exec rake test:noosfero_plugins
	62	+ script: SLICE=1/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
63	63	stage: all-tests
64	64	plugins-2:
65		- script: SLICE=2/5 bundle exec rake test:noosfero_plugins
	65	+ script: SLICE=2/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
66	66	stage: all-tests
67	67	plugins-3:
68		- script: SLICE=3/5 bundle exec rake test:noosfero_plugins
	68	+ script: SLICE=3/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
69	69	stage: all-tests
70	70	plugins-4:
71		- script: SLICE=4/5 bundle exec rake test:noosfero_plugins
	71	+ script: SLICE=4/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
72	72	stage: all-tests
73	73	plugins-5:
74		- script: SLICE=5/5 bundle exec rake test:noosfero_plugins
	74	+ script: SLICE=5/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
75	75	stage: all-tests
76	76
...	...
...	...	@@ -19,6 +19,10 @@ language: ruby
19	19	rvm:
20	20	- 2.3.1
21	21
	22	+services:
	23	+ - postgresql
	24	+ - elasticsearch
	25	+
22	26	addons:
23	27	apt:
24	28	packages:
...	...
...	...	@@ -84,7 +84,7 @@ group :cucumber do
84	84	gem 'cucumber'
85	85	gem 'cucumber-rails', '~> 1.4.2', :require => false
86	86	gem 'database_cleaner', '~> 1.3'
87		- gem 'selenium-webdriver', '>= 2.50'
	87	+ gem 'selenium-webdriver', '>= 2.53'
88	88	gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'
89	89	end
90	90
...	...
...	...	@@ -31,7 +31,7 @@ If you want to use a different port than 3000, pass `-p <PORT>` to `./script/dev
31	31	Instructions for other systems
32	32	------------------------------
33	33
34		-On other OS, you have 2 options:
	34	+On other OS, you have many options:
35	35
36	36	### 1) using a chroot or a VM with Debian stable (easier)
37	37
...	...	@@ -45,6 +45,14 @@ You can check `./script/install-dependencies/debian-squeeze.sh` to have an idea
45	45
46	46	If you write such script for your own OS, please share it with us at the development mailing list so that we can include it in the official repository. This way other people using the same OS will have to put less effort to develop Noosfero.
47	47
	48	+### 3) Installing dependencies via Rubygems and RVM
	49	+
	50	+To setup the development environment through Rubygems you just need to install some basic deps and then install the gems defined on the Gemfile. Further instructions can be found on: http://noosfero.org/bin/view/Development/DepsWithRVMAndGems
	51	+
	52	+### 4) Using a docker image
	53	+
	54	+Use a docker image to run an out-of-the-box development environment. Further information can be found on: https://hub.docker.com/r/noosfero/dev-rails4/
	55	+
48	56	Submitting your changes back
49	57	----------------------------
50	58
...	...
...	...	@@ -38,6 +38,13 @@ module Api
38	38	PERMISSIONS[current_permission] <= PERMISSIONS[permission]
39	39	end
40	40
	41	+ def self.expose_optional_field?(field, options = {})
	42	+ return false if options[:params].nil?
	43	+ optional_fields = options[:params][:optional_fields] \|\| []
	44	+ optional_fields.include?(field.to_s)
	45	+ end
	46	+
	47	+
41	48	class Image < Entity
42	49	root 'images', 'image'
43	50
...	...	@@ -166,7 +173,8 @@ module Api
166	173	community.admins.map{\|admin\| {"name"=>admin.name, "id"=>admin.id, "username" => admin.identifier}}
167	174	end
168	175	expose :categories, :using => Category
169		- expose :members, :using => Person , :if => lambda{ \|community, options\| community.display_info_to? options[:current_person] }
	176	+ expose :members_count
	177	+ expose :members, :if => lambda {\|community, options\| Entities.expose_optional_field?(:members, options)}
170	178	end
171	179
172	180	class CommentBase < Entity
...	...	@@ -213,7 +221,7 @@ module Api
213	221	expose :comments_count
214	222	expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
215	223	expose :type
216		- expose :comments, using: CommentBase, :if => lambda{\|obj,opt\| opt[:params] && ['1','true',true].include?(opt[:params][:show_comments])}
	224	+ expose :comments, using: CommentBase, :if => lambda{\|comment,options\| Entities.expose_optional_field?(:comments, options)}
217	225	expose :published
218	226	expose :accept_comments?, as: :accept_comments
219	227	end
...	...
...	...	@@ -57,9 +57,11 @@ module Api
57	57	def present_partial(model, options)
58	58	if(params[:fields].present?)
59	59	begin
60		- fields = JSON.parse(params[:fields])
	60	+ fields = JSON.parse((params.to_hash[:fields] \|\| params.to_hash['fields']).to_json)
61	61	if fields.present?
62		- options.merge!(fields.symbolize_keys.slice(:only, :except))
	62	+ fields = fields.symbolize_keys
	63	+ options.merge!(:only => fields[:only]) if fields[:only].present?
	64	+ options.merge!(:except => fields[:except]) if fields[:except].present?
63	65	end
64	66	rescue
65	67	fields = params[:fields]
...	...	@@ -116,7 +118,7 @@ module Api
116	118	def post_article(asset, params)
117	119	return forbidden! unless current_person.can_post_content?(asset)
118	120
119		- klass_type = params[:content_type] \|\| params[:article].delete(:type) \|\| TinyMceArticle.name
	121	+ klass_type = params[:content_type] \|\| params[:article].delete(:type) \|\| TextArticle.name
120	122	return forbidden! unless klass_type.constantize <= Article
121	123
122	124	article = klass_type.constantize.new(params[:article])
...	...	@@ -503,11 +505,9 @@ module Api
503	505
504	506	def parse_content_type(content_type)
505	507	return nil if content_type.blank?
506		- content_types = content_type.split(',').map do \|content_type\|
507		- content_type = content_type.camelcase
508		- content_type == 'TextArticle' ? Article.text_article_types : content_type
	508	+ content_type.split(',').map do \|content_type\|
	509	+ content_type.camelcase
509	510	end
510		- content_types.flatten.uniq
511	511	end
512	512
513	513	def period(from_date, until_date)
...	...
...	...	@@ -18,7 +18,7 @@ module Api
18	18	communities = select_filtered_collection_of(environment, 'communities', params)
19	19	communities = profiles_for_person(communities, current_person)
20	20	communities = communities.by_location(params) # Must be the last. May return Exception obj
21		- present communities, :with => Entities::Community, :current_person => current_person
	21	+ present communities, :with => Entities::Community, :current_person => current_person, :params => params
22	22	end
23	23
24	24
...	...	@@ -49,7 +49,7 @@ module Api
49	49
50	50	get ':id' do
51	51	community = profiles_for_person(environment.communities, current_person).find_by_id(params[:id])
52		- present community, :with => Entities::Community, :current_person => current_person
	52	+ present community, :with => Entities::Community, :current_person => current_person, :params => params
53	53	end
54	54
55	55	end
...	...
...	...	@@ -151,6 +151,7 @@ class CmsController < MyProfileController
151	151
152	152	@article.profile = profile
153	153	@article.author = user
	154	+ @article.editor = current_person.editor
154	155	@article.last_changed_by = user
155	156	@article.created_by = user
156	157
...	...	@@ -399,8 +400,7 @@ class CmsController < MyProfileController
399	400
400	401	def available_article_types
401	402	articles = [
402		- TinyMceArticle,
403		- TextileArticle,
	403	+ TextArticle,
404	404	Event
405	405	]
406	406	articles += special_article_types if params && params[:cms]
...	...	@@ -408,9 +408,6 @@ class CmsController < MyProfileController
408	408	if @parent && @parent.blog?
409	409	articles -= Article.folder_types.map(&:constantize)
410	410	end
411		- if user.is_admin?(profile.environment)
412		- articles << RawHTMLArticle
413		- end
414	411	articles
415	412	end
416	413
...	...
...	...	@@ -95,7 +95,7 @@ class ProfileEditorController < MyProfileController
95	95	end
96	96
97	97	def welcome_page
98		- @welcome_page = profile.welcome_page \|\| TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
	98	+ @welcome_page = profile.welcome_page \|\| TextArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
99	99	if request.post?
100	100	begin
101	101	@welcome_page.update!(params[:welcome_page])
...	...
...	...	@@ -19,6 +19,11 @@ class ProfileController < PublicController
19	19	@network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
20	20	@activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
21	21	end
	22	+
	23	+ # TODO Find a way to filter these through sql
	24	+ @network_activities = filter_private_scraps(@network_activities)
	25	+ @activities = filter_private_scraps(@activities)
	26	+
22	27	@tags = profile.article_tags
23	28	allow_access_to_page
24	29	end
...	...	@@ -231,6 +236,7 @@ class ProfileController < PublicController
231	236	@scrap = Scrap.new(params[:scrap])
232	237	@scrap.sender= sender
233	238	@scrap.receiver= receiver
	239	+ @scrap.marked_people = treat_followed_entries(params[:filter_followed])
234	240	@tab_action = params[:tab_action]
235	241	@message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
236	242	activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
...	...	@@ -253,6 +259,14 @@ class ProfileController < PublicController
253	259	end
254	260	end
255	261
	262	+ def search_followed
	263	+ result = []
	264	+ circles = find_by_contents(:circles, user, user.circles.where(:profile_type => 'Person'), params[:q])[:results]
	265	+ followed = find_by_contents(:followed, user, Profile.followed_by(user), params[:q])[:results]
	266	+ result = circles + followed
	267	+ render :text => prepare_to_token_input_by_class(result).to_json
	268	+ end
	269	+
256	270	def view_more_activities
257	271	@activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
258	272	render :partial => 'profile_activities_list', :locals => {:activities => @activities}
...	...	@@ -434,7 +448,6 @@ class ProfileController < PublicController
434	448	end
435	449	end
436	450
437		-
438	451	protected
439	452
440	453	def check_access_to_profile
...	...	@@ -480,4 +493,39 @@ class ProfileController < PublicController
480	493	render_not_found unless profile.allow_followers?
481	494	end
482	495
	496	+ def treat_followed_entries(entries)
	497	+ return [] if entries.blank? \|\| profile != user
	498	+
	499	+ followed = []
	500	+ entries.split(',').map do \|entry\|
	501	+ klass, identifier = entry.split('_')
	502	+ case klass
	503	+ when 'Person'
	504	+ followed << Person.find(identifier)
	505	+ when 'Circle'
	506	+ circle = Circle.find(identifier)
	507	+ followed += Profile.in_circle(circle)
	508	+ end
	509	+ end
	510	+ followed.uniq
	511	+ end
	512	+
	513	+ def filter_private_scraps(activities)
	514	+ activities = Array(activities)
	515	+ activities.delete_if do \|item\|
	516	+ if item.kind_of?(ProfileActivity)
	517	+ target = item.activity
	518	+ owner = profile
	519	+ else
	520	+ target = item.target
	521	+ owner = item.user
	522	+ end
	523	+ !environment.admins.include?(user) &&
	524	+ owner != user &&
	525	+ target.is_a?(Scrap) &&
	526	+ target.marked_people.present? &&
	527	+ !target.marked_people.include?(user)
	528	+ end
	529	+ activities
	530	+ end
483	531	end
...	...