Merge branch 'master' into antispam

Conflicts: app/views/admin_panel/index.rhtml

Merge branch 'master' into antispam
Conflicts: app/views/admin_panel/index.rhtml
Antonio Terceiro
2 parents b065ccea c7afee4e
Showing 245 changed files with 10618 additions and 5672 deletions Show diff stats
app/controllers/admin/licenses_controller.rb
app/controllers/admin/templates_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
app/models/comment.rb
app/models/community.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/license.rb
app/models/organization.rb
app/models/person.rb
app/models/profile.rb
app/models/user.rb
app/views/account/_signup_form.rhtml
app/views/admin_panel/edit_templates.rhtml
app/views/admin_panel/index.rhtml
app/views/cms/_blog.rhtml
app/views/cms/_event.rhtml
app/views/cms/_folder.rhtml
@@ -0,0 +1,50 @@
+class LicensesController < AdminController
+  protect 'manage_environment_licenses', :environment
+
+  def index
+    @licenses = environment.licenses
+  end
+
+  def create
+    @license = License.new(params[:license])
+    if request.post?
+      begin
+        @license.environment = environment
+        @license.save!
+        session[:notice] = _('License created')
+        redirect_to :action => 'index'
+      rescue
+        session[:notice] = _('License could not be created')
+      end
+    end
+  end
+
+  def edit
+    @license = environment.licenses.find(params[:license_id])
+    if request.post?
+      begin
+        @license.update_attributes!(params[:license])
+        session[:notice] = _('License updated')
+        redirect_to :action => 'index'
+      rescue
+        session[:notice] = _('License could not be updated')
+      end
+    end
+  end
+
+  def remove
+    @license = environment.licenses.find(params[:license_id])
+    if request.post?
+      begin
+        @license.destroy
+        session[:notice] = _('License removed')
+      rescue
+        session[:notice] = _('License could not be removed')
+      end
+    else
+      session[:notice] = _('License could not be removed')
+    end
+    redirect_to :action => 'index'
+  end
+
+end
@@ -0,0 +1,52 @@
+class TemplatesController < AdminController
+  protect 'manage_environment_templates', :environment
+
+  def create_person_template
+    if request.post?
+      begin
+        identifier = params[:name].to_slug
+        password = Digest::MD5.hexdigest(rand.to_s)
+        template = User.new(:login => identifier, :email => identifier+'@templates.noo', :password => password, :password_confirmation => password, :person_data => {:name => params[:name], :is_template => true})
+        template.save!
+        session[:notice] = _('New template created')
+        redirect_to :action => 'index'
+      rescue
+        @error = _('Name has already been taken')
+      end
+    end
+  end
+
+  def create_community_template
+    if request.post?
+      begin
+        create_organization_template(Community)
+        session[:notice] = _('New template created')
+        redirect_to :action => 'index'
+      rescue
+        @error = _('Name has already been taken')
+      end
+    end
+  end
+
+  def create_enterprise_template
+    if request.post?
+      begin
+        create_organization_template(Enterprise)
+        session[:notice] = _('New template created')
+        redirect_to :action => 'index'
+      rescue
+        @error = _('Name has already been taken')
+      end
+    end
+  end
+
+  private
+
+  def create_organization_template(klass)
+    identifier = params[:name].to_slug
+    template = klass.new(:name => params[:name], :identifier => identifier, :is_template => true)
+    template.save!
+  end
+
+end
+
@@ -99,6 +99,14 @@ class ContentViewerController &lt; ApplicationController
       @images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
     end
+    @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
+    if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
+      @page.followers -= [params[:email]]
+      if @page.save
+        session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
+      end
+    end
+
     @comments = @page.comments(true).as_thread
     @comments_count = @page.comments.count
     if params[:slideshow]
@@ -1331,4 +1331,21 @@ module ApplicationHelper
       _("Are you sure that you want to remove the item \"#{article.name}\"?")
     end
   end
+
+  def template_options(klass, field_name)
+    return '' if klass.templates.count == 0
+    return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
+
+    counter = 0
+    radios = klass.templates.map do |template|
+      counter += 1
+      content_tag('li', labelled_radio_button(template.name, "#{field_name}[template_id]", template.id, counter==1))
+    end.join("\n")
+
+    content_tag('div', content_tag('span', _('Template:')) +
+      content_tag('ul', radios, :style => 'list-style: none; padding-left: 0; margin-top: 0.5em;'),
+      :id => 'template-options',
+      :style => 'margin-top: 1em'
+    )
+  end
 end
@@ -34,9 +34,12 @@ class Article &lt; ActiveRecord::Base
   settings_items :display_hits, :type => :boolean, :default => true
   settings_items :author_name, :type => :string, :default => ""
   settings_items :allow_members_to_edit, :type => :boolean, :default => false
+  settings_items :followers, :type => Array, :default => []
   belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
+  belongs_to :license
+
   has_many :translations, :class_name => 'Article', :foreign_key => :translation_of_id
   belongs_to :translation_of, :class_name => 'Article', :foreign_key => :translation_of_id
   before_destroy :rotate_translations
@@ -75,11 +75,30 @@ class Comment &lt; ActiveRecord::Base
     article.comments_updated if article.kind_of?(Article)
   end
-  after_create do |comment|
-    if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
-      Comment::Notifier.deliver_mail(comment)
+  after_create :new_follower
+  def new_follower
+    if source.kind_of?(Article)
+      article.followers += [author_email]
+      article.followers -= article.profile.notification_emails
+      article.followers.uniq!
+      article.save
+    end
+  end
+
+  after_create :notify_by_mail
+  def notify_by_mail
+    if source.kind_of?(Article) && article.notify_comments?
+      if !article.profile.notification_emails.empty?
+        Comment::Notifier.deliver_mail(self)
+      end
+      emails = article.followers - [author_email]
+      if !emails.empty?
+        Comment::Notifier.deliver_mail_to_followers(self, emails)
+      end
     end
+  end
+  after_create do |comment|
     if comment.source.kind_of?(Article)
       comment.article.create_activity if comment.article.activity.nil?
       if comment.article.activity
@@ -138,6 +157,22 @@ class Comment &lt; ActiveRecord::Base
         :environment => profile.environment.name,
         :url => profile.environment.top_url
     end
+    def mail_to_followers(comment, emails)
+      profile = comment.article.profile
+      bcc emails
+      from "#{profile.environment.name} <#{profile.environment.contact_email}>"
+      subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
+      body :recipient => profile.nickname || profile.name,
+        :sender => comment.author_name,
+        :sender_link => comment.author_link,
+        :article_title => comment.article.name,
+        :comment_url => comment.url,
+        :unsubscribe_url => comment.article.view_url.merge({:unfollow => true}),
+        :comment_title => comment.title,
+        :comment_body => comment.body,
+        :environment => profile.environment.name,
+        :url => profile.environment.top_url
+    end
   end
   def rejected?
@@ -61,10 +61,10 @@ class Community &lt; Organization
   def name=(value)
     super(value)
-    self.identifier = value.to_slug
+    self.identifier ||= value.to_slug
   end
-  def template
+  def default_template
     environment.community_template
   end
@@ -154,13 +154,14 @@ class Enterprise &lt; Organization
     true
   end
-  def template
-    if enabled?
-      environment.enterprise_template
-    else
-      environment.inactive_enterprise_template
-    end
+  def default_template
+    environment.enterprise_template
+  end
+
+  def template_with_inactive_enterprise
+    !enabled? ? environment.inactive_enterprise_template : template_without_inactive_enterprise
   end
+  alias_method_chain :template, :inactive_enterprise
   def control_panel_settings_button
     {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
@@ -24,6 +24,8 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_roles' => N_('Manage environment roles'),
     'manage_environment_validators' => N_('Manage environment validators'),
     'manage_environment_users' => N_('Manage environment users'),
+    'manage_environment_templates' => N_('Manage environment templates'),
+    'manage_environment_licenses' => N_('Manage environment licenses'),
   }
   module Roles
@@ -158,6 +160,7 @@ class Environment &lt; ActiveRecord::Base
   has_many :products, :through => :enterprises
   has_many :people
   has_many :communities
+  has_many :licenses
   has_many :categories
   has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
@@ -719,12 +722,12 @@ class Environment &lt; ActiveRecord::Base
   def create_templates
     pre = self.name.to_slug + '_'
-    ent_id = Enterprise.create!(:name => 'Enterprise template', :identifier => pre + 'enterprise_template', :environment => self, :visible => false).id
-    inactive_enterprise_tmpl = Enterprise.create!(:name => 'Inactive Enterprise template', :identifier => pre + 'inactive_enterprise_template', :environment => self, :visible => false)
-    com_id = Community.create!(:name => 'Community template', :identifier => pre + 'community_template', :environment => self, :visible => false).id
+    ent_id = Enterprise.create!(:name => 'Enterprise template', :identifier => pre + 'enterprise_template', :environment => self, :visible => false, :is_template => true).id
+    inactive_enterprise_tmpl = Enterprise.create!(:name => 'Inactive Enterprise template', :identifier => pre + 'inactive_enterprise_template', :environment => self, :visible => false, :is_template => true)
+    com_id = Community.create!(:name => 'Community template', :identifier => pre + 'community_template', :environment => self, :visible => false, :is_template => true).id
     pass = Digest::MD5.hexdigest rand.to_s
     user = User.create!(:login => (pre + 'person_template'), :email => (pre + 'template@template.noo'), :password => pass, :password_confirmation => pass, :environment => self).person
-    user.update_attributes(:visible => false, :name => "Person template")
+    user.update_attributes(:visible => false, :name => "Person template", :is_template => true)
     usr_id = user.id
     self.settings[:enterprise_template_id] = ent_id
     self.inactive_enterprise_template = inactive_enterprise_tmpl
@@ -740,6 +743,18 @@ class Environment &lt; ActiveRecord::Base
     end
   end
