Merge branch 'stable' into hotfixes

Victor Costa
2 parents ea7661fa 11166297
Showing 80 changed files with 1272 additions and 403 deletions Show diff stats
Gemfile
Gemfile.lock
Vagrantfile
app/models/environment.rb
app/models/organization.rb
debian/control
debian/noosfero.install
debian/noosfero.links
gitignore.example
lib/feed_writer.rb
plugins/dspace/controllers/dspace_plugin_controller.rb
plugins/dspace/controllers/dspace_plugin_myprofile_controller.rb
plugins/dspace/lib/dspace/collection.rb
plugins/dspace/lib/dspace/community.rb
plugins/dspace/lib/dspace/item.rb
plugins/dspace/lib/dspace/resource.rb
plugins/dspace/lib/dspace_plugin.rb
plugins/dspace/lib/dspace_plugin/bitstream.rb
plugins/dspace/lib/dspace_plugin/collection.rb
plugins/dspace/lib/dspace_plugin/collection_helper.rb
 source "https://rubygems.org"
-gem 'rails'
-gem 'fast_gettext'
-gem 'acts-as-taggable-on'
-gem 'prototype-rails'
-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
-gem 'rails_autolink'
-gem 'pg'
-gem 'rmagick'
-gem 'RedCloth'
-gem 'will_paginate'
-gem 'ruby-feedparser'
-gem 'daemons'
-gem 'thin'
-gem 'hpricot'
-gem 'nokogiri'
+gem 'rails',                    '~> 3.2.19'
+gem 'fast_gettext',             '~> 0.6.8'
+gem 'acts-as-taggable-on',      '~> 3.0.2'
+gem 'prototype-rails',          '~> 3.2.1'
+gem 'prototype_legacy_helper',  '0.0.0', :path => 'vendor/prototype_legacy_helper'
+gem 'rails_autolink',           '~> 1.1.5'
+gem 'pg',                       '~> 0.13.2'
+gem 'rmagick',                  '~> 2.13.1'
+gem 'RedCloth',                 '~> 4.2.9'
+gem 'will_paginate',            '~> 3.0.3'
+gem 'ruby-feedparser',          '~> 0.7'
+gem 'daemons',                  '~> 1.1.5'
+gem 'thin',                     '~> 1.3.1'
+gem 'hpricot',                  '~> 0.8.6'
+gem 'nokogiri',                 '~> 1.5.5'
 gem 'rake', :require => false
-gem 'grape', '0.2.1'
-gem 'rest-client'
-gem 'exception_notification'
-gem 'gettext', :require => false, :group => :development
+gem 'grape',					'~> 0.2.1'
+gem 'rest-client',              '~> 1.6.7'
+gem 'exception_notification',   '~> 4.0.1'
+gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
  
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
  
 group :production do
-  gem 'dalli'
+  gem 'dalli', '~> 2.7.0'
 end
  
 group :test do
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'mocha', :require => false
+  gem 'rspec',                  '~> 2.10.0'
+  gem 'rspec-rails',            '~> 2.10.1'
+  gem 'mocha',                  '~> 1.1.0', :require => false
 end
  
 group :cucumber do
-  gem 'cucumber-rails', :require => false
-  gem 'capybara'
-  gem 'cucumber'
-  gem 'database_cleaner'
-  gem 'selenium-webdriver'
+  gem 'cucumber-rails',         '~> 1.0.6', :require => false
+  gem 'capybara',               '~> 2.1.0'
+  gem 'cucumber',               '~> 1.0.6'
+  gem 'database_cleaner',       '~> 1.2.0'
+  gem 'selenium-webdriver',     '~> 2.39.0'
 end
  
 # include plugin gemfiles
@@ -1,206 +0,0 @@
-PATH
-  remote: vendor/prototype_legacy_helper
-  specs:
-    prototype_legacy_helper (0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
-      mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
-      builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (3.0.2)
-      rails (>= 3, < 5)
-    arel (3.0.2)
-    builder (3.0.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
-    cucumber (1.0.6)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.6)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.0.6)
-      nokogiri (>= 1.5.0)
-    daemons (1.1.5)
-    dalli (2.7.0)
-    database_cleaner (1.2.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    eventmachine (0.12.10)
-    exception_notification (4.0.1)
-      actionmailer (>= 3.0.4)
-      activesupport (>= 3.0.4)
-    fast_gettext (0.6.8)
-    ffi (1.0.11)
-    gettext (2.2.1)
-      locale
-    gherkin (2.4.21)
-      json (>= 1.4.6)
-    grape (0.2.1)
-      hashie (~> 1.2)
-      multi_json
-      multi_xml
-      rack
-      rack-mount
-    hashie (1.2.0)
-    hike (1.2.1)
-    hpricot (0.8.6)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.3)
-    locale (2.0.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.11.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    multi_xml (0.5.5)
-    nokogiri (1.5.5)
-    pg (0.13.2)
-    polyglot (0.3.3)
-    prototype-rails (3.2.1)
-      rails (~> 3.2)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
-      bundler (~> 1.0)
-      railties (= 3.2.6)
-    rails_autolink (1.1.5)
-      rails (> 3.1)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.9.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rmagick (2.13.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.10.0)
-    ruby-feedparser (0.7)
-    rubyzip (1.1.2)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.3)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    websocket (1.0.7)
-    will_paginate (3.0.3)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  acts-as-taggable-on
-  capybara
-  cucumber
-  cucumber-rails
-  daemons
-  dalli
-  database_cleaner
-  exception_notification
-  fast_gettext
-  gettext
-  grape (= 0.2.1)
-  hpricot
-  mocha
-  nokogiri
-  pg
-  prototype-rails
-  prototype_legacy_helper (= 0.0.0)!
-  rails
-  rails_autolink
-  rake
-  rest-client
-  rmagick
-  rspec
-  rspec-rails
-  ruby-feedparser
-  selenium-webdriver
-  thin
-  will_paginate
@@ -3,7 +3,7 @@
  
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "debian-wheezy"
+  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.provision :shell do |shell|
     shell.inline = 'su vagrant -c /vagrant/script/vagrant'
@@ -829,7 +829,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def notification_emails
-    [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
+    [contact_email].select(&:present?) + admins.map(&:email)
   end
  
   after_create :create_templates
@@ -135,7 +135,11 @@ class Organization &lt; Profile
   end
  
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    emails = [contact_email].select(&:present?) + admins.map(&:email)
+    if emails.empty?
+      emails << environment.contact_email
+    end
+    emails
   end
  
   def already_request_membership?(person)
@@ -9,7 +9,7 @@ Build-Depends:
  ruby-gettext,
  ruby-sqlite3,
  rake,
- rails3 (>= 3.2.6-1~),
+ rails3 (>= 3.2.19-1~),
  ruby-rspec,
  ruby-rspec-rails,
  ruby-will-paginate,
@@ -8,7 +8,6 @@ Rakefile                          usr/share/noosfero
 vendor                            usr/share/noosfero
  
 Gemfile                           usr/share/noosfero
-Gemfile.lock                      usr/share/noosfero
 debian/bundle/config              usr/share/noosfero/.bundle
  
 config/application.rb             usr/share/noosfero/config
@@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails             usr/share/noosfero/public/th
 usr/share/noosfero/public/designs/themes/noosfero   usr/share/noosfero/public/designs/themes/default
 usr/share/noosfero/public/designs/icons/tango       usr/share/noosfero/public/designs/icons/default
 usr/share/noosfero/script/noosfero-plugins          usr/sbin/noosfero-plugins
+usr/share/noosfero/Gemfile.lock                     /dev/null
@@ -43,3 +43,4 @@ debian/noosfero-apache/
 features/plugins/*
 plugins/solr/config/solr.yml
 /solr
+/Gemfile.lock
@@ -19,7 +19,7 @@ class FeedWriter
         for article in articles
           xml.item do
             xml.title(article.name)
-            xml.description(article.to_html)
+            xml.description(article.to_html(:feed => true))
             if article.created_at
               # rfc822
               xml.pubDate(article.created_at.rfc2822)
@@ -0,0 +1,33 @@
+class DspacePluginController < PublicController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def view_item
+
+    collection_id = params[:collection_id]
+    item_id = params[:id]
+
+    begin
+      @collection = DspacePlugin::Collection.find(collection_id)
+    rescue ActiveRecord::RecordNotFound
+      render_not_found
+      return
+    end
+
+    begin
+      dspace_server = @collection.parent.parent.dspace_server_url
+      @item = Dspace::Item.get_item_by_id dspace_server, item_id
+      rescue ActiveResource::UnauthorizedAccess
+      render_not_found
+      return
+    end
+
+    begin
+      @collection = DspacePlugin::Collection.find(collection_id)
+    rescue ActiveRecord::RecordNotFound
+      render_not_found
+      return
+    end
+
+  end
+
+end
@@ -0,0 +1,72 @@
+class DspacePluginMyprofileController < CmsController
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def new
+
+    @success_back_to = params[:success_back_to]
+
+    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
+    record_coming
+    @type = params[:type]
+    if @type.blank?
+      @article_types = []
+      available_article_types.each do |type|
+        @article_types.push({
+          :class => type,
+          :short_description => type.short_description,
+          :description => type.description
+        })
+      end
+      @parent_id = params[:parent_id]
+      render :action => 'select_article_type', :layout => false, :back_to => @back_to
+      return
+    else
+      refuse_blocks
+    end
+
+    raise "Invalid article type #{@type}" unless valid_article_type?(@type)
+
+    klass = @type.constantize
+    article_data = environment.enabled?('articles_dont_accept_comments_by_default') ? { :accept_comments => false } : {}
+    article_data.merge!(params[:article]) if params[:article]
+
+    if @type == 'DspacePlugin::Collection'
+      dspace_objects = article_data['dspace_collections']
+    elsif @type == 'DspacePlugin::Communityy'
+      dspace_objects = article_data['dspace_communities']
+    end
+
+    dspace_objects.each do |object|
+
+      entity = klass.new
+
+      parent = check_parent(params[:parent_id])
+
+      if parent
+        entity.parent = parent
+        parent_id = parent.id
+      end
+
+      if @type == 'DspacePlugin::Communityy'
+        entity.dspace_community_id = object['id']
+      elsif @type == 'DspacePlugin::Collection'
+        entity.dspace_community_id = article_data['dspace_community_id']
+        entity.dspace_collection_id = object['id']
+        entity.accept_comments = false
+      end
+
+      entity.name = object['name']
+      entity.profile = profile
+      entity.author = user
+      entity.last_changed_by = user
+      entity.created_by = user
+
+      entity.save!
+
+    end
+
+    redirect_to @parent.view_url
+
+  end
+
+end
@@ -0,0 +1,24 @@
+class Dspace::Collection < Dspace::Resource
+
+  def self.get_all_items_from(dspace_server, collection_id)
+    self.site = dspace_server
+    result = self.find collection_id, :params => { :expand => 'items' }
+
+    item_list = []
+
+    if result.items.count > 0
+      result.items.each { |element|
+        item = Dspace::Item.get_item_by_id dspace_server, element.id
+        item_list << item
+      }
+    end
+
+    item_list
+  end
+
+  def self.get_all_collections_from(dspace_server)
+    self.site = dspace_server
+    self.find(:all)
+  end
+
+end
@@ -0,0 +1,14 @@
+class Dspace::Community < Dspace::Resource
+
+  def self.get_all_communities_from(dspace_server)
+    self.site = dspace_server
+    self.find(:all)
+  end
+
+  def self.get_all_collections_from(dspace_server, community_id)
+    self.site = dspace_server
+    result = self.find community_id, :params => { :expand => 'collections' }
+    result.collections
+  end
+
+end
@@ -0,0 +1,89 @@
+class Dspace::Item < Dspace::Resource
+
+  def self.get_all_item_metadata_from(dspace_server, item_id)
+    self.site = dspace_server
+    result = self.find item_id, :params => { :expand => 'metadata' }
+    result.metadata
+  end
+
+  def self.get_item_by_id(dspace_server, item_id)
+    self.site = dspace_server
+    result = self.find item_id, :params => { :expand => 'metadata' }
+
+    item_metadata = Dspace::Item.get_all_item_metadata_from self.site, result.id
+
+    # author
+    metadata = item_metadata[0].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      author =  metadata.has_key?('dc.contributor.author') ? metadata['dc.contributor.author'] : nil
+    end
+
+    # issue date
+    metadata = item_metadata[3].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      issue_date = metadata.has_key?('dc.date.issued') ? metadata['dc.date.issued'] : nil
+    end
+
+    # uri
+    metadata = item_metadata[4].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      uri = metadata.has_key?('dc.identifier.uri') ? metadata['dc.identifier.uri'] : nil
+    end
+
+    # description
+    metadata = item_metadata[5].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      abstract = metadata.has_key?('dc.description') ? metadata['dc.description'] : nil
+    end
+
+    # abstract
+    metadata = item_metadata[6].attributes
+    if metadata != {}
+      metadata = Hash[[metadata.map{|k,v| v}]]
+      description = metadata.has_key?('dc.description.abstract') ? metadata['dc.description.abstract'] : nil
+    end
+
+    item = DspacePlugin::Item.new
+
+    item.id = result.id
+    item.name = result.name
+    item.author = author
+    item.issue_date = issue_date
+    item.abstract = abstract
+    item.description = description
+    item.uri = uri
+
+    ### BITSTREAMS
+
+    item_bitstreams = self.find item_id, :params => { :expand => 'bitstreams' }
+
+    bitstreams = item_bitstreams.bitstreams
+
+    bitstreams.each do |bs|
+      bitstream = DspacePlugin::Bitstream.new
+      bitstream.id = bs.attributes[:id]
+      bitstream.name = bs.attributes[:name]
+      bitstream.description = bs.attributes[:description]
+      bitstream.mimetype = bs.attributes[:mimeType]
+      bitstream.size_bytes = bs.attributes[:sizeBytes]
+      bitstream.retrieve_link = bs.attributes[:retrieveLink]
+      bitstream.format = bs.attributes[:format]
+      bitstream.link = bs.attributes[:link]
+
+      item.files << bitstream
+
+    end
+
+    if item.files.count > 0
+      item.mimetype = item.files.first.mimetype
+    end
+
+    item
+
+  end
+
+end
@@ -0,0 +1,15 @@
+class Dspace::Resource < ActiveResource::Base
+
+  class << self
+    def element_path(id, prefix_options = {}, query_options = nil)
+      prefix_options, query_options = split_options(prefix_options) if query_options.nil?
+      "#{prefix(prefix_options)}#{collection_name}/#{id}#{query_string(query_options)}"
+    end
+
+    def collection_path(prefix_options = {}, query_options = nil)
+      prefix_options, query_options = split_options(prefix_options) if query_options.nil?
+      "#{prefix(prefix_options)}#{collection_name}#{query_string(query_options)}"
+    end
+  end
+
+end
@@ -0,0 +1,36 @@
+class DspacePlugin < Noosfero::Plugin
+
+  def self.plugin_name
+      "DSpace Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that add a DSpace library feature to noosfero.")
+  end
+
+  def content_types
+    if context.respond_to?(:params) && context.params
+      types = []
+      parent_id = context.params[:parent_id]
+      types << DspacePlugin::Library if context.profile.community? && !parent_id
+      parent = parent_id ? context.profile.articles.find(parent_id) : nil
+      if parent.kind_of?(DspacePlugin::Library)
+        types << DspacePlugin::Communityy
+      elsif parent.kind_of?(DspacePlugin::Communityy)
+        types << DspacePlugin::Collection
+      end
+      types
+    else
+      [DspacePlugin::Library, DspacePlugin::Collection, DspacePlugin::Communityy]
+    end
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def self.has_admin_url?
+    false
+  end
+
+end
@@ -0,0 +1,5 @@
+class DspacePlugin::Bitstream
+
+  attr_accessor :id, :name, :description, :mimetype, :size_bytes, :retrieve_link, :format, :link
+
+end
@@ -0,0 +1,31 @@
+class DspacePlugin::Collection < Article
+
+  settings_items :dspace_collection_id, :type => :string
+  settings_items :dspace_community_id, :type => :integer
+
+  attr_accessible :dspace_collection_id, :dspace_community_id
+
+  def self.icon_name(article = nil)
+    'dspace-collection'
+  end
+
+  def self.short_description
+    _("DSpace collection")
+  end
+
+  def self.description
+    _("Defines a DSpace collection")
+  end
+
+  def to_html(options = {})
+    dspace_content = self
+    proc do
+      render :file => 'content_viewer/dspace_content', :locals => { :dspace_content => dspace_content }
+    end
+  end
+
+  def items(dspace_server, collection_id)
+    Dspace::Collection.get_all_items_from dspace_server, collection_id
+  end
+
+end
@@ -0,0 +1,14 @@
+module DspacePlugin::CollectionHelper
+
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
+    @article = article
+
+    visibility_options(article,tokenized_children) +
+    content_tag('div',
+      hidden_field_tag('article[accept_comments]', 0)
+    )
+  end
+
+end
@@ -0,0 +1,30 @@
+class DspacePlugin::Communityy < Folder
+
+  settings_items :dspace_community_id, :type => :string
+
+  attr_accessible :dspace_community_id
+
+  def self.icon_name(article = nil)
+    'dspace-community'
+  end
+
+  def self.short_description
+    _("DSpace community")
+  end
+
+  def self.description
+    _("Defines a DSpace community")
+  end
+
+  def to_html(options = {})
+    dspace_content = self
+    proc do
+      render :file => 'content_viewer/dspace_content', :locals => { :dspace_content => dspace_content }
+    end
+  end
+
+  def collections(dspace_server, community_id)
+    DspacePlugin::Collection.find(:all)
+  end
+
+end
@@ -0,0 +1,14 @@
+module DspacePlugin::CommunityyHelper
+
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
+    @article = article
+
+    visibility_options(article,tokenized_children) +
+    content_tag('div',
+      hidden_field_tag('article[accept_comments]', 0)
+    )
+  end
+
+end
@@ -0,0 +1,11 @@
+class DspacePlugin::Item
+
+  include DspacePlugin::ItemHelper
+
+  attr_accessor :id, :name, :author, :issue_date, :abstract, :description, :uri, :files, :mimetype
+
+  def initialize
+    self.files = []
+  end
+
+end
@@ -0,0 +1,90 @@
+module DspacePlugin::ItemHelper
+
+  TEXT_MIMETYPES = [ 'text/plain; charset=utf-8',
+                     'text/html',
+                     'text/xml',
+                     'text/plain',
+                     'text/html',
+                     'text/css',
+                     'text/richtext' ]
+
+  AUDIO_MIMETYPES = [ 'audio/x-pn-realaudio',
+                      'audio/x-mpeg',
+                      'audio/x-aiff',
+                      'audio/basic',
+                      'audio/x-wav' ]
+
+  DOCUMENT_MIMETYPES = [ 'application/msword',
+                         'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                         'application/vnd.oasis.opendocument.text',
+                         'application/vnd.oasis.opendocument.text-template',
+                         'application/vnd.oasis.opendocument.text-web',
+                         'application/vnd.oasis.opendocument.text-master',
+                         'application/vnd.sun.xml.writer',
+                         'application/vnd.sun.xml.writer.template',
+                         'application/vnd.sun.xml.writer.global',
+                         'application/vnd.stardivision.writer',
+                         'application/vnd.stardivision.writer-global' ]
+
+  PICTURE_MIMETYPES = [  'image/x-photo-cd',
+                         'image/x-ms-bmp',
+                         'image/jpeg',
+                         'image/gif',
+                         'image/png',
+                         'image/tiff',
+                         'application/x-photoshop',
+                         'application/postscript' ]
+
+  SPREADSHEET_MIMETYPES = [ 'application/vnd.ms-excel',
+                            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                            'application/vnd.oasis.opendocument.spreadsheet',
+                            'application/vnd.oasis.opendocument.spreadsheet-template',
+                            'application/vnd.sun.xml.calc',
+                            'application/vnd.sun.xml.calc.template',
+                            'application/vnd.sun.xml.math',
+                            'application/vnd.stardivision.calc' ]
+
+  VIDEO_MIMETYPES = [ 'video/quicktime',
+                      'video/mpeg' ]
+
+
+  def remove_slash_at_end_url(url)
+    url.gsub!(/\/$/,'') if url =~ /\/$/
+    url
+  end
+
+  def class_for_item_mimetype(mimetype)
+
+    case
+
+      when mimetype == 'application/pdf'
+        mimetype_class = 'pdf'
+
+      when TEXT_MIMETYPES.include?(mimetype)
+        mimetype_class = 'text'
+
+      when AUDIO_MIMETYPES.include?(mimetype)
+        mimetype_class = 'audio'
+
+      when DOCUMENT_MIMETYPES.include?(mimetype)
+        mimetype_class = 'document'
+
+      when PICTURE_MIMETYPES.include?(mimetype)
+        mimetype_class = 'picture'
+
+      when SPREADSHEET_MIMETYPES.include?(mimetype)
+        mimetype_class = 'spreadsheet'
+
+      when VIDEO_MIMETYPES.include?(mimetype)
+        mimetype_class = 'video'
+
+      else
+        mimetype_class = 'other'
+
+    end
+
+    "icon-#{mimetype_class}"
+
+  end
+
+end
@@ -0,0 +1,49 @@
+class DspacePlugin::Library < Folder
+
+  settings_items :dspace_server_url, :type => :string
+
+  attr_accessible :dspace_server_url
+
+  def dspace_server_url_valid
+
+    if self.dspace_server_url.blank?
+      errors.add(:dspace_server_url, _("can't be blank") )
+      return
+    end
+
+    errors.add(self.dspace_server_url, _("is not a valid URL. Please correct it and resubmit.")) unless url_valid?(self.dspace_server_url)
+  end
+
+  validate :dspace_server_url_valid
+
+  def self.icon_name(article = nil)
+    'dspace-library'
+  end
+
+  def self.short_description
+    _("DSpace library")
+  end
+
+  def self.description
+    _("Defines a DSpace library")
+  end
+
+  def to_html(options = {})
+    dspace_content = self
+    proc do
+      render :file => 'content_viewer/dspace_content', :locals => { :dspace_content => dspace_content }
+    end
+  end
+
+  def communities
+    DspacePlugin::Communityy.find(:all)
+  end
+
+  protected
+
+  def url_valid?(url)
+    url = URI.parse(url) rescue false
+    url.kind_of?(URI::HTTP) || url.kind_of?(URI::HTTPS)
+  end
+
+end
@@ -0,0 +1,14 @@
+module DspacePlugin::LibraryHelper
+
+  include ArticleHelper
+
+  def custom_options_for_article(article,tokenized_children)
+    @article = article
+
+    visibility_options(article,tokenized_children) +
+    content_tag('div',
+      hidden_field_tag('article[accept_comments]', 0)
+    )
+  end
+
+end
@@ -0,0 +1,85 @@
+/**
+
+function selectCommunity(element, community_slug) {
+  var hidden_field = jQuery('<input>').attr({
+      id: 'article_dspace_community_name_',
+      name: 'article[dspace_communities_names][]',
+      type: 'hidden',
+      name: 'article[dspace_communities_names][]',
+      value: community_slug
+  });
+  jQuery(hidden_field).insertAfter(element);
+}
+
+
+function selectCollection(element, collection_slug) {
+  var hidden_field = jQuery('<input>').attr({
+      id: 'article_dspace_collection_name_',
+      name: 'article[dspace_collections_names][]',
+      type: 'hidden',
+      name: 'article[dspace_collections_names][]',
+      value: collection_slug
+  });
+  jQuery(hidden_field).insertAfter(element);
+}
+
+function select_action(field_active) {
+}
+**/
+
+jQuery(document).ready(function() {
+  url_base = window.location.protocol + '//' + window.location.host;
+  forms = jQuery('form');
+  forms.each( function(f) {
+    url_action = forms[f].action;
+    if (url_action.indexOf("/cms/new") > -1) {
+      forms[f].action = url_action.replace("/cms/new", "/plugin/dspace/new").replace(url_base,'');
+    }
+  });
+
+  function check_fields(check, table_id) {
+    var checkboxes = jQuery("#" + table_id + " tbody tr td input[type='checkbox']")
+    for (var i = 0; i < checkboxes.length; i++) {
+      if (checkboxes[i].disabled == false) {
+        checkboxes[i].checked = check
+      }
+    }
+  }
+
+  function verify_checked(field_id){
+    var checkboxes = jQuery("#" + field_id + "_fields_conf tbody tr td input[type='checkbox']")
+    var allchecked = true;
+    for (var j = 1; j < checkboxes.length; j++) {
+      if(!checkboxes[j].checked) {
+        allchecked = false;
+        break;
+      }
+    }
+
+    var checkbox = jQuery("#" + field_id + "_active");
+    checkbox.attr("checked", allchecked);
+  }
+
+
+  function check_all(field_id) {
+    jQuery("#" + field_id + "_active").click(function (){
+      check_fields(this.checked, field_id + "_fields_conf")
+    });
+    verify_checked(field_id);
+  }
+
+  check_all("community");
+  check_all("collection");
+
+  jQuery("input[type='checkbox']").click(function () {
+    var checkbox = jQuery(this).attr("id").split("_");
+    verify_checked(checkbox.first());
+
+    if(this.checked == false) {
+      jQuery("#" + checkbox.first() + "_" + checkbox.last()).attr("checked", false)
+    }
+
+    jQuery(this).next().attr("disabled", !this.checked);
+  })
+
+});
@@ -0,0 +1,101 @@
+#dspace_library ul {
+  margin: 0;
+  padding: 0 0 0 5px;
+}
+
+#dspace_library li {
+  /**list-style-image: url(/designs/themes/base/imgs/li-recent.gif);*/
+  list-style-type: none;
+}
+
+#dspace_library li.item,
+#dspace_library li.collection,
+#dspace_library li.community {
+  margin: 0;
+  padding: 10px 0;
+}
+
+#dspace_library li.item span.name,
+#dspace_library li.collection span.title,
+#dspace_library li.community span.title {
+  font-weight: bold;
+}
+
+#dspace_library div#actions {
+  margin: 10px 0;
+}
+
+#dspace_library_item {
+  /*8border: 1px solid green;*/
+}
+
+.dspace_item_section {
+  margin: 15px;
+}
+
+.dspace_item_section_title {
+  margin: 0px;
+  font-weight: bold;
+  border-bottom: 1px solid #c0c0c0;
+}
+
+#dspace_library_item ul {
+  list-style-type: none;
+}
+
+#dspace_library_item ul#item_files_list,
+#dspace_library_item ul.item_file_attributes_list {
+  margin: 0;
+  padding: 0;
+}
+
+#dspace_library_item ul#item_files_list > li {
+  margin: 5px 0;
+}
+
+.icon-newdspace-library,
+.icon-dspace-library,
+.icon-newdspace-community,
+.icon-dspace-community,
+.icon-newdspace-collection,
+.icon-dspace-collection {
+  background-image: url(/plugins/dspace/icons/dspace.png)
+}
+
+#dspace_library div.icon-item {
+  width: 32px;
+  height: 33px;
+  display: inline-block;
+  vertical-align: top;
+  border-right: 1px solid #c0c0c0;
+}
+
+#dspace_library div.icon-audio {
+  background-image: url(/plugins/dspace/icons/audio.png)
+}
+
+#dspace_library div.icon-document {
+  background-image: url(/plugins/dspace/icons/document.png)
+}
+
+#dspace_library div.icon-pdf {
+  background-image: url(/plugins/dspace/icons/pdf.png)
+}
+
+#dspace_library div.icon-picture {
+  background-image: url(/plugins/dspace/icons/picture.png)
+}
+
+#dspace_library div.icon-spreadsheet {
+  background-image: url(/plugins/dspace/icons/spreadsheet.png)
+}
+
+#dspace_library div.icon-text,
+#dspace_library div.icon-other {
+  background-image: url(/plugins/dspace/icons/text.png)
+}
+
+#dspace_library div.icon-video {
+  background-image: url(/plugins/dspace/icons/video.png)
+}
+
@@ -0,0 +1,50 @@
+<h1><%= _('DSpace Collections') %></h1>
+
+<%= hidden_field_tag 'article[parent_id]', @article.parent_id %>
+
+<%= hidden_field_tag 'article[dspace_community_id]', @article.parent.dspace_community_id %>
+
+<% dspace_server_url = @article.parent.parent.dspace_server_url %>
+
+<% community_id = @article.parent.dspace_community_id %>
+
+<% collections = Dspace::Community.get_all_collections_from( dspace_server_url, community_id ).map { |collection| item = [_(collection.name), collection.id] } %>
+
+<table id="collection_fields_conf" border="0" style="border-bottom: 1px solid #c0c0c0;">
+  <tr style="background-color: #f0f0f0; border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;">
+    <td style="font-style: italic">
+      <%= _("Check/Uncheck All Unlocked")%>
+    </td>
+    <td align="center">
+      <input type="checkbox" id="collection_active" />
+    </td>
+  </tr>
+
+  <% dspace_collections_ids = DspacePlugin::Collection.find(:all, :conditions => { :parent_id => @article.parent_id}).map { |collection| ids = collection.dspace_collection_id.to_i } %>
+
+  <% collections.each do |collection| %>
+
+  <tr>
+    <td>
+      <%= collection[0] %>
+    </td>
+
+    <% if dspace_collections_ids.include? collection[1] %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_collections][][id]", collection[1], true, :disabled => 'disabled', :id => "collection_id_#{collection[1]}" %>
+      <%= hidden_field_tag "article[dspace_collections][][name]", collection[0], :disabled => 'disabled' %>
+    </td>
+    <% else %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_collections][][id]", collection[1], false, :id => "collection_id_#{collection[1]}" %>
+     <%= hidden_field_tag "article[dspace_collections][][name]", collection[0], :disabled => 'disabled', :id => "collection_name_#{collection[1]}" %>
+    </td>
+    <% end %>
+
+  </tr>
+
+  <% end %>
+
+</table>
+
+<%= javascript_include_tag 'plugins/dspace/javascripts/dspace_plugin' %>
@@ -0,0 +1,46 @@
+<h1><%= _('DSpace Communities') %></h1>
+
+<%= hidden_field_tag 'article[parent_id]', @article.parent_id %>
+
+<% dspace_server_url = @article.parent.dspace_server_url %>
+
+<% communities = Dspace::Community.get_all_communities_from(dspace_server_url).map { |community| item = [_(community.name), community.id] } %>
+
+<table id="community_fields_conf" border="0" style="border-bottom: 1px solid #c0c0c0;">
+  <tr style="background-color: #f0f0f0; border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;">
+    <td style="font-style: italic">
+      <%= _("Check/Uncheck All Unlocked")%>
+    </td>
+    <td align="center">
+      <input type="checkbox" id="community_active" />
+    </td>
+  </tr>
+
+  <% dspace_communities_ids = DspacePlugin::Communityy.find(:all, :conditions => { :parent_id => @article.parent_id }).map { |community| ids = community.dspace_community_id.to_i } %>
+
+  <% communities.each do |community| %>
+
+  <tr>
+    <td>
+      <%= community[0] %>
+    </td>
+
+    <% if dspace_communities_ids.include? community[1] %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_communities][][id]", community[1], true, :disabled => 'disabled', :id => "community_id_#{community[1]}" %>
+      <%= hidden_field_tag "article[dspace_communities][][name]", community[0], :disabled => 'disabled' %>
+    </td>
+    <% else %>
+    <td align="center">
+      <%= check_box_tag "article[dspace_communities][][id]", community[1], false, :id => "community_id_#{community[1]}" %>
+      <%= hidden_field_tag "article[dspace_communities][][name]", community[0], :disabled => 'disabled', :id => "community_name_#{community[1]}" %>
+    </td>
+    <% end %>
+
+  </tr>
+
+  <% end %>
+
+</table>
+
+<%= javascript_include_tag 'plugins/dspace/javascripts/dspace_plugin' %>
@@ -0,0 +1,11 @@
+<h1><%= _('My DSpace Library') %></h1>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
+
+<%= required f.text_field(:dspace_server_url, :size => '150', :maxlength => 150) %>
+
+<%= render :partial => 'general_fields' %>
+
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 68, :rows => 10)) %>
@@ -0,0 +1,3 @@
+<li class="collection">
+  <span class="title"><%= link_to collection.name, :controller => 'content_viewer', :action => 'view_page', :page => collection.path %></span>
+</li>
@@ -0,0 +1,3 @@
+<li class="community">
+  <span class="title"><%= link_to community.title, :controller => 'content_viewer', :action => 'view_page', :page => community.path %></span>
+</li>
@@ -0,0 +1,9 @@
+<li class="item">
+  <div style="vertical-align: top;">
+    <div class="icon-item <%= item.class_for_item_mimetype(item.mimetype) %>"></div>
+    <div style="display: inline-block; width: 92%;">
+      <span class="name"><%= link_to item.name, :controller => 'dspace_plugin', :action => 'view_item', :id => item.id, :collection_id => @page.id %></span><br />
+      <span class="authors"><%= item.author %></span> <span class="date_issued">(<%= item.issue_date %>)</span>
+    </div>
+  </div>
+</li>
@@ -0,0 +1,59 @@
+<div id="dspace_library">
+
+  <% if dspace_content.allow_create?(user) %>
+
+  <div id="actions">
+
+    <% if dspace_content.is_a? DspacePlugin::Library %>
+
+      <%= content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "DspacePlugin::Communityy", :parent_id => dspace_content.id}), :class => 'button with-text icon-add') do %>
+        <%= _("Add %s") % DspacePlugin::Communityy.short_description %>
+      <% end %>
+
+    <% elsif dspace_content.is_a? DspacePlugin::Communityy %>
+
+      <%= content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "DspacePlugin::Collection", :parent_id => dspace_content.id}), :class => 'button with-text icon-add') do %>
+        <%= _("Add %s") % DspacePlugin::Collection.short_description %>
+      <% end %>
+
+    <% end %>
+
+  </div>
+
+  <% end %>
+
+  <% if dspace_content.is_a? DspacePlugin::Library %>
+
+    <% communities = dspace_content.communities %>
+
+  <ul id="communities_list">
+    <%= render :partial => 'community', :collection => communities %>
+  </ul>
+
+  <% elsif dspace_content.is_a? DspacePlugin::Communityy %>
+
+    <% community_id = dspace_content.dspace_community_id %>
+    <% dspace_server = dspace_content.parent.dspace_server_url %>
+
+    <% collections = dspace_content.collections dspace_server, community_id %>
+
+  <ul id="collections_list">
+    <%= render :partial => 'collection', :collection => collections %>
+  </ul>
+
+  <% elsif dspace_content.is_a? DspacePlugin::Collection %>
+
+    <% collection_id = dspace_content.dspace_collection_id %>
+    <% dspace_server = dspace_content.parent.parent.dspace_server_url %>
+
+    <div id="dspace_library">
+      <div id="dspace_collection">
+        <ul id="items_list">
+          <%= render :partial => 'item', :collection => dspace_content.items(dspace_server, collection_id) %>
+        </ul>
+      </div>
+    </div>
+
+  <% end %>
+
+</div>
@@ -0,0 +1,12 @@
+<li>
+  <ul class="item_file_attributes_list">
+    <li>
+      <span><%= _('File:') %></span> <%= link_to item_file.name, dspace_server_url + item_file.retrieve_link, :target => '_blank' %></li>
+    <% unless item_file.description.blank? %>
+    <li>
+      <span><%= _('Description:') %> </span> <%= item_file.description %></li>
+    <% end %>
+    <li>
+      <span><%= _('Size:') %> </span> <%= number_to_human_size( item_file.size_bytes ) %></li>
+  </ul>
+</li>
@@ -0,0 +1,8 @@
+<div class="dspace_item_section">
+  <div class="dspace_item_section_title">
+   <%= item_section[:title] %>
+  </div>
+  <div class="dspace_item_section_content">
+    <%= item_section[:content] %>
+  </div>
+</div>
@@ -0,0 +1,28 @@
+<% extend DspacePlugin::ItemHelper %>
+
+<div id="article-parent">
+  <%= button(:back, _('Go back to %s') % @collection.short_title, @collection.url) %>
+</div>
+
+<div id="dspace_library_item">
+
+  <div id="dspace_item_title">
+    <h1 class="title"><%= @item.name %></h1>
+  </div>
+
+  <% item_files = render :partial => 'item_file',
+               :locals => { :dspace_server_url => remove_slash_at_end_url(@collection.parent.parent.dspace_server_url) },
+               :collection => @item.files %>
+
+  <% item_files_content = content_tag('ul', item_files, :id => 'item_files_list') %>
+
+
+  <%= render :partial => 'item_section',
+             :collection => [ { :title => _('Authors:'), :content => @item.author },
+                              { :title => _('Issue date:'), :content => @item.issue_date },
+                              { :title => _('Abstract:'), :content => @item.abstract },
+                              { :title => _('Description:'), :content => @item.description },
+                              { :title => _('URI:'), :content => link_to(@item.uri, @item.uri, :target => '_blank') },
+                              { :title => _('Files in this item'), :content => item_files_content } ] %>
+
+</div>
@@ -20,6 +20,12 @@ class ProposalsDiscussionPluginPublicController &lt; ApplicationController
     case order
     when 'alphabetical'
       proposals.reorder('name')