+  after_create :create_default_licenses
+  def create_default_licenses
+    License.create!(:name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nd)', :url => 'http://creativecommons.org/licenses/by-nd/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-sa)', :url => 'http://creativecommons.org/licenses/by-sa/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nc)', :url => 'http://creativecommons.org/licenses/by-nc/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nc-nd)', :url => 'http://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', :environment => self)
+    License.create!(:name => 'CC (by-nc-sa)', :url => 'http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', :environment => self)
+    License.create!(:name => 'Free Art', :url => 'http://artlibre.org/licence/lal/en', :environment => self)
+    License.create!(:name => 'GNU FDL', :url => 'http://www.gnu.org/licenses/fdl-1.3.txt', :environment => self)
+  end
+
   def highlighted_products_with_image(options = {})
     Product.find(:all, {:conditions => {:highlighted => true, :enterprise_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
   end
@@ -0,0 +1,12 @@
+class License < ActiveRecord::Base
+  belongs_to :environment
+  has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
+
+  validates_presence_of :name, :environment
+  validates_presence_of :slug, :if => lambda {|license| license.name.present?}
+  validates_uniqueness_of :slug, :scope => :environment_id
+
+  before_validation do |license|
+    license.slug ||= license.name.to_slug if license.name.present?
+  end
+end
@@ -77,6 +77,7 @@ class Organization &lt; Profile
     state
     country
     tag_list
+    template_id
   ]
   def self.fields
@@ -285,7 +285,7 @@ class Person &lt; Profile
     end
   end
-  def template
+  def default_template
     environment.person_template
   end
@@ -65,6 +65,7 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
+  named_scope :templates, :conditions => {:is_template => true}
   def members
     Person.members_of(self)
@@ -98,6 +99,7 @@ class Profile &lt; ActiveRecord::Base
   has_many :action_tracker_notifications, :foreign_key => 'profile_id'
   has_many :tracked_notifications, :through => :action_tracker_notifications, :source => :action_tracker, :order => 'updated_at DESC'
   has_many :scraps_received, :class_name => 'Scrap', :foreign_key => :receiver_id, :order => "updated_at DESC", :dependent => :destroy
+  belongs_to :template, :class_name => 'Profile', :foreign_key => 'template_id'
   # FIXME ugly workaround
   def self.human_attribute_name(attrib)
@@ -274,8 +276,14 @@ class Profile &lt; ActiveRecord::Base
   validates_format_of :identifier, :with => IDENTIFIER_FORMAT, :if => lambda { |profile| !profile.identifier.blank? }
   validates_exclusion_of :identifier, :in => RESERVED_IDENTIFIERS
   validates_uniqueness_of :identifier, :scope => :environment_id
-
   validates_length_of :nickname, :maximum => 16, :allow_nil => true
+  validate :valid_template
+
+  def valid_template
+    if template_id.present? and !template.is_template
+      errors.add(:template, _('is not a template.'))
+    end
+  end
   before_create :set_default_environment
   def set_default_environment
@@ -322,10 +330,15 @@ class Profile &lt; ActiveRecord::Base
   end
   # this method should be overwritten to provide the correct template
-  def template
+  def default_template
     nil
   end
+  def template_with_default
+    template_without_default || default_template
+  end
+  alias_method_chain :template, :default
+
   def apply_template(template, options = {:copy_articles => true})
     copy_blocks_from(template)
     copy_articles_from(template) if options[:copy_articles]
@@ -114,6 +114,7 @@ class User &lt; ActiveRecord::Base
   # Activates the user in the database.
   def activate
+    return false unless self.person
     self.activated_at = Time.now.utc
     self.activation_code = nil
     self.person.visible = true
@@ -69,6 +69,8 @@
 <div id="signup-form-profile">
+  <%= template_options(Person, 'profile_data') %>
+
   <% labelled_fields_for :profile_data, @person do |f| %>
     <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
   <% end %>
@@ -1,10 +0,0 @@
-<h1><%= _('Edit Templates') %></h1>
-
-<ul>
-<% [[_('Edit Person Template'), environment.person_template],
-    [_('Edit Community Template'), environment.community_template],
-    [__('Edit Enterprise Template'), environment.enterprise_template],
-    [__('Edit Inactive Enterprise Template'), environment.inactive_enterprise_template]].select{|i| i[1]}.each do |row| %>
-<li><%= link_to row[0], :controller => 'profile_editor', :profile => row[1].identifier %></li>
-<% end %>
-</ul>
@@ -8,6 +8,7 @@
   <tr><td><%= link_to _('Plugins'), :controller => 'plugins' %></td></tr>
   <tr><td><%= link_to _('Sideboxes'), :controller => 'environment_design'%></td></tr>
   <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
+  <tr><td><%= link_to _('Manage Licenses'), :controller =>'licenses' %></td></tr>
 </table>
 <h2><%= _('Profiles') %></h2>
@@ -15,7 +16,7 @@
 <table>
   <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
   <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
-  <tr><td><%= link_to _('Profile templates'), :action => 'edit_templates' %></td></tr>
+  <tr><td><%= link_to _('Profile templates'), :action => 'templates' %></td></tr>
   <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
 </table>
@@ -6,6 +6,8 @@
 <%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
+<%= render :partial => 'general_fields' %>
+
 <script type="text/javascript">
   function submit_button(index) {
      return $("article_slug").form.select("input.submit")[index];
@@ -5,6 +5,7 @@
 <%= required f.text_field('name', :size => '64') %>
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
 <%= required_fields_message %>
 <%= required f.text_field('name', :size => '64') %>
+<%= render :partial => 'general_fields' %>
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
@@ -6,6 +6,8 @@
 <%= required f.text_field(:name, :size => '64', :onchange => "updateUrlField(this, 'article_slug')") %>
+<%= render :partial => 'general_fields' %>
+
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64, :rows => 10)) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %>
@@ -2,4 +2,6 @@
 <%= required f.text_field('name', :size => '64') %>
+<%= render :partial => 'general_fields' %>
+
 <%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 3, :cols => 64)) %>
@@ -0,0 +1 @@
+<%= labelled_form_field(_('License'), select(:article, :license_id, options_for_select_with_title([[_('None'), nil]] + profile.environment.licenses.map {|license| [license.name, license.id]}, @article.license ? @article.license.id : nil))) %>
 <%= f.text_field 'name', :size => '64' %>
+<%= render :partial => 'general_fields' %>
 <p><%= _('This is a republication of "%s", by %s.') % [link_to(h(@article.reference_article.name), @article.reference_article.url), @article.reference_article.profile.name] %></p>
@@ -2,5 +2,6 @@
 <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= render :partial => 'shared/lead_and_body' %>
@@ -2,6 +2,8 @@
 <%= required f.text_field(:name) %>
+<%= render :partial => 'general_fields' %>
+
 <%= required labelled_form_field(_('Limit of articles'), text_field(:article, :limit)) %>
 <%= labelled_form_field(_('Include in RSS Feed only posts from language:'), f.select(:language, [[_('All'),  nil ]] + Noosfero.locales.map { |k,v| [v, k]})) %>
@@ -4,5 +4,6 @@
 <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72')) %>
+<%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
 <%= render :partial => 'shared/lead_and_body' %>
@@ -5,6 +5,7 @@
 <div>
   <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64')) %>
+  <%= render :partial => 'general_fields' %>
   <%= render :partial => 'translatable' %>
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
 </div>
@@ -0,0 +1,22 @@
+<%= _('Hi!') %>
+
+<%= word_wrap(_('%{sender} (%{sender_link}) commented on the content "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
+
+<%= word_wrap(_('Title: %s') % @comment_title) if @comment_title %>
+
+<%= _("Comment:") %>
+-------------------------------------------------------------------------------
+<%= word_wrap(@comment_body) %>
+-------------------------------------------------------------------------------
+
+<%= _('Click on the address below to view this comment:') %>
+<%= url_for @comment_url %>
+
+<%= _('Click on the address below to cancel the notification of new comments:') %>
+<%= url_for @unsubscribe_url %>
+
+<%= _("Greetings,") %>
+
+--
+<%= _('%s team.') % @environment %>
+<%= url_for @url %>
@@ -0,0 +1,13 @@
+<% if @unfollow_form %>
+<div class='unfollow-article'>
+  <h1><%= _('Cancel notification of new comments') %></h1>
+  <p><%= _("Fill in the following field with your e-mail if you don't want to be notified when this content receives new comments anymore.") %></p>
+  <% form_tag(@page.view_url.merge({:only_path => true}), {:method => 'post', :class => 'comment_form'}) do %>
+    <%= hidden_field_tag(:unfollow, 'commit') %>
+    <%= labelled_form_field(_('Enter your e-Mail'), text_field_tag(:email, nil, {:size => 40})) %>
+    <% button_bar do %>
+      <%= submit_button(:ok, _('Cancel notifications for e-mail above') ) %>
+    <% end %>
+  <% end %>
+</div>
+<% end %>
@@ -6,12 +6,30 @@
 <div id="article" class="<%= @page.css_class_name %>">
+<%= render :partial => 'confirm_unfollow' %>
+
 <div id="article-toolbar"></div>
 <script type="text/javascript">
   <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }) %>
 </script>
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @page.display_hits? %>
+      <div id="article-hits">
+        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+      </div>
+    <% end %>
+
+    <% if @page.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
 <% if !@page.tags.empty? %>
   <div id="article-tags">
     <%= _("This article's tags:") %>
@@ -19,12 +37,6 @@
   </div>
 <% end %>
-<% if @page.display_hits? %>
-  <div id="article-hits">
-    <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-  </div>
-<% end %>
-
 <% if @page.parent && !@page.parent.path.blank? %>
 <div id="article-parent">
   <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
@@ -1,14 +0,0 @@
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-mexendo o contedudo para ver como fica a parada toda
-
@@ -28,6 +28,8 @@
       <%= hidden_field_tag  'create_enterprise[target_id]', environment.id %>
     <% end %>
+    <%= template_options(Enterprise, 'create_enterprise')%>
+
     <% button_bar do %>
       <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
     <% end %>
@@ -0,0 +1,12 @@
+<%= error_messages_for :license %>
+
+<% form_for :license, @license do |f| %>
+  <%= hidden_field_tag(:license_id, params[:license_id]) %>
+  <%= required labelled_form_field(_('Name'), f.text_field(:name)) %>
+  <%= labelled_form_field(_('License url'), f.text_field(:url)) %>
+
+ <% button_bar do %>
+   <%= submit_button('save', _('Save'))%>
+   <%= button('cancel', _('Cancel'), {:action => 'index'})%>
+  <% end %>
+<% end %>
@@ -0,0 +1,2 @@
+<h1><%= _('New license') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,2 @@
+<h1><%= _('Edit license') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,22 @@
+<h1><%= _('Manage licenses') %></h1>
+<table style='overflow: hidden;'>
+  <tr>
+    <th style='width: 25%'><%= _('Name') %></th>
+    <th style='width: 60%'><%= _('Url reference') %></th>
+    <th style='width: 15%'><%= _('Actions') %></th>
+  </tr>
+  <% @licenses.each do |license| %>
+    <tr>
+      <td title="<%= license.name%>"><%= truncate(license.name, :length => 19) %></td>
+      <td title="<%= license.url %>"><%= license.url.present? ? link_to(truncate(license.url, :length => 60), license.url, :target => '_blank') : '' %></td>
+      <td style='white-space: nowrap;'>
+        <%= button_without_text :edit, _('Edit'), :action => 'edit', :license_id => license.id %>
+        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :license_id => license.id}, :method => 'post', :confirm => _('Are you sure you want to remove this license?') %></td>
+    </tr>
+  <% end %>
+</table>
+
+<% button_bar do %>
+  <%= button(:add, _('Add a new license'), :action => 'create')%>
+  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
@@ -38,6 +38,8 @@
     </div>
   </div>