+    when 'recent'
+      proposals.reorder('created_at DESC')
+    when 'most_commented'
+      proposals.reorder('comments_count DESC')
+    when 'most_recently_commented'
+      proposals.joins("LEFT OUTER JOIN comments ON comments.source_id=articles.id AND comments.created_at >= '#{5.days.ago}'").group('articles.id').reorder('count(comments.id) DESC')
     else
       set_seed
       proposals.reorder('random()')
 class ProposalsDiscussionPlugin::Discussion < Folder
  
+  acts_as_having_posts
+
   has_many :topics, :class_name => 'ProposalsDiscussionPlugin::Topic', :foreign_key => 'parent_id'
   has_many :proposals, :class_name => 'ProposalsDiscussionPlugin::Proposal', :through => :children, :source => :children
  
@@ -26,4 +28,9 @@ class ProposalsDiscussionPlugin::Discussion &lt; Folder
   end
   alias_method_chain :cache_key, :person
  
+  def posts
+    #override posts method to list proposals in feed
+    ProposalsDiscussionPlugin::Proposal.from_discussion(self)
+  end
+
 end
 class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
  
   scope :private, lambda {|user| {:conditions => {:last_changed_by_id => user.id, :published => false}}}
+  scope :from_discussion, lambda {|discussion| joins(:parent).where(['parents_articles.parent_id = ?', discussion.id])}
  
   alias :topic :parent
  
@@ -16,8 +17,12 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
  
  
   def to_html(options = {})
-    proc do
-      render :file => 'content_viewer/proposal'
+    unless options[:feed]
+      proc do
+        render :file => 'content_viewer/proposal'
+      end
+    else
+      body
     end
   end
  
@@ -38,4 +43,8 @@ class ProposalsDiscussionPlugin::Proposal &lt; TinyMceArticle
   end
   alias_method_chain :cache_key, :person
  
+  def can_display_versions?
+    false
+  end
+
 end
@@ -1,8 +0,0 @@
-module ProposalsDiscussionPlugin::ProposalHelper
-
-  def visibility_options(article, tokenized_children)
-    article.published = false if article.new_record?
-    super
-  end
-
-end
 module ProposalsDiscussionPlugin::ProposalsListHelper
  
+  def sort_criteria
+    [[_('Random'), :random], [_('Alphabetical'), :alphabetical], [_('Recent'), :recent], [_('Most Commented'), :most_commented], [_('Most Recently Commented'), :most_recently_commented]]
+  end
+
   def more_proposals(text, holder, order, page=1)
     link_to text, url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order, :page => page })
   end
@@ -44,11 +44,21 @@ class ProposalsDiscussionPlugin::Topic &lt; Folder
   end
  
   def proposals_per_day
-    proposals.group("date(created_at)").count
+    result = proposals.group("date(created_at)").count
+    fill_empty_days(result)
   end
  
   def comments_per_day
-    proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
+    result = proposals.joins(:comments).group('date(comments.created_at)').count('comments.id')
+    fill_empty_days(result)
+  end
+
+  def fill_empty_days(result)
+    from = created_at.to_date
+    (from..Date.today).inject({}) do |h, date|
+      h[date.to_s] = result[date.to_s] || 0
+      h
+    end
   end
  
   def cache_key_with_person(params = {}, user = nil, language = 'en')