+  <%= template_options(Community, 'community')%>
+
   <% button_bar do %>
     <%= submit_button(:save, _('Create')) %>
     <%= button(:cancel, _('Cancel'), :action => 'index') %>
@@ -4,6 +4,12 @@
 <% labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
+  <% if user.has_permission?('manage_environment_templates', profile.environment) %>
+    <div id="profile-is-template">
+      <%= labelled_check_box(_('This profile is a template'), 'profile_data[is_template]', true, @profile.is_template) %>
+    </div>
+  <% end %>
+
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
   <% unless @profile.person? && @environment.active_person_fields.include?('image') %>
@@ -0,0 +1,19 @@
+<% if @error %>
+  <div class="errorExplanation" id="errorExplanation">
+    <h2><%= _('The template could not be saved') %></h2>
+    <p><%= _('There were problems with the following fields:') %> </p>
+    <ul>
+      <li><%= @error %></li>
+    </ul>
+  </div>
+<% end %>
+
+<% form_tag do %>
+  <%= labelled_text_field(_('Name')+': ', :name)%>
+
+  <% button_bar do %>
+    <%= submit_button('save', _('Save'))%>
+    <%= button('cancel', _('Cancel'), {:action => 'index'})%>
+  <% end %>
+<% end %>
+
@@ -0,0 +1,12 @@
+<% title = case @kind
+  when 'person'
+
+  when 'community'
+
+  when 'enterprise'
+    _('Create enterprise template')
+end %>
+
+<h1><%= _('Create community template') %></h1>
+
+<%= render :partial => 'create_template_form' %>
@@ -0,0 +1,3 @@
+<h1><%= _('Create enterprise template') %></h1>
+
+<%= render :partial => 'create_template_form' %>
@@ -0,0 +1,12 @@
+<% title = case @kind
+  when 'person'
+
+  when 'community'
+    _('Create community template')
+  when 'enterprise'
+    _('Create enterprise template')
+end %>
+
+<h1><%= _('Create person template') %></h1>
+
+<%= render :partial => 'create_template_form' %>
@@ -0,0 +1,26 @@
+<h1><%= _('Edit Templates') %></h1>
+
+<%= _('Manage the templates used on creation of profiles') %>
+
+<% list_of_templates = [[_('Person')    , Person.templates    , 'person'    ],
+                        [_('Community') , Community.templates , 'community' ],
+                        [_('Enterprise'), Enterprise.templates, 'enterprise']] %>
+
+<% list_of_templates.each do |title, templates, kind|%>
+  <div class='template-kind'>
+    <h2><%= title %></h2>
+    <%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>
+    <ul>
+      <% templates.each do |template| %>
+        <li>
+          <%= image_tag "icons-app/#{kind}-icon.png" %>
+          <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% end %>
@@ -0,0 +1,11 @@
+class AddTemplateAndIsTemplateFields < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :is_template, :boolean, :default => false
+    add_column :profiles, :template_id, :integer
+  end
+
+  def self.down
+    remove_column :profiles, :is_template
+    remove_column :profiles, :template_id
+  end
+end
@@ -0,0 +1,9 @@
+class FillIsTemplateFieldOnBasicTemplates < ActiveRecord::Migration
+  def self.up
+    update("update profiles set is_template = (1=1) where identifier like '%_template'")
+  end
+
+  def self.down
+    say('This migration can\'t be reverted.')
+  end
+end
@@ -0,0 +1,14 @@
+class CreateLicenses < ActiveRecord::Migration
+  def self.up
+    create_table :licenses do |t|
+      t.string      :name, :null => false
+      t.string      :slug, :null => false
+      t.string      :url
+      t.references  :environment, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :licenses
+  end
+end
@@ -0,0 +1,11 @@
+class AddLicenseToArticle < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :license_id, :integer
+    add_column :article_versions, :license_id, :integer
+  end
+
+  def self.down
+    remove_column :articles, :license_id
+    remove_column :article_versions, :license_id
+  end
+end
@@ -0,0 +1,17 @@
+class AddManageEnvironmentLicenseToAdminRole < ActiveRecord::Migration
+  def self.up
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions << 'manage_environment_licenses'
+      role.save!
+    end
+  end
+
+  def self.down
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions -= ['manage_environment_licenses']
+      role.save!
+    end
+  end
+end
@@ -0,0 +1,17 @@
+class AddManageEnvironmentTemplatesToAdminRole < ActiveRecord::Migration
+  def self.up
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions << 'manage_environment_templates'
+      role.save!
+    end
+  end
+
+  def self.down
+    Environment.all.map(&:id).each do |id|
+      role = Environment::Roles.admin(id)
+      role.permissions -= ['manage_environment_templates']
+      role.save!
+    end
+  end
+end
@@ -0,0 +1,27 @@
+class CreateDefaultLicenses < ActiveRecord::Migration
+  def self.up
+    Environment.all.each do |environment|
+      License.create!(:name => 'CC (by)', :url => 'http://creativecommons.org/licenses/by/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nd)', :url => 'http://creativecommons.org/licenses/by-nd/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-sa)', :url => 'http://creativecommons.org/licenses/by-sa/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nc)', :url => 'http://creativecommons.org/licenses/by-nc/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nc-nd)', :url => 'http://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'CC (by-nc-sa)', :url => 'http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', :environment => environment)
+      License.create!(:name => 'Free Art', :url => 'http://artlibre.org/licence/lal/en', :environment => environment)
+      License.create!(:name => 'GNU FDL', :url => 'http://www.gnu.org/licenses/fdl-1.3.txt', :environment => environment)
+    end
+  end
+
+  def self.down
+    licenses = []
+    licenses += License.find(:all, :conditions => {:name => 'CC (by)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nd)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-sa)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc-nd)'})
+    licenses += License.find(:all, :conditions => {:name => 'CC (by-nc-sa)'})
+    licenses += License.find(:all, :conditions => {:name => 'Free Art'})
+    licenses += License.find(:all, :conditions => {:name => 'GNU FDL'})
+    licenses.compact.map(&:destroy)
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120411132751) do
+ActiveRecord::Schema.define(:version => 20120718162001) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -85,6 +85,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
+    t.integer  "license_id"
   end
   create_table "articles", :force => true do |t|
@@ -125,6 +126,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.integer  "translation_of_id"
     t.string   "language"
     t.string   "source_name"
+    t.integer  "license_id"
   end
   add_index "articles", ["translation_of_id"], :name => "index_articles_on_translation_of_id"
@@ -314,6 +316,13 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
   add_index "inputs", ["product_category_id"], :name => "index_inputs_on_product_category_id"
   add_index "inputs", ["product_id"], :name => "index_inputs_on_product_id"
+  create_table "licenses", :force => true do |t|
+    t.string  "name",           :null => false
+    t.string  "slug",           :null => false
+    t.string  "url"
+    t.integer "environment_id", :null => false
+  end
+
   create_table "mailing_sents", :force => true do |t|
     t.integer  "mailing_id"
     t.integer  "person_id"
@@ -425,6 +434,8 @@ ActiveRecord::Schema.define(:version =&gt; 20120411132751) do
     t.boolean  "validated",                          :default => true
     t.string   "cnpj"
     t.string   "national_region_code"
+    t.boolean  "is_template",                        :default => false
+    t.integer  "template_id"
   end
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
@@ -47,11 +47,12 @@ Depends:
  memcached,
  debconf,
  dbconfig-common,
- postgresql,
  adduser,
  exim4 | mail-transport-agent,
  ${misc:Depends}
-Recommends: postgresql-client
+Recommends:
+ postgresql,
+ postgresql-client
 Description: free web-based platform for social networks
  Noosfero is a web platform for social and solidarity economy networks with
  blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
@@ -2,7 +2,7 @@
 pid: tmp/pids/thin.pid
 address: 127.0.0.1
 user: noosfero
-timeout: 30
+timeout: 0
 port: 50000
 log: log/thin.log
 max_conns: 1024
 Feature: edit environment templates
   As an administrator
-  I want edit templates
+  I want to edit templates
   Background:
     Given that the default environment have all profile templates
@@ -9,37 +9,37 @@ Feature: edit environment templates
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    Then I should see "Edit Person Template" link
-    And I should see "Edit Community Template" link
-    And I should see "Edit Enterprise Template" link
-    And I should see "Edit Inactive Enterprise Template" link
+    Then I should see "Person template" link
+    And I should see "Community template" link
+    And I should see "Enterprise template" link
+    And I should see "Inactive Enterprise template" link
   Scenario: Go to control panel of person template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Person Template"
+    And I follow "Person template"
     Then I should be on Person template's control panel
   Scenario: Go to control panel of enterprise template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Enterprise Template"
+    And I follow "Enterprise template"
     Then I should be on Enterprise template's control panel
   Scenario: Go to control panel of inactive enterprise template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Inactive Enterprise Template"
+    And I follow "Inactive enterprise template"
     Then I should be on Inactive Enterprise template's control panel
   Scenario: Go to control panel of community template
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    And I follow "Edit Community Template"
+    And I follow "Community template"
     Then I should be on Community template's control panel
   Scenario: Not see link to edit an unexistent template
@@ -47,7 +47,7 @@ Feature: edit environment templates
     And I am logged in as admin
     When I follow "Administration"
     And I follow "Edit Templates"