@@ -0,0 +1,12 @@
+module ProposalsDiscussionPlugin::TopicHelper
+
+  def topic_title(topic)
+    image_icon = topic.image ?  image_tag(topic.image.public_filename(:thumb), :class => 'disable-zoom') : ''
+
+    content_tag(:div, (
+      content_tag(:div, '', :class=>'topic-color', :style => "background-color: #{topic.color};") +
+        content_tag(:h2, link_to(image_icon + content_tag(:span, topic.title), topic.view_url))
+    ), :class => 'topic-title')
+  end
+
+end
@@ -1,53 +0,0 @@
-(function basic_time(container) {
-
-  var
-    d1    = [],
-    start = new Date("2009/01/01 01:00").getTime(),
-    options,
-    graph,
-    i, x, o;
-
-  for (i = 0; i < 100; i++) {
-    x = start+(i*1000*3600*24*36.5);
-    d1.push([x, i+Math.random()*30+Math.sin(i/20+Math.random()*2)*20+Math.sin(i/10+Math.random())*10]);
-  }
-        
-  options = {
-    xaxis : {
-      mode : 'time', 
-      labelsAngle : 45
-    },
-    selection : {
-      mode : 'x'
-    },
-    HtmlText : false,
-    title : 'Time'
-  };
-        
-  // Draw graph with default options, overwriting with passed options
-  function drawGraph (opts) {
-
-    // Clone the options, so the 'options' variable always keeps intact.
-    o = Flotr._.extend(Flotr._.clone(options), opts || {});
-
-    // Return a new graph.
-    return Flotr.draw(
-      container,
-      [ d1 ],
-      o
-    );
-  }
-
-  graph = drawGraph();      
-        
-  Flotr.EventAdapter.observe(container, 'flotr:select', function(area){
-    // Draw selected area
-    graph = drawGraph({
-      xaxis : { min : area.x1, max : area.x2, mode : 'time', labelsAngle : 45 },
-      yaxis : { min : area.y1, max : area.y2 }
-    });
-  });
-        
-  // When graph is clicked, draw the graph with default area.
-  Flotr.EventAdapter.observe(container, 'flotr:click', function () { graph = drawGraph(); });
-})(document.getElementById("editor-render-0"));
@@ -10,9 +10,9 @@ jQuery(document).ready(function($) {
   });
  
   function proposalsScroll() {
-    var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list');
+    var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals');
     var nextSelector = 'div.more a';
-    if(scroll.data('jscroll')) scroll.jscroll.destroy();
+    if(scroll.data('jscroll')) scroll.data('jscroll', null);
  
     if(scroll.find(nextSelector).length > 0) {
       scroll.jscroll({
@@ -31,6 +31,12 @@ jQuery(document).ready(function($) {
     $('.topics').masonry();
   });
   $('.topics').masonry();
+  $(window).resize(function() {
+    $('.topics').masonry();
+  });
+  $(window).bind('toggleFullwidth', function() {
+    $('.topics').masonry();
+  });
 });
  
 function loadSocialButtons() {
@@ -156,11 +156,14 @@ form .proposals-discussion-plugin .body textarea {
 #content .topic-item h2 a, #article .article-body-proposals-discussion-plugin_topic h2 a,
 #content .topic h2 a {
   text-decoration: none;
-  padding: 10px;
   display: inline-block;
   width: 94%;
   color: white;
 }
+#content .topic-title h2 span {
+  padding: 10px;
+  display: inline-block;
+}
 .topic-item .topic-content, #article .article-body-proposals-discussion-plugin_topic .topic-content {
   padding: 5px 7px 5px 2px;
 }
@@ -177,7 +180,7 @@ form .proposals-discussion-plugin .body textarea {
   margin: 1px 0 0 0;
 }
  
-#content .tag_cloud a {
+#content .article-body-proposals-discussion-plugin_topic .tag_cloud a {
   text-decoration: none;
 }
  
@@ -199,7 +202,7 @@ form .proposals-discussion-plugin .body textarea {
 #content .statistics h5 {
   color: rgb(95, 95, 95);
 }
-#content .tag_cloud {
+#content .article-body-proposals-discussion-plugin_topic .tag_cloud {
   float: right;
   width: 300px;
   box-shadow: 5px 5px 5px -2px #ddd;
@@ -219,3 +222,13 @@ form .proposals-discussion-plugin .body textarea {
   clear: both;
   padding-top: 10px;
 }
+
+.proposal .actions .fb-share-button {
+  top: -3px;
+}
+
+.topic-title h2 img {
+  max-height: 36px;
+  vertical-align: middle;
+  padding: 4px 0 4px 4px;
+}
@@ -35,4 +35,48 @@ class ProposalsDiscussionPluginPublicControllerTest &lt; ActionController::TestCase
     assert_equal [proposal2, proposal3, proposal1], assigns(:proposals)
   end
  
+  should 'load proposals with most commented order' do
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal1', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal2', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal3', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+
+    author = fast_create(Person)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+
+    get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'most_commented'
+    assert_equal [proposal2, proposal3, proposal1], assigns(:proposals)
+  end
+
+  should 'load proposals with most recent order' do
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'z', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'b', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'k', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+
+    author = fast_create(Person)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal2, :body => 'text', :author => author)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+
+    get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'recent'
+    assert_equal [proposal3, proposal2, proposal1], assigns(:proposals)
+  end
+
+  should 'load proposals with most recently commented order' do
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal1', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal2', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal3', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+
+    author = fast_create(Person)
+    Comment.create!({:source => proposal2, :body => 'text', :author => author, :created_at => 10.days.ago}, :without_protection => true)
+    Comment.create!({:source => proposal2, :body => 'text', :author => author, :created_at => 10.days.ago}, :without_protection => true)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+    Comment.create!(:source => proposal3, :body => 'text', :author => author)
+    Comment.create!(:source => proposal1, :body => 'text', :author => author)
+
+    get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'most_recently_commented'
+    assert_equal [proposal3, proposal1, proposal2], assigns(:proposals)
+  end
+
 end
@@ -29,4 +29,26 @@ class ProposalTest &lt; ActiveSupport::TestCase
     assert !proposal.allow_edit?(fast_create(Person))
   end
  
+  should 'return body when to_html was called with feed=true' do
+    assert_equal proposal.body, proposal.to_html(:feed => true)
+  end
+
+  should 'return a proc when to_html was called with feed=false' do
+    assert proposal.to_html(:feed => false).kind_of?(Proc)
+  end
+
+  should 'return a proc when to_html was called with no feed parameter' do
+    assert proposal.to_html.kind_of?(Proc)
+  end
+
+  should 'return proposals by discussion' do
+    discussion = fast_create(ProposalsDiscussionPlugin::Discussion)
+    topic = fast_create(ProposalsDiscussionPlugin::Topic, :parent_id => discussion.id)
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :parent_id => topic.id)
+
+    assert_equivalent [proposal1, proposal3], ProposalsDiscussionPlugin::Proposal.from_discussion(discussion)
+  end
+
 end
@@ -5,7 +5,14 @@
 <% title_limit = 70 %>
 <% abstract_limit = 140 %>
  
+<% extend ProposalsDiscussionPlugin::TopicHelper %>
+
 <div class="proposals-discussion-plugin">
+
+  <div class="topic">
+    <%= topic_title @article.topic %>
+  </div>
+
   <div class="title">
     <%= required labelled_form_field _('Title'), limited_text_area(:article, :name, title_limit, 'title_textarea', :rows => 1) %>
   </div>
@@ -11,3 +11,8 @@
  
 <%= labelled_colorpicker_field(_('Color:'), :article, :color) %>
 <span id="color_preview" class = "color_marker" style="background-color: <%= @article.color %>" ></span>
+
+<%= f.fields_for :image_builder, @article.image do |i| %>
+  <%= file_field_or_thumbnail(_('Image:'), @article.image, i)%>
+  <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+<% end %>
@@ -12,7 +12,7 @@
 <% order ||= 'random' %>
 <div class="proposals_list">
   <div class="filters">
-    <% [[_('Random'), :random], [_('Aplhabetical'), :alphabetical]].each_with_index do |order, i| %>
+    <% sort_criteria.each_with_index do |order, i| %>
       <%= link_to order.first, url_for({:controller => 'proposals_discussion_plugin_public', :action => 'load_proposals', :holder_id => holder.id, :profile => profile.identifier, :order => order.second}), :remote => true, :class => "order #{order.second} #{i==0 ? 'selected':''}" %>
     <% end %>
   </div>
 <a href="https://twitter.com/share" class="twitter-share-button" data-url="<%= url_for proposal.view_url %>" data-text="<%= proposal.title %>" data-count="none"></a>
  
-<div class="fb-share-button" data-href="<%= url_for proposal.view_url %>" data-layout="box-count"></div>
+<div class="fb-share-button" data-href="<%= url_for proposal.view_url %>"></div>
 <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
  
+<%= add_rss_feed_to_head(@page.name, @page.feed.url) if @page.feed %>
+
 <div class="description">
   <%= @page.body %>
 </div>
@@ -2,9 +2,10 @@
   <h5><%= @page.topic.discussion.title %> </h5>
 </div>
  
+<% extend ProposalsDiscussionPlugin::TopicHelper %>
+
 <div class="topic">
-  <div class="topic-color" style="background-color: <%= @page.topic.color %>;"></div>
-  <h2><%= link_to @page.topic.title, @page.topic.view_url %></h2>
+  <%= topic_title @page.topic %>
 </div>
  
 <div class="title">
@@ -4,8 +4,8 @@
   <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
 <% end %>
  
-<div class="topic-color" style="background-color: <%= topic.color %>;"></div>
-<h2><%= link_to topic.title, topic.view_url %></h2>
+<% extend ProposalsDiscussionPlugin::TopicHelper %>
+<%= topic_title topic %>
  
 <div class="topic-content">
  
@@ -16,7 +16,7 @@
     <h3><%= _('Select topic') %></h3>
     <div id="topics">
  
-      <% @discussion.children.each do |topic| %>
+      <% @discussion.topics.each do |topic| %>
         <h4>
           <%= radio_button_tag('discussion[topic]', topic.id) %>
           <%= topic.title %>