-    Then I should see "Edit Person Template" link
-    And I should see "Edit Community Template" link
-    And I should see "Edit Enterprise Template" link
-    And I should not see "Edit Inactive Enterprise Template" link
+    Then I should see "Person template" link
+    And I should see "Community template" link
+    And I should see "Enterprise template" link
+    And I should not see "Inactive enterprise template" link
@@ -0,0 +1,14 @@
+Then /^I directly delete content with name "([^\"]*)" for testing purposes$/ do |content_name|
+  Article.find_by_name(content_name).destroy
+end
+
+Then /^I should be at the url "([^\"]*)"$/ do |url|
+  if response.class.to_s == 'Webrat::SeleniumResponse'
+    URI.parse(response.selenium.get_location).path.should == url
+  else
+    URI.parse(current_url).path.should == url
+  end
+end
+
+Then /^I don't fill anything$/ do
+end
-KALIBRO PLUGIN AUTHORS
-=====================
+Mezuro Authors
+==============
-Copyright 2010-2011
-        Almir Alves Pereira (almir.sne at gmail.com)
-        Andre Casimiro (ah.casimiro at gmail.com)
-        Carlos Morais (carlos88morais at gmail.com)
-        Everton Santos (everton2x4 at gmail.com)
-        Paulo Meirelles (paulo at softwarelivre.org)
-        Rafael Messias (rmmartins at gmail.com)
+Copyright 2010-2012
+-------------------
-Collaborators:
-- Ana Paula Oliveira dos Santos (ana at ime.usp.br)
-- Lucianna Almeida (lucianna.th at gmail.com)
-- Joao Machini (joao.machini at gmail.com)
-- Rodrigo Souto (rodrigo@colivre.coop.br)
-- Thiago Colucci (ticolucci at gmail.com)
-- Vinicius Daros (vinicius.k.daros at gmail.com)
-- Viviane Almeida Santos (viviane.almeida at gmail.com)
+ Almir Alves Pereira (almir.sne at gmail.com)
+ Alessandro Palmeira (alessandro.palmeira at gmail.com)
+ Andre Casimiro (ah.casimiro at gmail.com)
+ Antonio Terceiro (terceiro at colivre.coop.br)
+ Caio Salgado (caio.csalgado at gmail.com)
+ Carlos Morais (carlos88morais at gmail.com)
+ Diego Araújo (diegoamc90 at gmail.com)
+ Everton Santos (everton2x4 at gmail.com)
+ Jefferson Fernandes (jeffs.fernandes at gmail.com) 
+ Joao Machini (joao.machini at gmail.com)
+ João da Silva (jaodsilv@linux.ime.usp.br)
+ Paulo Meirelles (paulo at softwarelivre.org)
+ Rafael Manso (rr.manzo at gmail.com)
+ Rafael Messias (rmmartins at gmail.com)
+ Renan Teruo (renanteruoc at gmail.com)
+ Rodrigo Souto (rodrigo at colivre.coop.br)
+
+Collaborators (from USP Lab XP course 2010 on another code)
+-----------------------------------------------------------
+
+ Ana Paula Oliveira dos Santos (anapaulao.santos at gmail.com)
+ Lucianna Almeida (lucianna.th at gmail.com)
+ Thiago Colucci (ticolucci at gmail.com)
+ Vinicius Daros (vinicius.k.daros at gmail.com)
+ Viviane Almeida Santos (viviane.almeida at gmail.com)
+
+Advisors
+--------
+
+ Fabio Kon (fabio.kon at ime.usp.br)
+ Alfredo Goldman (gold at ime.usp.br)
-README - Mezuro (Kalibro Plugin)
+README - Mezuro (Mezuro Plugin)
 ================================
-Mezuro is source code tracking network based on Noosfero Platform with Kalibro Plugin to access Kalibro Web Service.
+Mezuro is a source code tracking platform based on Noosfero social networking
+platform with Mezuro Plugin actived to access Kalibro Web Service.
+
 INSTALL
 =======
-See the Noosfero install file and include Ruby gem Savon:
+Dependences
+-----------
+
+See the Noosfero install file. After install Noosfero, install Mezuro dependences:
-gem install savon
+$ gem install nokogiri -v 1.5.0
+$ gem install savon -v 0.9.7
+$ gem install googlecharts
-Also, you need to enable Mezuro Plugin in the Noosfero:
+Enable Plugin
+-------------
+
+Also, you need to enable Mezuro Plugin at you Noosfero:
 cd <your_noosfero_dir>
 ./script/noosfero-plugins enable mezuro
-To run Mezuro (kalibro Plugin) and its acceptance tests, you need to install the Kalibro Service. 
+
+Install Service
+---------------
+
+To run Mezuro (Noosfero with Mezuro Plugin), you need to install the Kalibro
+Service. 
+
 For that, access https://gitorious.org/kalibro/kalibro/blobs/master/INSTALL
-SOURCE CODE
+Configure Service Address
+-------------------------
+
+Finally, copy service.yaml.example to service.yaml and define your Kalibro
+Service address:
+
+$ cd <your_noosfero_dir>/plugin/mezuro
+$ cp service.yaml.example service.yaml
+
+If you install Kalibro Service at localhost, just keep the default
+adress:
+
+http://localhost:8080/KalibroService/
+
+Applying Mezuro Theme
+---------------------
+
+$ cd public/designs/themes && rm -f default
+$ git clone git://gitorious.org/mezuro/mezuro-theme.git
+$ ln -s mezuro-theme/ default && cd ../../../
+
+Active Plugin
+-------------
+
+As a Noosfero administrator user, go to administrator panel:
+
+- Click on "Enable/disable plugins" option
+- Click on "Mezuro Plugin" check-box
+
+
+DEVELOPMENT
 ===========
-To get the Mezuro (Noosfero with Kalibro Plugin) development repository:
+Get the Mezuro (Noosfero with Mezuro Plugin) development repository:
-git clone https://gitorious.org/+mezuro/noosfero/mezuro-noosfero-plugin
-cd mezuro-noosfero-plugin
-git checkout mezuro
+$ git clone https://gitorious.org/+mezuro/noosfero/mezuro
+$ cd mezuro
+$ git checkout mezuro
-AUTHORS
-=======
+Running Mezuro tests
+--------------------
-Please see the file AUTHORS.
+$ rake test:noosfero_plugins:mezuro
-BUGS
-====
-If you found any bug, please report at mezuro@listas.softwarelivre.org
-(http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/mezuro)
+Get Involved
+============
+
+If you found any bug and/or want to collaborate, please send an e-mail to
+paulo@softwarelivre.org
+
 LICENSE
 =======
-Copyright (c) The Authors developers.
+
+Copyright (c) The Author developers.
 See Noosfero license.
+AUTHORS
+=======
+
+Please, see the Mezuro AUTHORS file.
+
+
 ACKNOWLEDGMENTS
 ===============
 The authors have been supported by organizations:
+University of São Paulo (USP)
+FLOSS Competence Center
+http://ccsl.ime.usp.br
+
 Brazilian National Research Council (CNPQ)
 http://www.cnpq.br/