@@ -1037,7 +1037,7 @@ jQuery(document).ready(function(){
 function apply_zoom_to_images(zoom_text) {
   jQuery(function($) {
     $(window).load( function() {
-      $('#article .article-body img').each( function(index) {
+      $('#article .article-body img:not(.disable-zoom)').each( function(index) {
         var original = original_image_dimensions($(this).attr('src'));
         if ($(this).width() < original['width'] || $(this).height() < original['height']) {
           $(this).wrap('<div class="zoomable-image" />');
@@ -1083,6 +1083,7 @@ function toggle_fullwidth(itemId){
     jQuery("#fullscreen-btn").hide()
     fullwidth = true;
   }
+  jQuery(window).trigger("toggleFullwidth", fullwidth);
 }
  
 function fullscreenPageLoad(itemId){
@@ -50,6 +50,13 @@ FPQAoNmiMgP6zGF9rgOEWMEiFEryayrz
 EOF
 fi
  
+if test -f tmp/debian/Release.gpg; then
+  echo "deb file://$(pwd)/tmp/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list
+  sudo apt-key add tmp/debian/signing-key.asc
+else
+  sudo rm -f /etc/apt/sources.list.d/local.list
+fi
+
 run sudo apt-get update
 run sudo apt-get -qy dist-upgrade
  
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+export DEBIAN_INTERFACE=noninteractive
+
+#run sudo apt-get update
+#run sudo apt-get dist-upgrade -qy
+
+run sudo apt-get install -qy dctrl-tools
+
+packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e 's/([^)]*)//g; s/,\s*/\n/g' | grep -v 'rake\|ruby\|thin\|debhelper\|cucumber\|rail\|memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent')
+
+run sudo apt-get install -qy ruby1.9.1-full build-essential libxml2-dev libxslt-dev libpq-dev libmagickcore-dev libmagickwand-dev $packages
+
+
+export GEM_HOME=$(ruby -e 'puts Gem.user_dir')
+export PATH="${GEM_HOME}/bin:${PATH}"
+(gem list | grep bundler) || run gem install --no-rdoc --no-ri bundler
+run bundle install
+
+sudo tee /etc/profile.d/rubygems-path.sh <<EOF
+export GEM_HOME=\$(ruby -e 'puts Gem.user_dir')
+PATH="\${GEM_HOME}/bin:\${PATH}"
+EOF
@@ -174,7 +174,11 @@ module Noosfero::Factory
   ###############################################
  
   def defaults_for_environment
-    { :name => 'Environment ' + factory_num_seq.to_s }
+    seq = factory_num_seq
+    {
+      :name => "Environment %d" % seq,
+      :contact_email => "environment%d@example.com" % seq
+    }
   end
  
   ###############################################
@@ -78,7 +78,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
  
   should 'actually add friend' do
     login_as(@profile.identifier)
-    person = fast_create(Person)
+    person = create_user.person
     assert_difference 'AddFriend.count' do
       post :add, :profile => person.identifier
     end
@@ -366,10 +366,10 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert profile.memberships.include?(community), 'profile should be actually added to the community'
   end
  
-  should 'create task when join to closed organization with members' do
+  should 'create a task when joining a closed organization with members' do
     community = fast_create(Community)
     community.update_attribute(:closed, true)
-    admin = fast_create(Person)
+    admin = create_user.person
     community.add_member(admin)
  
     login_as profile.identifier
@@ -587,7 +587,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should "leave a scrap on another profile" do
     login_as(profile.identifier)
     count = Scrap.count
-    another_person = fast_create(Person)
+    another_person = create_user.person
     assert another_person.scraps_received.empty?
     post :leave_scrap, :profile => another_person.identifier, :scrap => {:content => 'something'}
     assert_equal count + 1, Scrap.count
@@ -645,7 +645,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should "the sender be the logged user by default" do
     login_as(profile.identifier)
     count = Scrap.count
-    another_person = fast_create(Person)
+    another_person = create_user.person
     post :leave_scrap, :profile => another_person.identifier, :scrap => {:content => 'something'}
     last = Scrap.last
     assert_equal profile, last.sender
@@ -654,7 +654,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
  should "the receiver be the current profile by default" do
     login_as(profile.identifier)
     count = Scrap.count
-    another_person = fast_create(Person)
+    another_person = create_user.person
     post :leave_scrap, :profile => another_person.identifier, :scrap => {:content => 'something'}
     last = Scrap.last
     assert_equal another_person, last.receiver
@@ -686,8 +686,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'not display activities of the current profile when he is not followed by the viewer' do
-    p1= fast_create(Person)
-    p2= fast_create(Person)
+    p1= create_user.person
+    p2= create_user.person
  
     UserStampSweeper.any_instance.stubs(:current_user).returns(p1)
     scrap1 = create(Scrap, defaults_for_scrap(:sender => p1, :receiver => p2))
@@ -714,9 +714,9 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'not see the friends activities in the current profile' do
-    p2= fast_create(Person)
+    p2 = create_user.person
     assert !profile.is_a_friend?(p2)
-    p3= fast_create(Person)
+    p3 = create_user.person
     p3.add_friend(profile)
     assert p3.is_a_friend?(profile)
     ActionTracker::Record.destroy_all
@@ -737,13 +737,13 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'see all the activities in the current profile network' do
-    p1= fast_create(Person)
-    p2= fast_create(Person)
+    p1= create_user.person
+    p2= create_user.person
     assert !p1.is_a_friend?(p2)
  
-    p3= fast_create(Person)
+    p3= create_user.person
     p3.add_friend(p1)
-    assert p3.is_a_friend?(p1)
+    p1.add_friend(p3)
  
     ActionTracker::Record.delete_all
  
@@ -759,27 +759,21 @@ class ProfileControllerTest &lt; ActionController::TestCase
     create(Scrap, defaults_for_scrap(:sender => p3, :receiver => p1))
     a3 = ActionTracker::Record.last
  
-    @controller.stubs(:logged_in?).returns(true)
-    user = mock()
-    user.stubs(:person).returns(p3)
-    user.stubs(:login).returns('some')
-    @controller.stubs(:current_user).returns(user)
-    Person.any_instance.stubs(:follows?).returns(true)
-
     process_delayed_job_queue
-    get :index, :profile => p1.identifier
  
+    login_as p3.user.login
+    get :index, :profile => p1.identifier
     assert_equivalent [a1,a3].map(&:id), assigns(:network_activities).map(&:id)
   end
  
   should 'the network activity be visible only to profile followers' do
-    p1= fast_create(Person)
-    p2= fast_create(Person)
+    p1= create_user.person
+    p2= create_user.person
     assert !p1.is_a_friend?(p2)
  
-    p3= fast_create(Person)
+    p3= create_user.person
     p3.add_friend(p1)
-    assert p3.is_a_friend?(p1)
+    p1.add_friend(p3)
  
     ActionTracker::Record.delete_all
  
@@ -795,24 +789,11 @@ class ProfileControllerTest &lt; ActionController::TestCase
     create(Scrap, defaults_for_scrap(:sender => p3, :receiver => p1))
     a3 = ActionTracker::Record.last
  
-    @controller.stubs(:logged_in?).returns(true)
-    user = mock()
-    user.stubs(:person).returns(p2)
-    user.stubs(:login).returns('some')
-    @controller.stubs(:current_user).returns(user)
+    process_delayed_job_queue
  
+    login_as p2.user.login
     get :index, :profile => p1.identifier
     assert assigns(:network_activities).blank?
-
-    user = mock()
-    user.stubs(:person).returns(p3)
-    user.stubs(:login).returns('some')
-    @controller.stubs(:current_user).returns(user)
-    Person.any_instance.stubs(:follows?).returns(true)
-    process_delayed_job_queue
-
-    get :index, :profile => p3.identifier
-    assert_equivalent [a1,a3], assigns(:network_activities)
   end
  
   should 'the network activity be paginated' do
@@ -829,10 +810,10 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'the network activity be visible only to logged users' do
-    p1= fast_create(Person)
-    p2= fast_create(Person)
+    p1= create_user.person
+    p2= create_user.person
     assert !p1.is_a_friend?(p2)
-    p3= fast_create(Person)
+    p3= create_user.person
     p3.add_friend(p1)
     assert p3.is_a_friend?(p1)
     ActionTracker::Record.destroy_all
@@ -891,10 +872,10 @@ class ProfileControllerTest &lt; ActionController::TestCase
   end
  
   should 'the self activity not crashes with user not logged in' do
-    p1= fast_create(Person)
-    p2= fast_create(Person)
+    p1= create_user.person
+    p2= create_user.person
     assert !p1.is_a_friend?(p2)
-    p3= fast_create(Person)
+    p3= create_user.person
     p3.add_friend(p1)
     assert p3.is_a_friend?(p1)
     ActionTracker::Record.destroy_all
@@ -865,7 +865,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
  
   should 'not be able to destroy enterprise if is a regular member' do
     enterprise = fast_create(Enterprise)
-    enterprise.add_member(fast_create(Person)) # first member is admin by default
+    enterprise.add_member(create_user.person) # first member is admin by default
  
     person = create_user('foo').person
     enterprise.add_member(person)
@@ -49,6 +49,20 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     end
   end
  
+  should 'plugins path take precedence over core path' do
+    core_path = 'core/'
+    plugin_path = 'path/'
+    @controller = mock()
+    @controller.stubs(:view_paths).returns([plugin_path, core_path])
+    self.stubs(:params).returns({:controller => 'test'})
+
+    File.stubs(:exists?).returns(false)
+    File.stubs(:exists?).with(core_path+"test/_block.html.erb").returns(true)
+    File.stubs(:exists?).with(plugin_path+"test/_raw_html_block.html.erb").returns(true)
+
+    assert_equal 'raw_html_block', partial_for_class(RawHTMLBlock)
+  end
+
   should 'generate link to stylesheet' do
     File.stubs(:exists?).returns(false)
     File.expects(:exists?).with(Rails.root.join('public', 'stylesheets', 'something.css')).returns(true)
@@ -57,15 +57,6 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     assert_match /comment body/, sent.body.to_s
   end
  
-  should 'not deliver mail if has no notification emails' do
-    community = fast_create(Community)
-    assert_equal [], community.notification_emails
-    article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
-    assert_no_difference 'ActionMailer::Base.deliveries.size' do
-      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
-    end
-  end
-
   should "deliver mail to followers" do
     author = create_user('follower_author').person
     follower = create_user('follower').person
@@ -195,6 +195,12 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert !env.errors[:contact_email.to_s].present?
   end
  
+  should 'notify contact email' do
+    env = Environment.new(:contact_email => 'foo@bar.com')
+    env.stubs(:admins).returns([])
+    assert_equal ['foo@bar.com'], env.notification_emails
+  end
+
   should 'provide a default hostname' do
     env = fast_create(Environment)
     env.domains << create(Domain, :name => 'example.com', :is_default => true)
@@ -53,7 +53,7 @@ class FeedReaderBlockTest &lt; ActiveSupport::TestCase
   end
  
   should 'display last fetched date' do
-    now = Time.now
+    now = Time.new(2014,1,1)
     feed.feed_items = ['one', 'two']
     feed.fetched_at = now
     assert_equal "Updated: #{show_date(now)}", feed.footer
@@ -123,9 +123,9 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails
   end
  
-  should 'return empty array if contact_email is a blank string and it has no admin' do
+  should 'use the environment contact email if no emails are listed here' do
     o = build(Organization, :contact_email => '', :environment => Environment.default)
-    assert_equal [], o.notification_emails
+    assert_equal [o.environment.contact_email], o.notification_emails
   end
  
   should 'list pending enterprise validations' do
@@ -1198,8 +1198,8 @@ class PersonTest &lt; ActiveSupport::TestCase
  
   should 'return tracked_actions and scraps as activities' do
     ActionTracker::Record.destroy_all
-    person = fast_create(Person)
-    another_person = fast_create(Person)
+    person = create_user.person
+    another_person = create_user.person
  
     UserStampSweeper.any_instance.stubs(:current_user).returns(another_person)
     scrap = create(Scrap, defaults_for_scrap(:sender => another_person, :receiver => person, :content => 'A scrap'))
@@ -57,10 +57,10 @@ class ScrapNotifierTest &lt; ActiveSupport::TestCase
  
   should 'not deliver mail if is a reply on a community' do
     community = fast_create(Community)
-    person = fast_create(Person)
+    person = create_user.person
     scrap = fast_create(Scrap, :receiver_id => community.id, :sender_id => @sender.id)
     assert_no_difference 'ActionMailer::Base.deliveries.size' do
-      Scrap.create!(:sender_id => person, :receiver_id => @sender.id, :scrap_id => scrap.id, :content => 'Hi myself!')
+      Scrap.create!(:sender_id => person.id, :receiver_id => @sender.id, :scrap_id => scrap.id, :content => 'Hi myself!')
     end
   end
  
@@ -42,7 +42,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "be associated to Person as sender" do
-    person = fast_create(Person)
+    person = create_user.person
     s = Scrap.new
     assert_nothing_raised do
       s.sender = person
@@ -50,7 +50,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "be associated to Person as receiver" do
-    person = fast_create(Person)
+    person = create_user.person
     s = Scrap.new
     assert_nothing_raised do
       s.receiver = person
@@ -66,7 +66,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "collect all scraps sent and received of a person" do
-    person = fast_create(Person)
+    person = create_user.person
     s1 = fast_create(Scrap, :sender_id => person.id)
     assert_equal [s1], Scrap.all_scraps(person)
     s2 = fast_create(Scrap, :sender_id => person.id)
@@ -77,7 +77,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
  
   should "collect all scraps sent and received of a community" do
     community = fast_create(Community)
-    person = fast_create(Person)
+    person = create_user.person
     s1 = fast_create(Scrap, :sender_id => person.id)
     assert_equal [], Scrap.all_scraps(community)
     s2 = fast_create(Scrap, :receiver_id => community.id, :sender_id => person.id)
@@ -87,8 +87,8 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "create the leave_scrap action tracker verb on scrap creation of one user to another" do
-    p1 = fast_create(Person)
-    p2 = fast_create(Person)
+    p1 = create_user.person
+    p2 = create_user.person
     s = Scrap.new
     s.sender= p1
     s.receiver= p2
@@ -104,7 +104,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "create the leave_scrap action tracker verb on scrap creation of one user to community" do
-    p = fast_create(Person)
+    p = create_user.person
     c = fast_create(Community)
     s = Scrap.new
     s.sender= p
@@ -122,8 +122,8 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "notify leave_scrap action tracker verb to friends and itself" do
-    p1 = fast_create(Person)
-    p2 = fast_create(Person)
+    p1 = create_user.person
+    p2 = create_user.person
     p1.add_friend(p2)
     ActionTrackerNotification.delete_all
     Delayed::Job.delete_all
@@ -140,7 +140,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "notify leave_scrap action tracker verb to members of the communities and the community itself" do
-    p = fast_create(Person)
+    p = create_user.person
     c = fast_create(Community)
     c.add_member(p)
     ActionTrackerNotification.delete_all
@@ -158,7 +158,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "create the leave_scrap_to_self action tracker verb on scrap creation of one user to itself" do
-    p = fast_create(Person)
+    p = create_user.person
     s = Scrap.new
     s.sender= p
     s.receiver= p
@@ -172,8 +172,8 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "notify leave_scrap_to_self action tracker verb to friends and itself" do
-    p1 = fast_create(Person)
-    p2 = fast_create(Person)
+    p1 = create_user.person
+    p2 = create_user.person
     p1.add_friend(p2)
     ActionTrackerNotification.delete_all
     Delayed::Job.delete_all
@@ -216,7 +216,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should "update the scrap on reply creation" do
-    person = fast_create(Person)
+    person = create_user.person
     s = fast_create(Scrap, :updated_at => DateTime.parse('2010-01-01'))
     assert_equal DateTime.parse('2010-01-01'), s.updated_at.strftime('%Y-%m-%d')
     DateTime.stubs(:now).returns(DateTime.parse('2010-09-07'))
@@ -242,20 +242,20 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should 'strip all html tags' do
-    s, r = fast_create(Person), fast_create(Person)
+    s, r = create_user.person, create_user.person
     s = build Scrap, :sender => s, :receiver => r, :content => "<p>Test <b>Rails</b></p>"
     assert_equal "Test Rails", s.strip_all_html_tags
   end
  
   should 'strip html before save' do
-    s, r = fast_create(Person), fast_create(Person)
+    s, r = create_user.person, create_user.person
     s = build Scrap, :sender => s, :receiver => r, :content => "<p>Test <b>Rails</b></p>"
     s.save!
     assert_equal "Test Rails", s.reload.content
   end
  
   should 'strip html before validate' do
-    s, r = fast_create(Person), fast_create(Person)
+    s, r = create_user.person, create_user.person
     s = build Scrap, :sender => s, :receiver => r, :content => "<p><b></b></p>"
     assert !s.valid?
     s.content = "<p>Test</p>"
@@ -272,7 +272,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should 'scrap wall url be the root scrap receiver url if it is a reply' do
-    p1, p2 = fast_create(Person), fast_create(Person)
+    p1, p2 = create_user.person, create_user.person
     r = create Scrap, :sender => p1, :receiver => p2, :content => "Hello!"
     s = build Scrap, :sender => p2, :receiver => p1, :content => "Hi!"
     r.replies << s; s.reload
@@ -280,13 +280,13 @@ class ScrapTest &lt; ActiveSupport::TestCase
   end
  
   should 'scrap wall url be the scrap receiver url if it is not a reply' do
-    p1, p2 = fast_create(Person), fast_create(Person)
+    p1, p2 = create_user.person, create_user.person
     s = create Scrap, :sender => p1, :receiver => p2, :content => "Hello!"
     assert_equal s.scrap_wall_url, s.receiver.wall_url
   end
  
   should 'create activity with reply_scrap_on_self when top_root scrap receiver is the same as sender' do
-    s, r = fast_create(Person), fast_create(Person)
+    s, r = create_user.person, create_user.person
     root = fast_create(Scrap, :sender_id => s.id, :receiver_id => r.id)
     assert_difference 'ActionTracker::Record.count', 1 do
       reply = create(Scrap, :sender => r, :receiver => s, :scrap_id => root.id, :content => 'sample')
1	1	source "https://rubygems.org"
2		-gem 'rails'
3		-gem 'fast_gettext'
4		-gem 'acts-as-taggable-on'
5		-gem 'prototype-rails'
6		-gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
7		-gem 'rails_autolink'
8		-gem 'pg'
9		-gem 'rmagick'
10		-gem 'RedCloth'
11		-gem 'will_paginate'
12		-gem 'ruby-feedparser'
13		-gem 'daemons'
14		-gem 'thin'
15		-gem 'hpricot'
16		-gem 'nokogiri'
	2	+gem 'rails', '~> 3.2.19'
	3	+gem 'fast_gettext', '~> 0.6.8'
	4	+gem 'acts-as-taggable-on', '~> 3.0.2'
	5	+gem 'prototype-rails', '~> 3.2.1'
	6	+gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper'
	7	+gem 'rails_autolink', '~> 1.1.5'
	8	+gem 'pg', '~> 0.13.2'
	9	+gem 'rmagick', '~> 2.13.1'
	10	+gem 'RedCloth', '~> 4.2.9'
	11	+gem 'will_paginate', '~> 3.0.3'
	12	+gem 'ruby-feedparser', '~> 0.7'
	13	+gem 'daemons', '~> 1.1.5'
	14	+gem 'thin', '~> 1.3.1'
	15	+gem 'hpricot', '~> 0.8.6'
	16	+gem 'nokogiri', '~> 1.5.5'
17	17	gem 'rake', :require => false
18		-gem 'grape', '0.2.1'
19		-gem 'rest-client'
20		-gem 'exception_notification'
21		-gem 'gettext', :require => false, :group => :development
	18	+gem 'grape', '~> 0.2.1'
	19	+gem 'rest-client', '~> 1.6.7'
	20	+gem 'exception_notification', '~> 4.0.1'
	21	+gem 'gettext', '~> 2.2.1', :require => false, :group => :development
22	22
23	23	# FIXME list here all actual dependencies (i.e. the ones in debian/control),
24	24	# with their GEM names (not the Debian package names)
25	25
26	26	group :production do
27		- gem 'dalli'
	27	+ gem 'dalli', '~> 2.7.0'
28	28	end
29	29
30	30	group :test do
31		- gem 'rspec'
32		- gem 'rspec-rails'
33		- gem 'mocha', :require => false
	31	+ gem 'rspec', '~> 2.10.0'
	32	+ gem 'rspec-rails', '~> 2.10.1'
	33	+ gem 'mocha', '~> 1.1.0', :require => false
34	34	end
35	35
36	36	group :cucumber do
37		- gem 'cucumber-rails', :require => false
38		- gem 'capybara'
39		- gem 'cucumber'
40		- gem 'database_cleaner'
41		- gem 'selenium-webdriver'
	37	+ gem 'cucumber-rails', '~> 1.0.6', :require => false
	38	+ gem 'capybara', '~> 2.1.0'
	39	+ gem 'cucumber', '~> 1.0.6'
	40	+ gem 'database_cleaner', '~> 1.2.0'
	41	+ gem 'selenium-webdriver', '~> 2.39.0'
42	42	end
43	43
44	44	# include plugin gemfiles
...	...
...	...	@@ -1,206 +0,0 @@
1		-PATH
2		- remote: vendor/prototype_legacy_helper
3		- specs:
4		- prototype_legacy_helper (0.0.0)
5		-
6		-GEM
7		- remote: https://rubygems.org/
8		- specs:
9		- RedCloth (4.2.9)
10		- actionmailer (3.2.6)
11		- actionpack (= 3.2.6)
12		- mail (~> 2.4.4)
13		- actionpack (3.2.6)
14		- activemodel (= 3.2.6)
15		- activesupport (= 3.2.6)
16		- builder (~> 3.0.0)
17		- erubis (~> 2.7.0)
18		- journey (~> 1.0.1)
19		- rack (~> 1.4.0)
20		- rack-cache (~> 1.2)
21		- rack-test (~> 0.6.1)
22		- sprockets (~> 2.1.3)
23		- activemodel (3.2.6)
24		- activesupport (= 3.2.6)
25		- builder (~> 3.0.0)
26		- activerecord (3.2.6)
27		- activemodel (= 3.2.6)
28		- activesupport (= 3.2.6)
29		- arel (~> 3.0.2)
30		- tzinfo (~> 0.3.29)
31		- activeresource (3.2.6)
32		- activemodel (= 3.2.6)
33		- activesupport (= 3.2.6)
34		- activesupport (3.2.6)
35		- i18n (~> 0.6)
36		- multi_json (~> 1.0)
37		- acts-as-taggable-on (3.0.2)
38		- rails (>= 3, < 5)
39		- arel (3.0.2)
40		- builder (3.0.0)
41		- capybara (2.1.0)
42		- mime-types (>= 1.16)
43		- nokogiri (>= 1.3.3)
44		- rack (>= 1.0.0)
45		- rack-test (>= 0.5.4)
46		- xpath (~> 2.0)
47		- childprocess (0.3.3)
48		- ffi (~> 1.0.6)
49		- cucumber (1.0.6)
50		- builder (>= 2.1.2)
51		- diff-lcs (>= 1.1.2)
52		- gherkin (~> 2.4.18)
53		- json (>= 1.4.6)
54		- term-ansicolor (>= 1.0.6)
55		- cucumber-rails (1.0.6)
56		- capybara (>= 1.1.1)
57		- cucumber (>= 1.0.6)
58		- nokogiri (>= 1.5.0)
59		- daemons (1.1.5)
60		- dalli (2.7.0)
61		- database_cleaner (1.2.0)
62		- diff-lcs (1.1.3)
63		- erubis (2.7.0)
64		- eventmachine (0.12.10)
65		- exception_notification (4.0.1)
66		- actionmailer (>= 3.0.4)
67		- activesupport (>= 3.0.4)
68		- fast_gettext (0.6.8)
69		- ffi (1.0.11)
70		- gettext (2.2.1)
71		- locale
72		- gherkin (2.4.21)
73		- json (>= 1.4.6)
74		- grape (0.2.1)
75		- hashie (~> 1.2)
76		- multi_json
77		- multi_xml
78		- rack
79		- rack-mount
80		- hashie (1.2.0)
81		- hike (1.2.1)
82		- hpricot (0.8.6)
83		- i18n (0.6.0)
84		- journey (1.0.3)
85		- json (1.7.3)
86		- locale (2.0.5)
87		- mail (2.4.4)
88		- i18n (>= 0.4.0)
89		- mime-types (~> 1.16)
90		- treetop (~> 1.4.8)
91		- metaclass (0.0.1)
92		- mime-types (1.19)
93		- mocha (0.11.3)
94		- metaclass (~> 0.0.1)
95		- multi_json (1.3.6)
96		- multi_xml (0.5.5)
97		- nokogiri (1.5.5)
98		- pg (0.13.2)
99		- polyglot (0.3.3)
100		- prototype-rails (3.2.1)
101		- rails (~> 3.2)
102		- rack (1.4.1)
103		- rack-cache (1.2)
104		- rack (>= 0.4)
105		- rack-mount (0.8.3)
106		- rack (>= 1.0.0)
107		- rack-ssl (1.3.2)
108		- rack
109		- rack-test (0.6.1)
110		- rack (>= 1.0)
111		- rails (3.2.6)
112		- actionmailer (= 3.2.6)
113		- actionpack (= 3.2.6)
114		- activerecord (= 3.2.6)
115		- activeresource (= 3.2.6)
116		- activesupport (= 3.2.6)
117		- bundler (~> 1.0)
118		- railties (= 3.2.6)
119		- rails_autolink (1.1.5)
120		- rails (> 3.1)
121		- railties (3.2.6)
122		- actionpack (= 3.2.6)
123		- activesupport (= 3.2.6)
124		- rack-ssl (~> 1.3.2)
125		- rake (>= 0.8.7)
126		- rdoc (~> 3.4)
127		- thor (>= 0.14.6, < 2.0)
128		- rake (0.9.2.2)
129		- rdoc (3.9.4)
130		- rest-client (1.6.7)
131		- mime-types (>= 1.16)
132		- rmagick (2.13.1)
133		- rspec (2.10.0)
134		- rspec-core (~> 2.10.0)
135		- rspec-expectations (~> 2.10.0)
136		- rspec-mocks (~> 2.10.0)
137		- rspec-core (2.10.1)
138		- rspec-expectations (2.10.0)
139		- diff-lcs (~> 1.1.3)
140		- rspec-mocks (2.10.1)
141		- rspec-rails (2.10.1)
142		- actionpack (>= 3.0)
143		- activesupport (>= 3.0)
144		- railties (>= 3.0)
145		- rspec (~> 2.10.0)
146		- ruby-feedparser (0.7)
147		- rubyzip (1.1.2)
148		- selenium-webdriver (2.39.0)
149		- childprocess (>= 0.2.5)
150		- multi_json (~> 1.0)
151		- rubyzip (~> 1.0)
152		- websocket (~> 1.0.4)
153		- sprockets (2.1.3)
154		- hike (~> 1.2)
155		- multi_json (~> 1.0)
156		- rack (~> 1.0)
157		- tilt (~> 1.1, != 1.3.0)
158		- term-ansicolor (1.0.7)
159		- thin (1.3.1)
160		- daemons (>= 1.0.9)
161		- eventmachine (>= 0.12.6)
162		- rack (>= 1.0.0)
163		- thor (0.15.3)
164		- tilt (1.3.3)
165		- treetop (1.4.10)
166		- polyglot
167		- polyglot (>= 0.3.1)
168		- tzinfo (0.3.33)
169		- websocket (1.0.7)
170		- will_paginate (3.0.3)
171		- xpath (2.0.0)
172		- nokogiri (~> 1.3)
173		-
174		-PLATFORMS
175		- ruby
176		-
177		-DEPENDENCIES
178		- RedCloth
179		- acts-as-taggable-on
180		- capybara
181		- cucumber
182		- cucumber-rails
183		- daemons
184		- dalli
185		- database_cleaner
186		- exception_notification
187		- fast_gettext
188		- gettext
189		- grape (= 0.2.1)
190		- hpricot
191		- mocha
192		- nokogiri
193		- pg
194		- prototype-rails
195		- prototype_legacy_helper (= 0.0.0)!
196		- rails
197		- rails_autolink
198		- rake
199		- rest-client
200		- rmagick
201		- rspec
202		- rspec-rails
203		- ruby-feedparser
204		- selenium-webdriver
205		- thin
206		- will_paginate
...	...	@@ -3,7 +3,7 @@
3	3
4	4	VAGRANTFILE_API_VERSION = "2"
5	5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
6		- config.vm.box = "debian-wheezy"
	6	+ config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
7	7	config.vm.network :forwarded_port, host: 3000, guest: 3000
8	8	config.vm.provision :shell do \|shell\|
9	9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'
...	...
...	...	@@ -829,7 +829,7 @@ class Environment < ActiveRecord::Base
829	829	end
830	830
831	831	def notification_emails
832		- [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email)
	832	+ [contact_email].select(&:present?) + admins.map(&:email)
833	833	end
834	834
835	835	after_create :create_templates
...	...
...	...	@@ -135,7 +135,11 @@ class Organization < Profile
135	135	end
136	136
137	137	def notification_emails
138		- [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
	138	+ emails = [contact_email].select(&:present?) + admins.map(&:email)
	139	+ if emails.empty?
	140	+ emails << environment.contact_email
	141	+ end
	142	+ emails
139	143	end
140	144
141	145	def already_request_membership?(person)
...	...
...	...	@@ -9,7 +9,7 @@ Build-Depends:
9	9	ruby-gettext,
10	10	ruby-sqlite3,
11	11	rake,
12		- rails3 (>= 3.2.6-1~),
	12	+ rails3 (>= 3.2.19-1~),
13	13	ruby-rspec,
14	14	ruby-rspec-rails,
15	15	ruby-will-paginate,
...	...
...	...	@@ -8,7 +8,6 @@ Rakefile usr/share/noosfero
8	8	vendor usr/share/noosfero
9	9
10	10	Gemfile usr/share/noosfero
11		-Gemfile.lock usr/share/noosfero
12	11	debian/bundle/config usr/share/noosfero/.bundle
13	12
14	13	config/application.rb usr/share/noosfero/config
...	...
...	...	@@ -15,3 +15,4 @@ var/lib/noosfero-data/public/thumbnails usr/share/noosfero/public/th
15	15	usr/share/noosfero/public/designs/themes/noosfero usr/share/noosfero/public/designs/themes/default
16	16	usr/share/noosfero/public/designs/icons/tango usr/share/noosfero/public/designs/icons/default
17	17	usr/share/noosfero/script/noosfero-plugins usr/sbin/noosfero-plugins
	18	+usr/share/noosfero/Gemfile.lock /dev/null
...	...
...	...	@@ -43,3 +43,4 @@ debian/noosfero-apache/
43	43	features/plugins/*
44	44	plugins/solr/config/solr.yml
45	45	/solr
	46	+/Gemfile.lock
...	...
...	...	@@ -19,7 +19,7 @@ class FeedWriter
19	19	for article in articles
20	20	xml.item do
21	21	xml.title(article.name)
22		- xml.description(article.to_html)
	22	+ xml.description(article.to_html(:feed => true))
23	23	if article.created_at
24	24	# rfc822
25	25	xml.pubDate(article.created_at.rfc2822)
...	...