-
-USP FLOSS Competence Center
-http://ccsl.ime.usp.br/
@@ -0,0 +1,73 @@
+README/TODO do branch cucumber_tests
+
+Tarefas:
+- Escrever uma história (procurar uma já escrita) para isso
+- Descobrir o porquê dos erros nos testes do mezuro (repository_url)
+- Dar rebase com o mezuro-dev (os tais testes passam no mezuro-dev)
+- Fazer mais testes
+- Ver como/quando o selenium pode ser integrado ao projeto (conversar com noosfero/ talvez até tentar implementar alguma coisa??)
+
+
+Testes de aceitação a serem feitos: (* já feito)
+
+Projetos:
+  Criar
+    * correto
+    * errado
+    duplicado
+  Editar
+    correto
+    errado
+  Deletar(não precisa fazer - problema do noosfero)
+
+Configurações:
+  criar
+    *correta
+    *errado (sem titulo)
+    *duplicada
+  editar - verificar se mantem as metricas
+    correto
+    não é possível mudar o titulo
+  deletar (não precisa fazer - problema do noosfero)
+  metricas:
+    criar
+      nativa:
+        *correta
+        *errada
+        duplicada (é pra funcionar?)
+      composta:
+        *correta
+        errada
+        duplicada
+    editar
+      para metrica correta
+      para metrica errada
+    *deletar
+    ranges:
+      criar
+        *range correto
+        range errado
+          todos os casos
+      editar
+        para range correto
+        para range errado
+      deletar
+      
+Testes falhando:
+
+Arquivo adding_metric_configuration.feature:
+  Scenario: adding a native metric configuration without code
+    Precisa do selenium para ver em qual página está.
+  Scenario: adding a compound metric configuration
+  Scenario: adding a compound metric configuration with invalid script
+    As métricas compostas não estão salvando direito.
+  
+
+Arquivo creating_project.feature:
+  Scenario: I create a Kalibro project with valid attributes
+    ás vezes falha por erro de já existir na Kalibro. Esse erro teóricamente já havia sido resolvido. 
+
+
+Arquivo adding_ranges.feature:
+  Scenario: adding a range to a metric configuration
+    Precisa do selenium para esperar a página carregar.
@@ -0,0 +1,126 @@
+class MezuroPluginMyprofileController < ProfileController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+ 
+  def choose_base_tool
+    @configuration_content = profile.articles.find(params[:id])
+    @base_tools = Kalibro::BaseTool.all_names
+  end
+
+  def choose_metric
+    @configuration_content = profile.articles.find(params[:id])
+    @base_tool = params[:base_tool]
+    @supported_metrics = Kalibro::BaseTool.find_by_name(@base_tool).supported_metrics
+  end
+  
+  def new_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric = Kalibro::BaseTool.find_by_name(params[:base_tool]).metric params[:metric_name]
+  end
+  
+  def new_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configurations = @configuration_content.metric_configurations
+  end
+  
+  def edit_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
+    @metric = @metric_configuration.metric
+  end
+
+  def edit_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
+    @metric_configurations = @configuration_content.metric_configurations
+    @metric = @metric_configuration.metric
+  end
+  
+  def create_metric_configuration
+    id = params[:id]
+    metric_name = params[:metric_configuration][:metric][:name]
+    (Kalibro::MetricConfiguration.new(params[:metric_configuration])).save
+    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+  end
+  
+  def create_compound_metric_configuration
+    id = params[:id]
+    metric_name = params[:metric_configuration][:metric][:name]
+    Kalibro::MetricConfiguration.new(params[:metric_configuration]).save
+    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+  end
+
+  def update_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
+    metric_configuration.update_attributes params[:metric_configuration]
+    redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+  end
+
+  def update_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
+    metric_configuration.update_attributes params[:metric_configuration]
+    redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+  end
+
+  def remove_metric_configuration
+    configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+    metric_configuration.destroy
+    redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+  end
+  
+  def new_range
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_name = params[:metric_name]
+    @range = Kalibro::Range.new
+  end
+  
+  def edit_range
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_name = params[:metric_name]
+    @beginning_id = params[:beginning_id]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name)
+    @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || @beginning_id =="-INF" }
+  end
+
+  def create_range
+    @configuration_content = profile.articles.find(params[:id])
+    @range = Kalibro::Range.new params[:range]
+    metric_name = params[:metric_name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)   
+    metric_configuration.add_range(@range)
+    metric_configuration.save
+  end
+  
+  def update_range
+    configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_name]
+    beginning_id = params[:beginning_id]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+    index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
+    metric_configuration.ranges[index] = Kalibro::Range.new params[:range]
+    metric_configuration.save
+  end
+  
+  def remove_range
+    configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_name]
+    beginning_id = params[:beginning_id]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+    metric_configuration.ranges.delete_if { |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
+    metric_configuration.save
+    formatted_metric_name = metric_name.gsub(/\s/, '+')
+    if metric_configuration.metric.class == Kalibro::CompoundMetric
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+    else
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+    end
+  end
+
+end
 class MezuroPluginProfileController < ProfileController
-  def metrics
-    project_content = profile.articles.find(params[:id])
-    module_name = params[:module_name]
-    render :partial => 'content_viewer/module_result', :locals => { :module_result => project_content.module_result(module_name) }
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  
+  def project_state
+    @content = profile.articles.find(params[:id])
+    project = @content.project
+    state = project.error.nil? ? project.state : "ERROR"
+    render :text => state
   end
+  def project_error
+    @content = profile.articles.find(params[:id])
+    @project = @content.project
+    render :partial => 'content_viewer/project_error'
+  end
+
+  def project_result
+    @content = profile.articles.find(params[:id])
+    date = params[:date]
+    @project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
+    render :partial => 'content_viewer/project_result'
+  end 	
+
+  def module_result
+    @content = profile.articles.find(params[:id])
+    @module_result = @content.module_result(params)
+    render :partial => 'content_viewer/module_result'
+  end
+
+  def project_tree
+    @content = profile.articles.find(params[:id])
+    date = params[:date]
+    project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
+    @project_name = @content.project.name
+    @source_tree = project_result.node_of(params[:module_name])
+    render :partial =>'content_viewer/source_tree'
+  end
+
+  def module_metrics_history
+    metric_name = params[:metric_name]
+    @content = profile.articles.find(params[:id])
+    module_history = @content.result_history(params[:module_name])
+    @score_history = filtering_metric_history(metric_name, module_history)
+    render :partial => 'content_viewer/score_history'
+  end
+
+  def module_grade_history
+    @content = profile.articles.find(params[:id])
+    modules_results = @content.result_history(params[:module_name])
+    @score_history = modules_results.collect { |module_result| module_result.grade }
+    render :partial => 'content_viewer/score_history'
+  end
+  
+  private
+  
+  def filtering_metric_history(metric_name, module_history)
+    metrics_history = module_history.map do |module_result|
+      module_result.metric_results
+    end
+    metric_history =  metrics_history.map do |array_of_metric_result|
+      (array_of_metric_result.select do |metric_result|
+        metric_result.metric.name.delete("() ") == metric_name
+      end).first
+    end
+    metric_history.map do |metric_result|
+      metric_result.value
+    end
+  end
 end
@@ -1,69 +0,0 @@
-Feature: mezuro content
-  As a noosfero user
-  I want to create a Kalibro project
-
-  Background:
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And I am logged in as "joaosilva"
-    And "Mezuro" plugin is enabled
-    And the following community
-      | identifier  | name         |
-      | mycommunity | My Community |
-    And "Joao Silva" is admin of "My Community"
-
-  Scenario: I see Kalibro project as an option to new content
-    Given I am on My Community's cms
-    When I follow "New content"
-    Then I should see "Kalibro project"
-
-  Scenario: I see Kalibro project's input form
-    Given I am on My Community's cms
-    When I follow "New content"
-    And I follow "Kalibro project"
-    Then I should see "Title"
-    And I should see "License"
-    And I should see "Repository type"
-    And I should see "GIT"
-    And I should see "REMOTE_ZIP"
-    And I should see "REMOTE_TARBALL"
-    And I should see "SUBVERSION"
-    And I should see "Repository url"
-    And I should see "Configuration"
-    And I should see "Kalibro for Java"
-
-  Scenario: I create a sample mezuro content
-    Given I am on My Community's cms
-    When I create a content of type "Kalibro project" with the following data
-      | Title           | Sample project          |
-      | License         | BSD                     |
-      | Repository type | GIT                     |
-      | Repository url  | git://example           |
-    Then I should see "Sample project"
-    And I should see "Viewed one time"
-    And I should see "BSD"
-
-  Scenario: I create a real mezuro content
-    Given I am on My Community's cms
-    When I create a content of type "Kalibro project" with the following data
-      | Title           | Qt-Calculator           |
-      | License         | GPL 2.0                 |
-      | Repository type | SUBVERSION              |
-      | Repository url  | https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator |
-    Then I should see "Qt-Calculator"
-
-  Scenario: I see results from a real Kalibro project
-    Given I am on My Community's cms
-    When I create a content of type "Kalibro project" with the following data
-      | Title           | Qt-Calculator           |
-      | License         | GPL                     |
-      | Repository type | SUBVERSION              |
-      | Repository url  | https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator |
-      | Configuration   | Kalibro for Java        |
-   Then I should see "Qt-Calculator"
-   And I should see "GPL"
-   And I should see "SUBVERSION"
-   And I should see "https://qt-calculator.svn.sourceforge.net/svnroot/qt-calculator"
-   And I should see "Kalibro for Java"
-   And I should see "Kalibro Service is loading the source code"
@@ -0,0 +1,29 @@
+class Kalibro::BaseTool < Kalibro::Model
+
+  attr_accessor :name, :description, :supported_metric
+
+  def self.all_names
+    request("BaseTool", :get_base_tool_names)[:base_tool_name].to_a
+  end
+
+  def self.find_by_name(base_tool_name)
+    new request("BaseTool", :get_base_tool, {:base_tool_name => base_tool_name})[:base_tool]
+  end
+
+  def supported_metric=(value)
+    @supported_metric = Kalibro::NativeMetric.to_objects_array value
+  end
+
+  def supported_metrics
+    @supported_metric
+  end
+
+  def supported_metrics=(supported_metrics)
+    @supported_metric = supported_metrics
+  end
+
+  def metric(name)
+    supported_metrics.find {|metric| metric.name == name}
+  end
+
+end
@@ -1,16 +0,0 @@
-class Kalibro::Client::BaseToolClient
-  
-  def initialize
-    @port = Kalibro::Client::Port.new('BaseTool')
-  end
-
-  def base_tool_names
-    @port.request(:get_base_tool_names)[:base_tool_name].to_a
-  end
-
-  def base_tool(name)
-    hash = @port.request(:get_base_tool, {:base_tool_name => name})[:base_tool]
-    Kalibro::Entities::BaseTool.from_hash(hash)
-  end
-
-end
 \ No newline at end of file
@@ -1,31 +0,0 @@
-class Kalibro::Client::ConfigurationClient
-
-  def initialize
-    @port = Kalibro::Client::Port.new('Configuration')
-  end
-
-  def save(configuration)
-    @port.request(:save_configuration, {:configuration => configuration.to_hash})
-  end
-
-  def self.save(configuration)
-    new.save(configuration)
-  end
-
-  def configuration_names
-    @port.request(:get_configuration_names)[:configuration_name].to_a
-  end
-
-  def configuration(name)
-    hash = @port.request(:get_configuration, {:configuration_name => name})[:configuration]
-    Kalibro::Entities::Configuration.from_hash(hash)
-  end
-
-  def remove(configuration_name)
-    @port.request(:remove_configuration, {:configuration_name => configuration_name})
-  end
-
-  def self.remove(configuration_name)
-    new.remove(configuration_name)
-  end
-end
@@ -1,19 +0,0 @@
-class Kalibro::Client::KalibroClient
-  
-  def initialize
-    @port = Kalibro::Client::Port.new('Kalibro')
-  end
-
-  def supported_repository_types
-    @port.request(:get_supported_repository_types)[:repository_type].to_a
-  end
-
-  def process_project(project_name)
-    @port.request(:process_project, {:project_name => project_name})
-  end
-
-  def self.process_project(project_name)
-    new.process_project(project_name)
-  end
-
-end
@@ -1,27 +0,0 @@
-class Kalibro::Client::ModuleResultClient
-  
-  def initialize
-    @port = Kalibro::Client::Port.new('ModuleResult')
-  end
-
-  def module_result(project_name, module_name, date)
-    hash = @port.request(:get_module_result,
-      {:project_name => project_name, :module_name => module_name,
-       :date => date_with_milliseconds(date)})[:module_result]
-    Kalibro::Entities::ModuleResult.from_hash(hash)
-  end
-
-  def result_history(project_name, module_name)
-    value = @port.request(:get_result_history,
-      {:project_name => project_name, :module_name => module_name})[:module_result]
-    Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult)
-  end
-
-  private
-
-  def date_with_milliseconds(date)
-    milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
-    date.to_s[0..18] + milliseconds + date.to_s[19..-1]
-  end
-
-end
 \ No newline at end of file
@@ -1,26 +0,0 @@
-require 'savon'
-
-Savon.configure do |config|
-  config.log = HTTPI.log = (RAILS_ENV == 'development')
-end
-
-class Kalibro::Client::Port
-
-  def initialize(endpoint)
-    @client = Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
-  end
-
-  def service_address
-    if @service_address.nil?
-      service_file = "#{RAILS_ROOT}/plugins/mezuro/SERVICE"
-      File.open(service_file).each_line{ | line | @service_address = line }
-    end
-    @service_address
-  end
-
-  def request(action, request_body = nil)
-    response = @client.request(:kalibro, action) { soap.body = request_body }
-    response.to_hash["#{action}_response".to_sym]
-  end
-
-end
@@ -1,31 +0,0 @@
-class Kalibro::Client::ProjectClient
-
-  def initialize
-    @port = Kalibro::Client::Port.new('Project')
-  end
-
-  def save(project)
-    @port.request(:save_project, {:project => project.to_hash})
-  end
-
-  def self.save(project)
-    new.save(project)
-  end
-
-  def project_names
-    @port.request(:get_project_names)[:project_name].to_a
-  end
-
-  def project(name)
-    hash = @port.request(:get_project, {:project_name => name})[:project]
-    Kalibro::Entities::Project.from_hash(hash)
-  end
-
-  def remove(project_name)
-    @port.request(:remove_project, {:project_name => project_name})
-  end
-
-  def self.remove(project_name)
-    new.remove(project_name)
-  end
-end
@@ -1,41 +0,0 @@
-class Kalibro::Client::ProjectResultClient
-
-  def initialize
-    @port = Kalibro::Client::Port.new('ProjectResult')
-  end
-
-  def has_results_for(project_name)
-    @port.request(:has_results_for, {:project_name => project_name})[:has_results]
-  end
-
-  def has_results_before(project_name, date)
-    @port.request(:has_results_before, {:project_name => project_name, :date => date})[:has_results]
-  end
-
-  def has_results_after(project_name, date)
-    @port.request(:has_results_after, {:project_name => project_name, :date => date})[:has_results]
-  end
-
-  def first_result(project_name)
-    hash = @port.request(:get_first_result_of, {:project_name => project_name})[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-  def last_result(project_name)
-    hash = @port.request(:get_last_result_of, {:project_name => project_name})[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-  def first_result_after(project_name, date)
-    request_body = {:project_name => project_name, :date => date}
-    hash = @port.request(:get_first_result_after, request_body)[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-  def last_result_before(project_name, date)
-    request_body = {:project_name => project_name, :date => date}
-    hash = @port.request(:get_last_result_before, request_body)[:project_result]
-    Kalibro::Entities::ProjectResult.from_hash(hash)
-  end
-
-end
 \ No newline at end of file
@@ -0,0 +1,5 @@
+class Kalibro::CompoundMetric < Kalibro::Metric
+
+  attr_accessor :script
+
+end
@@ -0,0 +1,13 @@
+class Kalibro::CompoundMetricWithError < Kalibro::Model
+  
+  attr_accessor :metric, :error
+
+  def metric=(value)
+    @metric = Kalibro::CompoundMetric.to_object value
+  end
+  
+  def error=(value)
+    @error = Kalibro::Error.to_object value
+  end
+
+end
@@ -0,0 +1,45 @@
+class Kalibro::Configuration < Kalibro::Model
+
+  attr_accessor :name, :description, :metric_configuration
+
+  def metric_configuration=(value)
+    @metric_configuration = Kalibro::MetricConfiguration.to_objects_array value
+  end
+
+  def metric_configurations
+    if @metric_configuration != nil
+      @metric_configuration
+    else
+      []
+    end
+  end
+
+  def metric_configurations=(metric_configurations)
+    @metric_configuration = metric_configurations
+  end
+
+  def self.find_by_name(configuration_name)
+    begin
+      new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
+    rescue Exception => error
+      nil
+    end
+  end
+
+  def self.all_names
+    begin
+      request("Configuration", :get_configuration_names)[:configuration_name]
+    rescue Exception
+      []
+    end
+  end
+
+  def update_attributes(attributes={})
+    attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
+    save
+  end
+
+  def metric_configurations_hash
+    self.to_hash[:metric_configuration]
+  end
+end
@@ -1,17 +0,0 @@
-class Kalibro::Entities::BaseTool < Kalibro::Entities::Entity
-  
-  attr_accessor :name, :description, :supported_metric
-
-  def supported_metric=(value)
-    @supported_metric = to_entity_array(value, Kalibro::Entities::NativeMetric)
-  end
-  
-  def supported_metrics
-    @supported_metric
-  end
-
-  def supported_metrics=(supported_metrics)
-    @supported_metric = supported_metrics
-  end
-
-end
 \ No newline at end of file
@@ -1,5 +0,0 @@
-class Kalibro::Entities::CompoundMetric < Kalibro::Entities::Metric
-
-  attr_accessor :script
-
-end
 \ No newline at end of file
@@ -1,13 +0,0 @@
-class Kalibro::Entities::CompoundMetricWithError < Kalibro::Entities::Entity
-  
-  attr_accessor :metric, :error
-
-  def metric=(value)
-    @metric = to_entity(value, Kalibro::Entities::CompoundMetric)
-  end
-  
-  def error=(value)
-    @error = to_entity(value, Kalibro::Entities::Error)
-  end
-
-end
 \ No newline at end of file
@@ -1,17 +0,0 @@
-class Kalibro::Entities::Configuration < Kalibro::Entities::Entity
-
-  attr_accessor :name, :description, :metric_configuration
-
-  def metric_configuration=(value)
-    @metric_configuration = to_entity_array(value, Kalibro::Entities::MetricConfiguration)
-  end
-
-  def metric_configurations
-    @metric_configuration
-  end
-
-  def metric_configurations=(metric_configurations)
-    @metric_configuration = metric_configurations
-  end
-
-end
@@ -1,53 +0,0 @@
-class Kalibro::Entities::Entity
-
-  def self.from_hash(hash)
-    entity = self.new
-    hash.each { |field, value| entity.set(field, value) }
-    entity
-  end
-
-  def set(field, value)
-    send("#{field}=", value)
-  end
-
-  def to_entity_array(value, entity_class = nil)
-    array = value.kind_of?(Array) ? value : [value]
-    array.each.collect { |element| to_entity(element, entity_class) }
-  end
-
-  def to_entity(value, entity_class)
-    value.kind_of?(Hash) ? entity_class.from_hash(value) : value
-  end
-
-  def to_hash
-    hash = Hash.new
-    fields.each do |field|
-      field_value = self.get(field)
-      hash[field] = convert_to_hash(field_value) if ! field_value.nil?
-    end
-    hash
-  end
-
-  def convert_to_hash(value)
-    return value.collect { |element| convert_to_hash(element) } if value.kind_of?(Array)
-    return value.to_hash if value.kind_of?(Kalibro::Entities::Entity)
-    value
-  end
-
-  def ==(other)
-    begin
-      fields.each.inject(true) { |equal, field| equal && (self.get(field) == other.get(field)) }
-    rescue NoMethodError
-      false
-    end
-  end
-
-  def fields
-    instance_variable_names.each.collect { |variable| variable.to_s.sub(/@/, '').to_sym }
-  end
-
-  def get(field)
-    send("#{field}")
-  end
-  
-end
 \ No newline at end of file
@@ -1,17 +0,0 @@
-class Kalibro::Entities::Error < Kalibro::Entities::Entity
-  
-  attr_accessor :message, :stack_trace_element
-
-  def stack_trace_element=(value)
-    @stack_trace_element = to_entity_array(value, Kalibro::Entities::StackTraceElement)
-  end
-  
-  def stack_trace
-    @stack_trace_element
-  end
-
-  def stack_trace=(stack_trace)
-    @stack_trace_element = stack_trace
-  end
-
-end
 \ No newline at end of file
@@ -1,5 +0,0 @@
-class Kalibro::Entities::Metric < Kalibro::Entities::Entity
-  
-  attr_accessor :name, :scope, :description
-
-end
 \ No newline at end of file
@@ -1,26 +0,0 @@
-class Kalibro::Entities::MetricConfiguration < Kalibro::Entities::Entity
-
-  attr_accessor :metric, :code, :weight, :aggregation_form, :range
-
-  def metric=(value)
-    if value.kind_of?(Hash)
-      @metric = to_entity(value, Kalibro::Entities::CompoundMetric) if value.has_key?(:script)
-      @metric = to_entity(value, Kalibro::Entities::NativeMetric) if value.has_key?(:origin)
-    else
-      @metric = value
-    end
-  end
-
-  def range=(value)
-    @range = to_entity_array(value, Kalibro::Entities::Range)
-  end
-
-  def ranges
-    @range
-  end
-
-  def ranges=(ranges)
-    @range = ranges
-  end
-
-end
 \ No newline at end of file
@@ -1,33 +0,0 @@
-class Kalibro::Entities::MetricResult < Kalibro::Entities::Entity
-
-  attr_accessor :metric, :value, :range, :descendent_result, :weight
-
-  def metric=(value)
-    if value.kind_of?(Hash)
-      if value.has_key?(:script)
-        @metric = to_entity(value, Kalibro::Entities::CompoundMetric)
-      else
-        @metric = to_entity(value, Kalibro::Entities::NativeMetric)
-      end
-    else
-      @metric = value
-    end
-  end
-
-  def range=(value)
-    @range = to_entity(value, Kalibro::Entities::Range)
-  end
-
-  def descendent_result=(value)
-    @descendent_result = to_entity_array(value)
-  end
-
-  def descendent_results
-    @descendent_result
-  end
-
-  def descendent_results=(descendent_results)
-    @descendent_result = descendent_results
-  end
-
-end
@@ -1,5 +0,0 @@
-class Kalibro::Entities::Module < Kalibro::Entities::Entity
-
-  attr_accessor :name, :granularity
-
-end
 \ No newline at end of file
@@ -1,29 +0,0 @@
-class Kalibro::Entities::ModuleNode < Kalibro::Entities::Entity
-
-  attr_accessor :module, :child
-
-  def module=(value)
-    @module = to_entity(value, Kalibro::Entities::Module)
-  end
-
-  def module_name
-    @module.name
-  end
-
-  def granularity
-    @module.granularity
-  end
-
-  def child=(value)
-    @child = to_entity_array(value, Kalibro::Entities::ModuleNode)
-  end
-
-  def children
-    @child
-  end
-
-  def children=(children)
-    @child = children
-  end
-
-end
@@ -1,33 +0,0 @@
-class Kalibro::Entities::ModuleResult < Kalibro::Entities::Entity
-
-  attr_accessor :module, :date, :grade, :metric_result, :compound_metric_with_error
-
-  def module=(value)
-    @module = to_entity(value, Kalibro::Entities::Module)
-  end
-
-  def metric_result=(value)
-    @metric_result = to_entity_array(value, Kalibro::Entities::MetricResult)
-  end
-
-  def metric_results
-    @metric_result
-  end
-
-  def metric_results=(metric_results)
-    @metric_result = metric_results
-  end
-
-  def compound_metric_with_error=(value)
-    @compound_metric_with_error = to_entity_array(value, Kalibro::Entities::CompoundMetricWithError)
-  end
-
-  def compound_metrics_with_error
-    @compound_metric_with_error
-  end
-
-  def compound_metrics_with_error=(compound_metrics_with_error)
-    @compound_metric_with_error = compound_metrics_with_error
-  end
-  
-end
 \ No newline at end of file
@@ -1,5 +0,0 @@
-class Kalibro::Entities::NativeMetric < Kalibro::Entities::Metric
-
-  attr_accessor :origin, :language
-
-end
 \ No newline at end of file
@@ -1,13 +0,0 @@
-class Kalibro::Entities::Project < Kalibro::Entities::Entity
-
-	attr_accessor :name, :license, :description, :repository, :configuration_name, :state, :error
-
-  def repository=(value)
-    @repository = to_entity(value, Kalibro::Entities::Repository)
-  end
-
-  def error=(value)
-    @error = to_entity(value, Kalibro::Entities::Error)
-  end
-
-end
 \ No newline at end of file
@@ -1,34 +0,0 @@
-class Kalibro::Entities::ProjectResult < Kalibro::Entities::Entity
-  
-  attr_accessor :project, :date, :load_time, :analysis_time, :source_tree
-
-  def project=(value)
-    @project = to_entity(value, Kalibro::Entities::Project)
-  end
-
-  def source_tree=(value)
-    @source_tree = to_entity(value, Kalibro::Entities::ModuleNode)
-  end
-
-  def formatted_load_time
-    format_milliseconds(@load_time)
-  end
-
-  def formatted_analysis_time
-     format_milliseconds(@analysis_time)
-  end
-
-  def format_milliseconds(value)
-    seconds = value.to_i/1000
-    hours = seconds/3600
-    seconds -= hours * 3600
-    minutes = seconds/60
-    seconds -= minutes * 60
-    "#{format(hours)}:#{format(minutes)}:#{format(seconds)}"
-  end
-
-  def format(amount)
-    ('%2d' % amount).sub(/\s/, '0')
-  end
-
-end
 \ No newline at end of file
@@ -1,5 +0,0 @@
-class Kalibro::Entities::Range < Kalibro::Entities::Entity
-  
-  attr_accessor :beginning, :end, :label, :grade, :color, :comments
-
-end
 \ No newline at end of file
@@ -1,5 +0,0 @@
-class Kalibro::Entities::Repository < Kalibro::Entities::Entity
-  
-  attr_accessor :type, :address, :username, :password
-
-end
 \ No newline at end of file
@@ -1,5 +0,0 @@
-class Kalibro::Entities::StackTraceElement < Kalibro::Entities::Entity
-  
-  attr_accessor :declaring_class, :method_name, :file_name, :line_number
-
-end
 \ No newline at end of file
@@ -0,0 +1,21 @@
+class Kalibro::Error < Kalibro::Model
+  
+  attr_accessor :error_class, :message, :stack_trace_element, :cause
+
+  def stack_trace_element=(value)
+    @stack_trace_element = Kalibro::StackTraceElement.to_objects_array value
+  end
+  
+  def stack_trace
+    @stack_trace_element
+  end
+
+  def stack_trace=(stack_trace)
+    @stack_trace_element = stack_trace
+  end
+
+  def cause=(cause_value)
+    @cause = Kalibro::Error.to_object cause_value
+  end
+
+end
@@ -0,0 +1,5 @@
+class Kalibro::Metric < Kalibro::Model
+  
+  attr_accessor :name, :scope, :description
+
+end
@@ -0,0 +1,72 @@
+class Kalibro::MetricConfiguration < Kalibro::Model
+
+  NATIVE_TYPE='native'
+  COMPOUND_TYPE='compound'
+  
+  attr_accessor :metric, :code, :weight, :aggregation_form, :range, :configuration_name
+
+  def metric=(value)
+    if value.kind_of?(Hash)
+      @metric = native?(value) ? Kalibro::NativeMetric.to_object(value) : Kalibro::CompoundMetric.to_object(value) 
+    else
+      @metric = value
+    end
+  end
+
+  def weight=(value)
+    @weight = value.to_f
+  end
+
+  def range=(value)
+    @range = Kalibro::Range.to_objects_array value
+  end
+
+  def add_range(new_range)
+    @range = [] if @range.nil?
+    @range << new_range
+  end
+
+  def ranges
+    @range
+  end
+
+  def ranges=(ranges)
+    @range = ranges
+  end
+
+  def update_attributes(attributes={})
+    attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
+    save
+  end
+
+  def self.find_by_configuration_name_and_metric_name(configuration_name, metric_name)
+    metric_configuration = new request("MetricConfiguration", :get_metric_configuration, {
+        :configuration_name => configuration_name,
+        :metric_name => metric_name
+      })[:metric_configuration]
+    metric_configuration.configuration_name = configuration_name
+    metric_configuration
+  end
+
+  def destroy
+    self.class.request("MetricConfiguration", :remove_metric_configuration, {
+        :configuration_name => configuration_name,
+        :metric_name=> metric.name
+      })
+  end
+  
+  def to_hash
+    super :except => [:configuration_name]
+  end
+
+  private
+  
+  def native?(value)
+    value.has_key?(:origin) ? true : false
+  end
+  
+  def save_params
+    {:metric_configuration => to_hash, :configuration_name => configuration_name}
+  end
+  
+end
@@ -0,0 +1,40 @@
+class Kalibro::MetricResult < Kalibro::Model
+
+  attr_accessor :metric, :value, :range, :descendent_result, :weight
+
+  def metric=(value)
+    if value.kind_of?(Hash)
+      @metric = native?(value) ? Kalibro::NativeMetric.to_object(value) : Kalibro::CompoundMetric.to_object(value) 
+    else
+      @metric = value
+    end
+  end
+
+  def value=(value)
+    @value = value.to_f
+  end
+
+  def range=(value)
+    @range = Kalibro::Range.to_object value
+  end
+
+  def descendent_result=(value)
+    array = value.kind_of?(Array) ? value : [value]
+    @descendent_result = array.collect {|element| element.to_f}
+  end
+
+  def descendent_results
+    @descendent_result
+  end
+
+  def descendent_results=(descendent_results)
+    @descendent_result = descendent_results
+  end
+  
+  private
+  
+  def native?(value)
+    value.has_key?(:origin) ? true : false
+  end
+
+end
@@ -0,0 +1,126 @@
+class Kalibro::Model
+
+  def initialize(attributes={})
+    attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
+  end
+
+  def to_hash(options={})
+    hash = Hash.new
+    excepts = !options[:except].nil? ? options[:except] : []
+    fields.each do |field|
+      if(!excepts.include?(field))
+        field_value = send(field)
+        hash[field] = convert_to_hash(field_value) if ! field_value.nil?
+        if field_value.is_a?(Kalibro::Model)
+          hash = {:attributes! => {}}.merge(hash)
+          hash[:attributes!][field.to_sym] = {
+            'xmlns:xsi'=> 'http://www.w3.org/2001/XMLSchema-instance',
+            'xsi:type' => 'kalibro:' + xml_class_name(field_value)  }
+        end
+      end
+    end
+    hash
+  end
+
+  def self.request(endpoint, action, request_body = nil)
+    response = client(endpoint).request(:kalibro, action) { soap.body = request_body }
+    response.to_hash["#{action}_response".to_sym] # response is a Savon::SOAP::Response, and to_hash is a Savon::SOAP::Response method
+  end
+
+  def self.to_objects_array value
+    array = value.kind_of?(Array) ? value : [value]
+    array.each.collect { |element| to_object(element) }
+  end
+
+  def self.to_object value
+    value.kind_of?(Hash) ? new(value) : value
+  end 
+  
+  def self.create(attributes={})
+    new_model = new attributes
+    new_model.save
+    new_model
+  end
+
+  def save
+    begin
+      self.class.request(save_endpoint, save_action, save_params)
+	    true
+	  rescue Exception => error
+		  false
+	  end
+  end
+
+  def destroy
+    begin
+      self.class.request(destroy_endpoint, destroy_action, destroy_params)
+    rescue Exception
+    end
+  end
+
+  protected
+
+  def fields
+    instance_variable_names.each.collect { |variable| variable.to_s.sub(/@/, '').to_sym }
+  end
+
+  def convert_to_hash(value)
+    return value if value.nil?
+    return value.collect { |element| convert_to_hash(element) } if value.is_a?(Array)
+    return value.to_hash if value.is_a?(Kalibro::Model)
+    return self.class.date_with_milliseconds(value) if value.is_a?(DateTime)    
+    return 'INF' if value.is_a?(Float) and value.infinite? == 1
+    return '-INF' if value.is_a?(Float) and value.infinite? == -1
+    value
+  end
+
+  def xml_class_name(object)
+    xml_name = object.class.name
+    xml_name["Kalibro::"] = ""
+    xml_name[0..0] = xml_name[0..0].downcase
+    xml_name + "Xml"
+  end
+
+  def self.client(endpoint)
+    service_address = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/service.yaml")
+    Savon::Client.new("#{service_address}#{endpoint}Endpoint/?wsdl")
+  end
+
+  def self.is_valid?(field)
+    field.to_s[0] != '@' and field != :attributes! and (field.to_s =~ /xsi/).nil?
+  end
+  
+  def self.date_with_milliseconds(date)
+    milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
+    date.to_s[0..18] + milliseconds + date.to_s[19..-1]
+  end
+  
+  def class_name
+    self.class.name.gsub(/Kalibro::/,"")
+  end
+  
+  def save_endpoint
+    class_name
+  end
+  
+  def save_action
+    "save_#{class_name.underscore}".to_sym
+  end
+  
+  def save_params
+    {class_name.underscore.to_sym => self.to_hash}
+  end
+  
+  def destroy_endpoint
+    class_name
+  end
+  
+  def destroy_action
+    "remove_#{class_name.underscore}".to_sym
+  end
+  
+  def destroy_params
+    {"#{class_name.underscore}_name".to_sym => self.name}
+  end
+
+end
@@ -0,0 +1,18 @@
+class Kalibro::Module < Kalibro::Model
+
+  attr_accessor :name, :granularity
+
+  def self.parent_names(name)
+    path = []
+    ancestors = []
+    name.split(".").each do |token|
+       path << token
+       ancestors << path.join(".")
+     end
+     ancestors
+  end
+
+  def ancestor_names
+    self.class.parent_names(@name)
+  end
+end
@@ -0,0 +1,21 @@
+class Kalibro::ModuleNode < Kalibro::Model
+
+  attr_accessor :module, :child
+
+  def module=(value)
+    @module = Kalibro::Module.to_object value
+  end
+
+  def child=(value)
+    @child = Kalibro::ModuleNode.to_objects_array value
+  end
+
+  def children
+    @child
+  end
+
+  def children=(children)
+    @child = children
+  end
+
+end
@@ -0,0 +1,63 @@
+class Kalibro::ModuleResult < Kalibro::Model
+
+  attr_accessor :module, :date, :grade, :metric_result, :compound_metric_with_error
+  
+  def self.find_by_project_name_and_module_name_and_date(project_name, module_name, date)
+    new request(
+    'ModuleResult',
+    :get_module_result,
+      {
+        :project_name => project_name, 
+        :module_name => module_name,
+        :date => date_with_milliseconds(date)
+      })[:module_result]
+  end
+  
+  def self.all_by_project_name_and_module_name(project_name, module_name)
+    response = request(
+    'ModuleResult',
+    :get_result_history,
+      {
+        :project_name => project_name, 
+        :module_name => module_name
+      })[:module_result]
+    Kalibro::ModuleResult.to_objects_array(response)
+  end
+  
+  def module=(value)
+    @module = Kalibro::Module.to_object value
+  end
+
+  def date=(value)
+    @date = value.is_a?(String) ? DateTime.parse(value) : value
+  end
+
+  def grade=(value)
+    @grade = value.to_f
+  end
+
+  def metric_result=(value)
+    @metric_result = Kalibro::MetricResult.to_objects_array value
+  end
+  
+  def metric_results
+    @metric_result
+  end
+  
+  def metric_results=(metric_results)
+    @metric_result = metric_results
+  end
+
+  def compound_metric_with_error=(value)
+    @compound_metric_with_error = Kalibro::CompoundMetricWithError.to_objects_array value
+  end
+
+  def compound_metrics_with_error
+    @compound_metric_with_error
+  end
+
+  def compound_metrics_with_error=(compound_metrics_with_error)
+    @compound_metric_with_error = compound_metrics_with_error
+  end
+
+end
@@ -0,0 +1,17 @@
+class Kalibro::NativeMetric < Kalibro::Metric
+
+  attr_accessor :origin, :language
+
+  def languages
+    @language
+  end
+
+  def languages=(languages)
+    @language = languages
+  end
+
+  def language=(value)
+    @language = Kalibro::Model.to_objects_array value
+  end
+
+end
@@ -0,0 +1,50 @@		@@ -0,0 +1,50 @@
	1	+class LicensesController < AdminController
	2	+ protect 'manage_environment_licenses', :environment
	3	+
	4	+ def index
	5	+ @licenses = environment.licenses
	6	+ end
	7	+
	8	+ def create
	9	+ @license = License.new(params[:license])
	10	+ if request.post?
	11	+ begin
	12	+ @license.environment = environment
	13	+ @license.save!
	14	+ session[:notice] = _('License created')
	15	+ redirect_to :action => 'index'
	16	+ rescue
	17	+ session[:notice] = _('License could not be created')
	18	+ end
	19	+ end
	20	+ end
	21	+
	22	+ def edit
	23	+ @license = environment.licenses.find(params[:license_id])
	24	+ if request.post?
	25	+ begin
	26	+ @license.update_attributes!(params[:license])
	27	+ session[:notice] = _('License updated')
	28	+ redirect_to :action => 'index'
	29	+ rescue
	30	+ session[:notice] = _('License could not be updated')
	31	+ end
	32	+ end
	33	+ end
	34	+
	35	+ def remove
	36	+ @license = environment.licenses.find(params[:license_id])
	37	+ if request.post?
	38	+ begin
	39	+ @license.destroy
	40	+ session[:notice] = _('License removed')
	41	+ rescue
	42	+ session[:notice] = _('License could not be removed')
	43	+ end
	44	+ else
	45	+ session[:notice] = _('License could not be removed')
	46	+ end
	47	+ redirect_to :action => 'index'
	48	+ end
	49	+
	50	+end
@@ -0,0 +1,52 @@		@@ -0,0 +1,52 @@
	1	+class TemplatesController < AdminController
	2	+ protect 'manage_environment_templates', :environment
	3	+
	4	+ def create_person_template
	5	+ if request.post?
	6	+ begin
	7	+ identifier = params[:name].to_slug
	8	+ password = Digest::MD5.hexdigest(rand.to_s)
	9	+ template = User.new(:login => identifier, :email => identifier+'@templates.noo', :password => password, :password_confirmation => password, :person_data => {:name => params[:name], :is_template => true})
	10	+ template.save!
	11	+ session[:notice] = _('New template created')
	12	+ redirect_to :action => 'index'
	13	+ rescue
	14	+ @error = _('Name has already been taken')
	15	+ end
	16	+ end
	17	+ end
	18	+
	19	+ def create_community_template
	20	+ if request.post?
	21	+ begin
	22	+ create_organization_template(Community)
	23	+ session[:notice] = _('New template created')
	24	+ redirect_to :action => 'index'
	25	+ rescue
	26	+ @error = _('Name has already been taken')
	27	+ end
	28	+ end
	29	+ end
	30	+
	31	+ def create_enterprise_template
	32	+ if request.post?
	33	+ begin
	34	+ create_organization_template(Enterprise)
	35	+ session[:notice] = _('New template created')
	36	+ redirect_to :action => 'index'
	37	+ rescue
	38	+ @error = _('Name has already been taken')
	39	+ end
	40	+ end
	41	+ end
	42	+
	43	+ private
	44	+
	45	+ def create_organization_template(klass)
	46	+ identifier = params[:name].to_slug
	47	+ template = klass.new(:name => params[:name], :identifier => identifier, :is_template => true)
	48	+ template.save!
	49	+ end
	50	+
	51	+end
	52	+
	@@ -99,6 +99,14 @@ class ContentViewerController < ApplicationController		@@ -99,6 +99,14 @@ class ContentViewerController < ApplicationController
99	@images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]	99	@images = @images.paginate(:per_page => per_page, :page => params[:npage]) unless params[:slideshow]
100	end	100	end
101		101
		102	+ @unfollow_form = params[:unfollow] && params[:unfollow] == 'true'
		103	+ if params[:unfollow] && params[:unfollow] == 'commit' && request.post?
		104	+ @page.followers -= [params[:email]]
		105	+ if @page.save
		106	+ session[:notice] = _("Notification of new comments to '%s' was successfully canceled") % params[:email]
		107	+ end
		108	+ end
		109	+
102	@comments = @page.comments(true).as_thread	110	@comments = @page.comments(true).as_thread
103	@comments_count = @page.comments.count	111	@comments_count = @page.comments.count
104	if params[:slideshow]	112	if params[:slideshow]
	@@ -1331,4 +1331,21 @@ module ApplicationHelper		@@ -1331,4 +1331,21 @@ module ApplicationHelper
1331	_("Are you sure that you want to remove the item \"#{article.name}\"?")	1331	_("Are you sure that you want to remove the item \"#{article.name}\"?")
1332	end	1332	end
1333	end	1333	end
		1334	+
		1335	+ def template_options(klass, field_name)
		1336	+ return '' if klass.templates.count == 0
		1337	+ return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
		1338	+
		1339	+ counter = 0
		1340	+ radios = klass.templates.map do \|template\|
		1341	+ counter += 1
		1342	+ content_tag('li', labelled_radio_button(template.name, "#{field_name}[template_id]", template.id, counter==1))
		1343	+ end.join("\n")
		1344	+
		1345	+ content_tag('div', content_tag('span', _('Template:')) +
		1346	+ content_tag('ul', radios, :style => 'list-style: none; padding-left: 0; margin-top: 0.5em;'),
		1347	+ :id => 'template-options',
		1348	+ :style => 'margin-top: 1em'
		1349	+ )
		1350	+ end
1334	end	1351	end
	@@ -75,11 +75,30 @@ class Comment < ActiveRecord::Base		@@ -75,11 +75,30 @@ class Comment < ActiveRecord::Base
75	article.comments_updated if article.kind_of?(Article)	75	article.comments_updated if article.kind_of?(Article)
76	end	76	end
77		77
78	- after_create do \|comment\|
79	- if comment.source.kind_of?(Article) && comment.article.notify_comments? && !comment.article.profile.notification_emails.empty?
80	- Comment::Notifier.deliver_mail(comment)	78	+ after_create :new_follower
		79	+ def new_follower
		80	+ if source.kind_of?(Article)
		81	+ article.followers += [author_email]
		82	+ article.followers -= article.profile.notification_emails
		83	+ article.followers.uniq!
		84	+ article.save
		85	+ end
		86	+ end
		87	+
		88	+ after_create :notify_by_mail
		89	+ def notify_by_mail
		90	+ if source.kind_of?(Article) && article.notify_comments?
		91	+ if !article.profile.notification_emails.empty?
		92	+ Comment::Notifier.deliver_mail(self)
		93	+ end
		94	+ emails = article.followers - [author_email]
		95	+ if !emails.empty?
		96	+ Comment::Notifier.deliver_mail_to_followers(self, emails)
		97	+ end
81	end	98	end
		99	+ end
82		100
		101	+ after_create do \|comment\|
83	if comment.source.kind_of?(Article)	102	if comment.source.kind_of?(Article)
84	comment.article.create_activity if comment.article.activity.nil?	103	comment.article.create_activity if comment.article.activity.nil?
85	if comment.article.activity	104	if comment.article.activity
	@@ -138,6 +157,22 @@ class Comment < ActiveRecord::Base		@@ -138,6 +157,22 @@ class Comment < ActiveRecord::Base
138	:environment => profile.environment.name,	157	:environment => profile.environment.name,
139	:url => profile.environment.top_url	158	:url => profile.environment.top_url
140	end	159	end
		160	+ def mail_to_followers(comment, emails)
		161	+ profile = comment.article.profile
		162	+ bcc emails
		163	+ from "#{profile.environment.name} <#{profile.environment.contact_email}>"
		164	+ subject _("[%s] %s commented on a content of %s") % [profile.environment.name, comment.author_name, profile.short_name]
		165	+ body :recipient => profile.nickname \|\| profile.name,
		166	+ :sender => comment.author_name,
		167	+ :sender_link => comment.author_link,
		168	+ :article_title => comment.article.name,
		169	+ :comment_url => comment.url,
		170	+ :unsubscribe_url => comment.article.view_url.merge({:unfollow => true}),
		171	+ :comment_title => comment.title,
		172	+ :comment_body => comment.body,
		173	+ :environment => profile.environment.name,
		174	+ :url => profile.environment.top_url
		175	+ end
141	end	176	end
142		177
143	def rejected?	178	def rejected?
	@@ -61,10 +61,10 @@ class Community < Organization		@@ -61,10 +61,10 @@ class Community < Organization
61		61
62	def name=(value)	62	def name=(value)
63	super(value)	63	super(value)
64	- self.identifier = value.to_slug	64	+ self.identifier \|\|= value.to_slug
65	end	65	end
66		66
67	- def template	67	+ def default_template
68	environment.community_template	68	environment.community_template
69	end	69	end
70		70
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class License < ActiveRecord::Base
	2	+ belongs_to :environment
	3	+ has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
	4	+
	5	+ validates_presence_of :name, :environment
	6	+ validates_presence_of :slug, :if => lambda {\|license\| license.name.present?}
	7	+ validates_uniqueness_of :slug, :scope => :environment_id
	8	+
	9	+ before_validation do \|license\|
	10	+ license.slug \|\|= license.name.to_slug if license.name.present?
	11	+ end
	12	+end
	@@ -77,6 +77,7 @@ class Organization < Profile		@@ -77,6 +77,7 @@ class Organization < Profile
77	state	77	state
78	country	78	country
79	tag_list	79	tag_list
		80	+ template_id
80	]	81	]
81		82
82	def self.fields	83	def self.fields
	@@ -285,7 +285,7 @@ class Person < Profile		@@ -285,7 +285,7 @@ class Person < Profile
285	end	285	end
286	end	286	end
287		287
288	- def template	288	+ def default_template
289	environment.person_template	289	environment.person_template
290	end	290	end
291		291
	@@ -114,6 +114,7 @@ class User < ActiveRecord::Base		@@ -114,6 +114,7 @@ class User < ActiveRecord::Base
114		114
115	# Activates the user in the database.	115	# Activates the user in the database.
116	def activate	116	def activate
		117	+ return false unless self.person
117	self.activated_at = Time.now.utc	118	self.activated_at = Time.now.utc
118	self.activation_code = nil	119	self.activation_code = nil
119	self.person.visible = true	120	self.person.visible = true