Merge pull request #221 from mezuro/configuration_visibility

Configuration visibility

Merge pull request #221 from mezuro/configuration_visibility
Configuration visibility
Pedro
2 parents 119b56ec 04c3f27d
Showing 60 changed files with 736 additions and 255 deletions Show diff stats
.gitignore
app/assets/stylesheets/form_with_tooltip.css
app/controllers/concerns/ownership_authentication.rb
app/controllers/kalibro_configurations_controller.rb
app/controllers/metric_configurations_controller.rb
app/controllers/projects_controller.rb
app/controllers/reading_groups_controller.rb
app/controllers/repositories_controller.rb
app/helpers/kalibro_configurations_helper.rb
app/helpers/reading_groups_helper.rb
app/models/kalibro_configuration.rb
app/models/kalibro_configuration_attributes.rb
app/models/kalibro_configuration_ownership.rb
app/models/project.rb
app/models/reading_group.rb
app/models/reading_group_attributes.rb
app/models/reading_group_ownership.rb
app/models/user.rb
app/views/kalibro_configurations/_form.html.erb
app/views/reading_groups/_form.html.erb
@@ -29,3 +29,4 @@ db_bootstrap.sql
 install.sh
 kalibro_gatekeeper.yml
 .capistrano
+rerun.txt
 .form-table {
   margin: 0 !important;
+  padding: 20px;
   background: #fff;
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
@@ -13,11 +14,32 @@
   display: inline-flex;
 }
+.form-row:first-child {
+  border-top: none;
+}
+
+.form-row:last-child {
+  border-bottom: none;
+}
+
 .field-container {
   position: relative;
   float: left;
   width: 100%;
-  padding: 20px;
+  padding: 20px 0 20px 0;
+}
+
+.form-row:first-child .field-container {
+  padding-top: 0;
+}
+
+.form-row:last-child .field-container {
+  padding-bottom: 0;
+}
+
+.field-container.checkbox, .field-container.radio {
+  padding-top: 0;
+  padding-bottom: 0;
 }
 .help-container {
@@ -63,7 +63,7 @@ module OwnershipAuthentication
   end
   def check_reading_group_ownership(id)
-    if current_user.reading_group_ownerships.find_by_reading_group_id(id).nil?
+    if current_user.reading_group_attributes.find_by_reading_group_id(id).nil?
       respond_to do |format|
         format.html { redirect_to reading_group_url(id: id), notice: t('not_allowed') }
         format.json { head :no_content }
@@ -74,7 +74,7 @@ module OwnershipAuthentication
   end
   def check_kalibro_configuration_ownership(id)
-    if current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id(id).nil?
+    if current_user.kalibro_configuration_attributes.find_by_kalibro_configuration_id(id).nil?
       respond_to do |format|
         format.html { redirect_to kalibro_configurations_url(id: id), notice: t('not_allowed') }
         format.json { head :no_content }
@@ -3,6 +3,7 @@ include OwnershipAuthentication
 class KalibroConfigurationsController < ApplicationController
   before_action :authenticate_user!, except: [:index, :show]
   before_action :kalibro_configuration_owner?, only: [:edit, :update, :destroy]
+  before_action :set_kalibro_configuration, only: [:show, :edit, :update, :destroy]
   # GET /kalibro_configurations/new
   def new
@@ -12,7 +13,7 @@ class KalibroConfigurationsController &lt; ApplicationController
   # GET /kalibro_configurations
   # GET /kalibro_configurations.json
   def index
-    @kalibro_configurations = KalibroConfiguration.all
+    @kalibro_configurations = KalibroConfiguration.public_or_owned_by_user(current_user)
   end
   # POST /kalibro_configurations
@@ -27,7 +28,6 @@ class KalibroConfigurationsController &lt; ApplicationController
   # GET /kalibro_configurations/1
   # GET /kalibro_configurations/1.json
   def show
-    set_kalibro_configuration
     Rails.cache.fetch("#{@kalibro_configuration.id}_metric_configurations") do
        @kalibro_configuration.metric_configurations
     end
@@ -35,13 +35,9 @@ class KalibroConfigurationsController &lt; ApplicationController
   # GET /kalibro_configurations/1/edit
   # GET /kalibro_configurations/1/edit.json
-  def edit
-    set_kalibro_configuration
-  end
-
+  def edit; end
   def update
-    set_kalibro_configuration
     if @kalibro_configuration.update(kalibro_configuration_params)
       redirect_to(kalibro_configuration_path(@kalibro_configuration.id))
     else
@@ -52,13 +48,13 @@ class KalibroConfigurationsController &lt; ApplicationController
   # DELETE /kalibro_configurations/1
   # DELETE /kalibro_configurations/1.json
   def destroy
-    set_kalibro_configuration
-    current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id!(@kalibro_configuration.id).destroy
     @kalibro_configuration.destroy
+
     respond_to do |format|
       format.html { redirect_to kalibro_configurations_url }
       format.json { head :no_content }
     end
+
     Rails.cache.delete("#{@kalibro_configuration.id}_metrics")
   end
@@ -77,7 +73,7 @@ class KalibroConfigurationsController &lt; ApplicationController
   # Extracted code from create action
   def create_and_redir(format)
     if @kalibro_configuration.save
-      current_user.kalibro_configuration_ownerships.create kalibro_configuration_id: @kalibro_configuration.id
+      current_user.kalibro_configuration_attributes.create(kalibro_configuration_id: @kalibro_configuration.id)
       format.html { redirect_to kalibro_configuration_path(@kalibro_configuration.id), notice: t('successfully_created', :record => @kalibro_configuration.model_name.human) }
       format.json { render action: 'show', status: :created, location: @kalibro_configuration }
@@ -9,6 +9,9 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
     super
     # find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API
     metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(params[:metric_collector_name]).find_metric_by_code params[:metric_code]
+    @reading_groups = ReadingGroup.public_or_owned_by_user(current_user).map { |reading_group|
+      [reading_group.name, reading_group.id]
+    }
   end
   def create
@@ -24,6 +27,9 @@ class MetricConfigurationsController &lt; BaseMetricConfigurationsController
     #FIXME: set the configuration id just once!
     @kalibro_configuration_id = params[:kalibro_configuration_id]
     @metric_configuration.kalibro_configuration_id = @kalibro_configuration_id
+    @reading_groups = ReadingGroup.public_or_owned_by_user(current_user).map { |reading_group|
+      [reading_group.name, reading_group.id]
+    }
   end
   def update
@@ -54,7 +54,6 @@ class ProjectsController &lt; ApplicationController
   # DELETE /project/1.json
   def destroy
     set_project
-    current_user.project_attributes.find_by_project_id!(@project.id).destroy
     @project.destroy
     respond_to do |format|
       format.html { redirect_to projects_url }
@@ -13,7 +13,7 @@ class ReadingGroupsController &lt; ApplicationController
   # GET /reading_groups
   # GET /reading_groups.json
   def index
-    @reading_groups = ReadingGroup.all
+    @reading_groups = ReadingGroup.public_or_owned_by_user(current_user)
   end
   # POST /reading_groups
@@ -44,7 +44,6 @@ class ReadingGroupsController &lt; ApplicationController
   # DELETE /reading_group/1
   # DELETE /reading_group/1.json
   def destroy
-    current_user.reading_group_ownerships.find_by_reading_group_id!(@reading_group.id).destroy
     @reading_group.destroy
     respond_to do |format|
       format.html { redirect_to reading_groups_url }
@@ -68,7 +67,7 @@ class ReadingGroupsController &lt; ApplicationController
   # Extracted code from create action
   def create_and_redir(format)
     if @reading_group.save
-      current_user.reading_group_ownerships.create reading_group_id: @reading_group.id
+      current_user.reading_group_attributes.create(reading_group_id: @reading_group.id)
       format.html { redirect_to reading_group_path(@reading_group.id), notice: t('successfully_created', :record => t(@reading_group.class)) }
       format.json { render action: 'show', status: :created, location: @reading_group }
@@ -5,6 +5,7 @@ class RepositoriesController &lt; ApplicationController
   before_action :project_owner?, only: [:new, :create]
   before_action :repository_owner?, only: [:edit, :update, :destroy, :process_repository]
   before_action :set_repository, only: [:show, :edit, :update, :destroy, :state, :state_with_date, :process_repository]
+  before_action :set_project_id_repository_types_and_configurations, only: [:new, :edit]
   # GET /projects/1/repositories/1
   # GET /projects/1/repositories/1.json
@@ -16,16 +17,11 @@ class RepositoriesController &lt; ApplicationController
   # GET projects/1/repositories/new
   def new
-    @project_id = params[:project_id]
     @repository = Repository.new
-    @repository_types = Repository.repository_types
   end
   # GET /repositories/1/edit
-  def edit
-    @project_id = params[:project_id]
-    @repository_types = Repository.repository_types
-  end
+  def edit; end
   # POST /projects/1/repositories
   # POST /projects/1/repositories.json
@@ -89,10 +85,17 @@ class RepositoriesController &lt; ApplicationController
   end
 private
-  # Duplicated code on create and update actions extracted here
-  def failed_action(format, destiny_action)
+  def set_project_id_repository_types_and_configurations
     @project_id = params[:project_id]
     @repository_types = Repository.repository_types
+    @configurations = KalibroConfiguration.public_or_owned_by_user(current_user).map { |conf|
+      [conf.name, conf.id]
+    }
+  end
+
+  # Duplicated code on create and update actions extracted here
+  def failed_action(format, destiny_action)
+    set_project_id_repository_types_and_configurations
     format.html { render action: destiny_action }
     format.json { render json: @repository.errors, status: :unprocessable_entity }
 module KalibroConfigurationsHelper
   def kalibro_configuration_owner?(kalibro_configuration_id)
-    user_signed_in? && !current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id(kalibro_configuration_id).nil?
+    user_signed_in? && !current_user.kalibro_configuration_attributes.find_by_kalibro_configuration_id(kalibro_configuration_id).nil?
   end
   def link_to_edit_form(metric_configuration, kalibro_configuration_id)
 module ReadingGroupsHelper
   def reading_groups_owner? reading_group_id
-    user_signed_in? && !current_user.reading_group_ownerships.find_by_reading_group_id(reading_group_id).nil?
+    user_signed_in? && !current_user.reading_group_attributes.find_by_reading_group_id(reading_group_id).nil?
   end
 end
 \ No newline at end of file
 class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroConfiguration
   include KalibroRecord
+  attr_writer :attributes
+
+  def self.public_or_owned_by_user(user=nil)
+    kalibro_configuration_attributes = KalibroConfigurationAttributes.where(public: true)
+    kalibro_configuration_attributes += KalibroConfigurationAttributes.where(user_id: user.id, public: false) if user
+
+    kalibro_configuration_attributes.map { |kalibro_configuration_attribute|
+      begin
+        self.find(kalibro_configuration_attribute.kalibro_configuration_id)
+      rescue KalibroClient::Errors::RecordNotFound
+        nil
+      end
+    }.compact
+  end
+
+  def self.public
+    self.public_or_owned_by_user
+  end
+
+  def attributes
+    @attributes ||= KalibroConfigurationAttributes.find_by(kalibro_configuration_id: self.id)
+  end
+
+  def destroy
+    attributes.destroy unless attributes.nil?
+    @attributes = nil
+    super
+  end
 end
@@ -0,0 +1,13 @@
+class KalibroConfigurationAttributes < ActiveRecord::Base
+  belongs_to :user
+  validates :kalibro_configuration_id, presence: true
+
+  def kalibro_configuration
+    @kalibro_configuration ||= KalibroConfiguration.find(kalibro_configuration_id)
+  end
+
+  def kalibro_configuration=(cfg)
+    @kalibro_configuration = cfg
+    self.kalibro_configuration_id = cfg.id
+  end
+end
@@ -1,4 +0,0 @@
-class KalibroConfigurationOwnership < ActiveRecord::Base
-  belongs_to :user
-  validates :kalibro_configuration_id, presence: true
-end
 class Project < KalibroClient::Entities::Processor::Project
   include KalibroRecord
+  attr_writer :attributes
+
   def self.latest(count = 1)
     all.sort { |a,b| b.id <=> a.id }.select { |project| !project.attributes.hidden}.first(count)
   end
   def attributes
-    project_attributes = ProjectAttributes.find_by_project_id(self.id)
-    project_attributes.nil? ? ProjectAttributes.new : project_attributes
+    @project_attributes ||= ProjectAttributes.find_by_project_id(self.id)
+    @project_attributes.nil? ? ProjectAttributes.new : @project_attributes
+  end
+
+  def destroy
+    self.attributes.destroy if self.attributes
+    @project_attributes = nil
+    super
   end
 end
 class ReadingGroup < KalibroClient::Entities::Configurations::ReadingGroup
   include KalibroRecord
+  attr_writer :attributes
+
+  def self.public_or_owned_by_user(user=nil)
+    reading_group_attributes = ReadingGroupAttributes.where(public: true)
+    reading_group_attributes += ReadingGroupAttributes.where(user_id: user.id, public: false) if user
+
+    reading_group_attributes.map { |reading_group_attribute|
+      begin
+        self.find(reading_group_attribute.reading_group_id)
+      rescue KalibroClient::Errors::RecordNotFound
+        nil
+      end
+    }.compact
+  end
+
+  def self.public
+    self.public_or_owned_by_user
+  end
+
+  def attributes
+    @attributes ||= ReadingGroupAttributes.find_by(reading_group_id: self.id)
+  end
+
+  def destroy
+    attributes.destroy unless attributes.nil?
+    @attributes = nil
+    super
+  end
 end
@@ -0,0 +1,13 @@
+class ReadingGroupAttributes < ActiveRecord::Base
+  belongs_to :user
+  validates :reading_group_id, presence: true
+
+  def reading_group
+    @reading_group ||= ReadingGroup.find(reading_group_id)
+  end
+
+  def reading_group=(group)
+    @reading_group = group
+    self.reading_group_id = group.id
+  end
+end
@@ -1,4 +0,0 @@
-class ReadingGroupOwnership < ActiveRecord::Base
-  belongs_to :user
-  validates :reading_group_id, presence: true
-end
@@ -9,8 +9,8 @@ class User &lt; ActiveRecord::Base
   validates :email, uniqueness: true
   has_many :project_attributes, class_name: 'ProjectAttributes'
-  has_many :reading_group_ownerships
-  has_many :kalibro_configuration_ownerships
+  has_many :reading_group_attributes, class_name: 'ReadingGroupAttributes'
+  has_many :kalibro_configuration_attributes, class_name: 'KalibroConfigurationAttributes'
   # Alert: when adding new parameters to this model, they should also be added to registrations_controller
   def projects
@@ -17,7 +17,6 @@
         <%= f.text_area :description, class: 'text-area form-control' %>
       </div>
     </div>
-
   </div>
 </div>
@@ -3,7 +3,6 @@
 <div class="row margin-left-none">
   <div class="form-table col-md-9">
-
     <div class="form-row">
       <div class="field-container">
         <%= f.label :name, class: 'control-label' %>
@@ -79,8 +79,7 @@
     <div class="form-row">
       <div class="field-container">
         <%= f.label :kalibro_configuration_id, KalibroConfiguration.model_name.human, class: 'control-label' %>
-        <% configuration_list = KalibroClient::Entities::Configurations::KalibroConfiguration.all.map { |conf| [conf.name, conf.id] } %>
-        <%= f.select( :kalibro_configuration_id, configuration_list, class: 'tooltip-control' ) %>
+        <%= f.select( :kalibro_configuration_id, @configurations, class: 'tooltip-control' ) %>
       </div>
       <div class="help-container">
         <p>
-class CreateKalibroConfigurationOwnerships < ActiveRecord::Migration
+class CreateMezuroConfigurationOwnerships < ActiveRecord::Migration
   def change
-    create_table :kalibro_configuration_ownerships do |t|
+    create_table :mezuro_configuration_ownerships do |t|
       t.integer :user_id
-      t.integer :kalibro_configuration_id
+      t.integer :mezuro_configuration_id
       t.timestamps
     end
@@ -0,0 +1,6 @@
+class RenameKalibroConfigurationOwnershipsToKalibroConfiugrationAttributes < ActiveRecord::Migration
+  def change
+    rename_table :kalibro_configuration_ownerships, :kalibro_configuration_attributes
+    add_column :kalibro_configuration_attributes, :public, :boolean, default: false
+  end
+end
@@ -0,0 +1,6 @@
+class RenameReadingGroupOwnershipsToReadingGroupAttributes < ActiveRecord::Migration
+  def change
+    rename_table :reading_group_ownerships, :reading_group_attributes
+    add_column :reading_group_attributes, :public, :boolean, default: false
+  end
+end
@@ -0,0 +1,9 @@
+class ChangeKalibroConfigurationAttributesPublicDefault < ActiveRecord::Migration
+  def up
+    change_column_default :kalibro_configuration_attributes, :public, true
+  end
+
+  def down
+    change_column_default :kalibro_configuration_attributes, :public, false
+  end
+end
@@ -0,0 +1,9 @@
+class ChangeReadingGroupAttributesPublicDefault < ActiveRecord::Migration
+  def up
+    change_column_default :reading_group_attributes, :public, true
+  end
+
+  def down
+    change_column_default :reading_group_attributes, :public, false
+  end
+end
@@ -11,13 +11,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150225170704) do
+ActiveRecord::Schema.define(version: 20150515195059) do
-  create_table "kalibro_configuration_ownerships", force: :cascade do |t|
+  create_table "kalibro_configuration_attributes", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "kalibro_configuration_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "public",                   default: true
   end
   create_table "project_attributes", force: :cascade do |t|
@@ -29,11 +30,12 @@ ActiveRecord::Schema.define(version: 20150225170704) do
     t.datetime "updated_at",                 null: false
   end
-  create_table "reading_group_ownerships", force: :cascade do |t|
+  create_table "reading_group_attributes", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "reading_group_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "public",           default: true
   end
   create_table "users", force: :cascade do |t|
@@ -27,4 +27,16 @@ Feature: Configuration listing
     And I have a sample configuration
     And I am at the All Configurations page
     When I click the Show link
-    Then the sample configuration should be there
 \ No newline at end of file
+    Then the sample configuration should be there
+
+  @kalibro_configuration_restart
+  Scenario: Should show only the public or owned configurations
+    Given I am a regular user
+    And I am signed in
+    And I have a sample configuration
+    And there is a public configuration created
+    And there is a private configuration created
+    When I am at the All Configurations page
+    Then the sample configuration should be there
+    And the public configuration should be there
+    And the private configuration should not be there
@@ -0,0 +1,33 @@
+Feature: Reading Group
+  In Order to be see the reading groups
+  As a regular user
+  I should be able to see the public and my own reading groups
+
+  Scenario: Not logged in and no Reading Groups 
+    Given I am at the homepage
+    When I click the Reading Group link
+    Then I should see "Reading Groups"
+    And I should see "Name"
+    And I should see "Description"
+    And I should see "You must be logged in to Create Reading Group"
+  
+  @kalibro_configuration_restart @javascript
+  Scenario: Logged in, should list Reading Groups
+    Given I am a regular user
+    And I am signed in
+    And I own a sample reading group
+    When I am at the All Reading Groups page
+    Then the sample reading group should be there
+    And I should not see "You must be logged in to Create Reading Group"
+  
+  @kalibro_configuration_restart
+  Scenario: Should show only the public or owned reading groups
+    Given I am a regular user
+    And I am signed in
+    And I own a sample reading group
+    And there is a public reading group created
+    And there is a private reading group created
+    When I am at the All Reading Groups page
+    Then the sample reading group should be there
+    And the public reading group should be there
+    And the private reading group should not be there
@@ -12,11 +12,13 @@ end
 Given(/^I have a sample configuration$/) do
   @kalibro_configuration = FactoryGirl.create(:kalibro_configuration)
+  FactoryGirl.create(:kalibro_configuration_attributes, user_id: FactoryGirl.create(:another_user).id, kalibro_configuration_id: @kalibro_configuration.id)
+
 end
 Given(/^I own a sample configuration$/) do
   @kalibro_configuration = FactoryGirl.create(:kalibro_configuration)
-  FactoryGirl.create(:kalibro_configuration_ownership, {id: nil, user_id: @user.id, kalibro_configuration_id: @kalibro_configuration.id})
+  FactoryGirl.create(:kalibro_configuration_attributes, {id: nil, user_id: @user.id, kalibro_configuration_id: @kalibro_configuration.id})
 end
 Given(/^I am at the Sample Configuration page$/) do
@@ -29,7 +31,7 @@ end
 Given(/^I own a configuration named "(.*?)"$/) do |name|
   @kalibro_configuration = FactoryGirl.create(:kalibro_configuration, {name: name})
-  FactoryGirl.create(:kalibro_configuration_ownership, {id: nil, user_id: @user.id, kalibro_configuration_id: @kalibro_configuration.id})
+  FactoryGirl.create(:kalibro_configuration_attributes, {id: nil, user_id: @user.id, kalibro_configuration_id: @kalibro_configuration.id})
 end
 When(/^I visit the sample configuration edit page$/) do
@@ -49,6 +51,7 @@ Then(/^I should be in the All configurations page$/) do
 end
 Then(/^the sample configuration should not be there$/) do
+  expect(@kalibro_configuration.attributes).to be_nil
   expect { KalibroConfiguration.find(@kalibro_configuration.id) }.to raise_error
 end
@@ -56,3 +59,24 @@ Then(/^the sample configuration should be there$/) do
   expect(page).to have_content(@kalibro_configuration.name)
   expect(page).to have_content(@kalibro_configuration.description)
 end
+
+Given(/^there is a public configuration created$/) do
+  @public_kc = FactoryGirl.create(:public_kalibro_configuration)
+  FactoryGirl.create(:kalibro_configuration_attributes, kalibro_configuration_id: @public_kc.id)
+end
+
+Given(/^there is a private configuration created$/) do
+  @private_kc = FactoryGirl.create(:another_kalibro_configuration)
+  FactoryGirl.create(:kalibro_configuration_attributes, :private, kalibro_configuration_id: @private_kc.id, user: FactoryGirl.create(:another_user, id: nil, email: "private@email.com"))
+end
+
+Then(/^the public configuration should be there$/) do
+  expect(page).to have_content(@public_kc.name)
+  expect(page).to have_content(@public_kc.description)
+end
+
+Then(/^the private configuration should not be there$/) do
+  expect(page).to have_no_content(@private_kc.name)
+  expect(page).to have_no_content(@private_kc.description)
+end
+
@@ -14,7 +14,7 @@ end
 Given(/^I own a sample reading group$/) do
   @reading_group = FactoryGirl.create(:reading_group)
-  FactoryGirl.create(:reading_group_ownership, {user_id: @user.id, reading_group_id: @reading_group.id})
+  FactoryGirl.create(:reading_group_attributes, user_id: @user.id, reading_group_id: @reading_group.id)
 end
 Given(/^I have a sample reading group$/) do
@@ -31,7 +31,7 @@ end
 Given(/^I own a reading group named "(.*?)"$/) do |name|
   @reading_group = FactoryGirl.create(:reading_group, {name: name})
-  FactoryGirl.create(:reading_group_ownership, {user_id: @user.id, reading_group_id: @reading_group.id})
+  FactoryGirl.create(:reading_group_attributes, {user_id: @user.id, reading_group_id: @reading_group.id})
 end
 When(/^I visit the sample reading group edit page$/) do
@@ -61,5 +61,31 @@ Then(/^I should be in the Edit Reading Group page$/) do
 end
 Then(/^the Sample Reading Group should not be there$/) do
+  expect(@reading_group.attributes).to be_nil
   expect { ReadingGroup.find(@reading_group.id) }.to raise_error
 end
+
+Then(/^the sample reading group should be there$/) do
+  expect(page).to have_content(@reading_group.name)
+  expect(page).to have_content(@reading_group.description)
+end
+
+Given(/^there is a public reading group created$/) do
+  @public_rg = FactoryGirl.create(:public_reading_group)
+  FactoryGirl.create(:reading_group_attributes, reading_group_id: @public_rg.id)
+end
+
+Given(/^there is a private reading group created$/) do
+  @private_rg = FactoryGirl.create(:another_reading_group)
+  FactoryGirl.create(:reading_group_attributes, :private, reading_group_id: @private_rg.id, user: FactoryGirl.create(:another_user))
+end
+
+Then(/^the public reading group should be there$/) do
+  expect(page).to have_content(@public_rg.name)
+  expect(page).to have_content(@public_rg.description)
+end
+
+Then(/^the private reading group should not be there$/) do
+  expect(page).to have_no_content(@private_rg.name)
+  expect(page).to have_no_content(@private_rg.description)
+end
@@ -13,6 +13,8 @@ Given(/^I have a sample configuration with native metrics$/) do
   reading = FactoryGirl.create(:reading, {reading_group_id: reading_group.id})
   @kalibro_configuration = FactoryGirl.create(:kalibro_configuration)
+  FactoryGirl.create(:kalibro_configuration_attributes, {id: nil, user_id: nil, kalibro_configuration_id: @kalibro_configuration.id})
+
   metric_configuration = FactoryGirl.create(:metric_configuration,
                                             {metric: FactoryGirl.build(:loc),
                                              reading_group_id: reading_group.id,
@@ -41,7 +41,7 @@ end
 describe InheritsFromBaseMetricConfigurationsController, :type => :controller do
-  let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
+  let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
   before do
     Rails.application.routes.draw do
@@ -111,7 +111,7 @@ describe InheritsFromBaseMetricConfigurationsController, :type =&gt; :controller do
   describe 'show' do
     let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
-    let(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+    let(:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
     let(:kalibro_range) { FactoryGirl.build(:kalibro_range) }
     context 'with a valid metric_configuration' do
 require 'rails_helper'
 describe CompoundMetricConfigurationsController, :type => :controller do
-  let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
+  let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
   describe 'new' do
     before :each do
@@ -69,7 +69,7 @@ describe CompoundMetricConfigurationsController, :type =&gt; :controller do
   describe 'show' do
     let(:compound_metric_configuration) { FactoryGirl.build(:compound_metric_configuration_with_id) }
-    let(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+    let(:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
     let(:kalibro_range) { FactoryGirl.build(:kalibro_range) }
     before :each do
@@ -4,7 +4,7 @@ describe OwnershipAuthentication, type: :controller do
   #TODO: test other methods
   describe 'reading_group_owner?' do
-    let(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+    let(:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
     context 'Not ReadingGroupsController nor ReadingsController' do
       let!(:projects_controller) { ProjectsController.new }
@@ -34,12 +34,12 @@ describe OwnershipAuthentication, type: :controller do
         end
         context 'when the user owns the ReadingGroup' do
-          let!(:reading_group_ownership) { FactoryGirl.build(:reading_group_ownership, {user_id: current_user.id, reading_group_id: reading_group.id}) }
+          let!(:reading_group_attributes) { FactoryGirl.build(:reading_group_attributes, {user_id: current_user.id, reading_group_id: reading_group.id}) }
           before do
-            reading_group_ownerships = Object.new
-            reading_group_ownerships.expects(:find_by_reading_group_id).with(reading_group.id).returns(reading_group_ownership)
-            current_user.expects(:reading_group_ownerships).returns(reading_group_ownerships)
+            reading_group_attributes = Object.new
+            reading_group_attributes.expects(:find_by_reading_group_id).with(reading_group.id).returns(reading_group_attributes)
+            current_user.expects(:reading_group_attributes).returns(reading_group_attributes)
           end
           it 'should return true' do
@@ -49,9 +49,9 @@ describe OwnershipAuthentication, type: :controller do
         context 'when the user does not own the ReadingGroup' do
           before do
-            reading_group_ownerships = Object.new
-            reading_group_ownerships.expects(:find_by_reading_group_id).with(reading_group.id).returns(nil)
-            current_user.expects(:reading_group_ownerships).returns(reading_group_ownerships)
+            reading_group_attributes = Object.new
+            reading_group_attributes.expects(:find_by_reading_group_id).with(reading_group.id).returns(nil)
+            current_user.expects(:reading_group_attributes).returns(reading_group_attributes)
           end
           it 'should respond' do # FIXME: this is not the best test, but it it's the closest we can do I think
@@ -65,7 +65,7 @@ describe OwnershipAuthentication, type: :controller do
   end
   describe 'kalibro_configuration_owner?' do
-    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
+    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
     context 'Not KalibroConfigurationsController nor MetricConfigurationsController nor CompoundMetricConfigurationsController' do
       let!(:projects_controller) { ProjectsController.new }
@@ -2,6 +2,14 @@ require &#39;rails_helper&#39;
 describe KalibroConfigurationsController, :type => :controller do
+  def call_action(method)
+    if method == :update
+      post method, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params, :attributes => attributes
+    elsif method == :create
+      put method, :kalibro_configuration => kalibro_configuration_params, :attributes => attributes
+    end
+  end
+
   describe 'new' do
     before :each do
       sign_in FactoryGirl.create(:user)
@@ -18,16 +26,17 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
     end
     context 'with valid fields' do
-	    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
-	    let(:subject_params) { kalibro_configuration.to_hash }
+      let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
+      let(:kalibro_configuration_params) { kalibro_configuration.to_hash }
+      let(:attributes) { {public: "1"} }
-     	before :each do
+      before :each do
         KalibroConfiguration.any_instance.expects(:save).returns(true)
       end
       context 'rendering the show' do
         before :each do
-          post :create, :kalibro_configuration => subject_params
+          call_action :create
         end
         it 'should redirect to the show view' do
@@ -37,7 +46,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
       context 'without rendering the show view' do
         before :each do
-          post :create, :kalibro_configuration => subject_params
+          call_action :create
         end
         it { is_expected.to respond_with(:redirect) }
@@ -46,7 +55,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
     context 'with an invalid field' do
       before :each do
-        @subject = FactoryGirl.build(:kalibro_configuration_with_id)
+        @subject = FactoryGirl.build(:kalibro_configuration, :with_id)
         @subject_params = @subject.to_hash
         KalibroConfiguration.expects(:new).at_least_once.with(@subject_params).returns(@subject)
@@ -60,8 +69,8 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
   end
   describe 'show' do
-  	let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
-  	let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
+    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
+    let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
     before :each do
       kalibro_configuration.expects(:metric_configurations).returns(metric_configuration)
@@ -78,30 +87,22 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
   end
   describe 'destroy' do
-    before do
-      @subject = FactoryGirl.build(:kalibro_configuration_with_id)
-    end
+    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
     context 'with an User logged in' do
+      let(:kalibro_configuration_attribute) { FactoryGirl.build(:kalibro_configuration_attributes) }
+
       before do
         sign_in FactoryGirl.create(:user)
-        @ownership = FactoryGirl.build(:kalibro_configuration_ownership)
-        @ownerships = []
       end
       context 'when the user owns the kalibro_configuration' do
         before :each do
-          @ownership.expects(:destroy)
-          @subject.expects(:destroy)
-
-          #Those two mocks looks the same but they are necessary since params[:id] is a String and @configuration.id is an Integer :(
-          @ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)
-          @ownerships.expects(:find_by_kalibro_configuration_id!).with(@subject.id).returns(@ownership)
+          kalibro_configuration.expects(:destroy)
+          KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
+          subject.expects(:kalibro_configuration_owner?)
-          User.any_instance.expects(:kalibro_configuration_ownerships).at_least_once.returns(@ownerships)
-
-          KalibroConfiguration.expects(:find).with(@subject.id).returns(@subject)
-          delete :destroy, :id => @subject.id
+          delete :destroy, :id => kalibro_configuration.id
         end
         it 'should redirect to the kalibro_configurations page' do
@@ -113,19 +114,16 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
       context "when the user doesn't own the kalibro_configuration" do
         before :each do
-          @ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(nil)
-          User.any_instance.expects(:kalibro_configuration_ownerships).at_least_once.returns(@ownerships)
-
-          delete :destroy, :id => @subject.id
+          delete :destroy, :id => kalibro_configuration.id
         end
-         it { is_expected.to redirect_to(kalibro_configurations_path(id: @subject.id))  }
+         it { is_expected.to redirect_to(kalibro_configurations_path(id: kalibro_configuration.id))  }
       end
     end
     context 'with no User logged in' do
       before :each do
-        delete :destroy, :id => @subject.id
+        delete :destroy, :id => kalibro_configuration.id
       end
       it { is_expected.to redirect_to new_user_session_path }
@@ -133,9 +131,11 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
   end
   describe 'index' do
+    let!(:kalibro_configuration_attribute) { FactoryGirl.build(:kalibro_configuration_attributes) }
     before :each do
-      @subject = FactoryGirl.build(:kalibro_configuration_with_id)
-      KalibroConfiguration.expects(:all).returns([@subject])
+      @subject = FactoryGirl.build(:kalibro_configuration, :with_id)
+      KalibroConfigurationAttributes.expects(:where).with(public: true).returns([kalibro_configuration_attribute])
+      KalibroConfiguration.expects(:find).with(kalibro_configuration_attribute.kalibro_configuration_id).returns(@subject)
       get :index
     end
@@ -143,52 +143,50 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
   end
   describe 'edit' do
-    before do
-      @subject = FactoryGirl.build(:kalibro_configuration_with_id)
-    end
+    let!(:user) { FactoryGirl.create(:user) }
+    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
+    let(:kalibro_configuration_attribute) { FactoryGirl.build(:kalibro_configuration_attributes) }
+    let(:kalibro_configuration_attributes) { mock('kalibro_configuration_attributes') }
     context 'with an User logged in' do
       before do
-        @user = FactoryGirl.create(:user)
-        @ownership = FactoryGirl.build(:kalibro_configuration_ownership)
-        @ownerships = []
+        User.any_instance.expects(:kalibro_configuration_attributes).at_least_once.returns(kalibro_configuration_attributes)
-        User.any_instance.expects(:kalibro_configuration_ownerships).at_least_once.returns(@ownerships)
-
-        sign_in @user
+        sign_in user
       end
       context 'when the user owns the kalibro_configuration' do
         before :each do
-          KalibroConfiguration.expects(:find).with(@subject.id).returns(@subject)
-          @ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(@ownership)
+          KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
+          kalibro_configuration_attributes.expects(:find_by_kalibro_configuration_id).with("#{kalibro_configuration.id}").returns(kalibro_configuration_attribute)
-          get :edit, :id => @subject.id
+          get :edit, :id => kalibro_configuration.id
         end
         it { is_expected.to render_template(:edit) }
-        it 'should assign to @kalibro_configuration the @subject' do
-          expect(assigns(:kalibro_configuration)).to eq(@subject)
+        it 'should assign to @kalibro_configuration the kalibro_configuration' do
+          expect(assigns(:kalibro_configuration)).to eq(kalibro_configuration)
         end
       end
       context 'when the user does not own the kalibro_configuration' do
-        before do
-          @subject = FactoryGirl.build(:another_kalibro_configuration_with_id)
-          @ownerships.expects(:find_by_kalibro_configuration_id).with("#{@subject.id}").returns(nil)
+        let!(:another_kalibro_configuration) { FactoryGirl.build(:another_kalibro_configuration, :with_id) }
+
+        before :each do
+          kalibro_configuration_attributes.expects(:find_by_kalibro_configuration_id).with("#{another_kalibro_configuration.id}").returns(nil)
-          get :edit, :id => @subject.id
+          get :edit, :id => another_kalibro_configuration.id
         end
-        it { is_expected.to redirect_to(kalibro_configurations_path(id: @subject.id))  }
+        it { is_expected.to redirect_to(kalibro_configurations_path(id: another_kalibro_configuration.id))  }
         it { is_expected.to set_flash[:notice].to("You're not allowed to do this operation") }
       end
     end
     context 'with no user logged in' do
       before :each do
-        get :edit, :id => @subject.id
+        get :edit, :id => kalibro_configuration.id
       end
       it { is_expected.to redirect_to new_user_session_path }
@@ -196,8 +194,9 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
   end
   describe 'update' do
-    let(:kalibro_configuration) {FactoryGirl.build(:kalibro_configuration_with_id)}
-    let(:kalibro_configuration_params) { kalibro_configuration.to_hash }
+    let!(:kalibro_configuration) {FactoryGirl.build(:kalibro_configuration, :with_id)}
+    let!(:kalibro_configuration_params) { kalibro_configuration.to_hash }
+    let!(:attributes) { {public: "1"} }
     context 'when the user is logged in' do
       before do
@@ -205,12 +204,12 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
       end
       context 'when user owns the kalibro_configuration' do
-        before do
-          @ownership = FactoryGirl.build(:kalibro_configuration_ownership)
-          @ownerships = []
+        let(:kalibro_configuration_attribute) { FactoryGirl.build(:kalibro_configuration_attributes) }
+        let(:kalibro_configuration_attributes) { mock('kalibro_configuration_attributes') }
-          @ownerships.expects(:find_by_kalibro_configuration_id).with("#{kalibro_configuration.id}").returns(@ownership)
-          User.any_instance.expects(:kalibro_configuration_ownerships).at_least_once.returns(@ownerships)
+        before :each do
+          kalibro_configuration_attributes.expects(:find_by_kalibro_configuration_id).with("#{kalibro_configuration.id}").returns(kalibro_configuration_attribute)
+          User.any_instance.expects(:kalibro_configuration_attributes).at_least_once.returns(kalibro_configuration_attributes)
         end
         context 'with valid fields' do
@@ -221,7 +220,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
           context 'rendering the show' do
             before :each do
-              post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
+              call_action :update
             end
             it 'should redirect to the show view' do
@@ -231,7 +230,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
           context 'without rendering the show view' do
             before :each do
-              post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
+              call_action :update
             end
             it { is_expected.to respond_with(:redirect) }
@@ -243,7 +242,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
             KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
             KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(false)
-            post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
+            call_action :update
           end
           it { is_expected.to render_template(:edit) }
@@ -252,7 +251,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
       context 'when the user does not own the kalibro_configuration' do
         before :each do
-          post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
+          call_action :update
         end
         it { is_expected.to redirect_to kalibro_configurations_path(id: kalibro_configuration.id) }
@@ -261,7 +260,7 @@ describe KalibroConfigurationsController, :type =&gt; :controller do
     context 'with no user logged in' do
       before :each do
-        post :update, :id => kalibro_configuration.id, :kalibro_configuration => kalibro_configuration_params
+        call_action :update
       end
       it { is_expected.to redirect_to new_user_session_path }
@@ -5,7 +5,7 @@ describe KalibroRangesController, :type =&gt; :controller do
   let(:kalibro_range) { FactoryGirl.build(:kalibro_range_with_id, metric_configuration_id: metric_configuration.id) }
   describe 'new' do
-    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
+    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
     before :each do
       sign_in FactoryGirl.create(:user)
@@ -35,7 +35,7 @@ describe KalibroRangesController, :type =&gt; :controller do
   describe 'create' do
     let(:kalibro_range_params) { kalibro_range.to_hash }
-    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
+    let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
     before do
       sign_in FactoryGirl.create(:user)
 require 'rails_helper'
 describe MetricConfigurationsController, :type => :controller do
-  let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration_with_id) }
+  let(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, :with_id) }
   describe 'choose_metric' do
     let(:metric_collector) { FactoryGirl.build(:metric_collector) }
     before :each do
@@ -24,12 +24,16 @@ describe MetricConfigurationsController, :type =&gt; :controller do
   describe 'new' do
     let!(:metric_collector) { FactoryGirl.build(:metric_collector) }
     let!(:native_metric) { FactoryGirl.build(:loc) }
+    let!(:reading_groups) { [FactoryGirl.build(:reading_group)] }
+    let!(:user) { FactoryGirl.create(:user) }
+
     before :each do
-      sign_in FactoryGirl.create(:user)
+      sign_in user
     end
     context 'when the current user owns the kalibro configuration' do
       before :each do
+        ReadingGroup.expects(:public_or_owned_by_user).with(user).returns(reading_groups)
         subject.expects(:kalibro_configuration_owner?).returns true
         KalibroClient::Entities::Processor::MetricCollectorDetails.expects(:find_by_name).with(metric_collector.name).returns(metric_collector)
         metric_collector.expects(:find_metric_by_code).with(native_metric.code).returns(native_metric)
@@ -92,7 +96,7 @@ describe MetricConfigurationsController, :type =&gt; :controller do
   describe 'show' do
     let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
-    let(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+    let(:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
     let(:kalibro_range) { FactoryGirl.build(:kalibro_range) }
     before :each do
@@ -108,14 +112,17 @@ describe MetricConfigurationsController, :type =&gt; :controller do
   describe 'edit' do
     let(:metric_configuration) { FactoryGirl.build(:metric_configuration_with_id) }
+    let!(:reading_groups) { [FactoryGirl.build(:reading_group)] }
+    let!(:user) { FactoryGirl.create(:user) }
     context 'with a User logged in' do
       before do
-        sign_in FactoryGirl.create(:user)
+        sign_in user
       end
       context 'when the user owns the metric configuration' do
         before :each do
+          ReadingGroup.expects(:public_or_owned_by_user).with(user).returns(reading_groups)
           subject.expects(:metric_configuration_owner?).returns(true)
           MetricConfiguration.expects(:find).with(metric_configuration.id).returns(metric_configuration)
           get :edit, id: metric_configuration.id, kalibro_configuration_id: metric_configuration.kalibro_configuration_id.to_s
@@ -97,14 +97,9 @@ describe ProjectsController, :type =&gt; :controller do
       context 'when the user owns the project' do
         before :each do
-          @project_attributes.expects(:destroy)
           @subject.expects(:destroy)
-          #Those two mocks looks the same but they are necessary since params[:id] is a String and @project.id is an Integer :(
-          @attributes.expects(:find_by_project_id).with("#{@subject.id}").returns(@project_attributes)
-          @attributes.expects(:find_by_project_id!).with(@subject.id).returns(@project_attributes)
-
-          User.any_instance.expects(:project_attributes).at_least_once.returns(@attributes)
+          subject.expects(:project_owner?)
           Project.expects(:find).with(@subject.id).returns(@subject)
           delete :destroy, :id => @subject.id
@@ -12,12 +12,13 @@ describe ReadingGroupsController, :type =&gt; :controller do
   end
   describe 'create' do
+    let(:attributes) { {public: "1"} }
     before do
       sign_in FactoryGirl.create(:user)
     end
     context 'with valid fields' do
-      let(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+      let(:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
       let(:subject_params) { reading_group.to_hash }
       before :each do
@@ -26,7 +27,8 @@ describe ReadingGroupsController, :type =&gt; :controller do
       context 'rendering the show' do
         before :each do
-          post :create, :reading_group => subject_params
+          post :create, :reading_group => subject_params, :attributes => attributes
+
         end
         it 'should redirect to the show view' do
@@ -36,7 +38,8 @@ describe ReadingGroupsController, :type =&gt; :controller do
       context 'without rendering the show view' do
         before :each do
-          post :create, :reading_group => subject_params
+          post :create, :reading_group => subject_params, :attributes => attributes
+
         end
         it { is_expected.to respond_with(:redirect) }
@@ -45,13 +48,14 @@ describe ReadingGroupsController, :type =&gt; :controller do
     context 'with an invalid field' do
       before :each do
-        @subject = FactoryGirl.build(:reading_group_with_id)
+        @subject = FactoryGirl.build(:reading_group, :with_id)
         @subject_params = @subject.to_hash
         ReadingGroup.expects(:new).at_least_once.with(@subject_params).returns(@subject)
         ReadingGroup.any_instance.expects(:save).returns(false)
-        post :create, :reading_group => @subject_params
+        post :create, :reading_group => @subject_params, :attributes => attributes
+
       end
       it { is_expected.to render_template(:new) }
@@ -59,7 +63,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
   end
   describe 'show' do
-    let!(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+    let!(:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
     let(:reading) { FactoryGirl.build(:reading_with_id) }
     before :each do
       ReadingGroup.expects(:find).with(reading_group.id).returns(reading_group)
@@ -71,27 +75,20 @@ describe ReadingGroupsController, :type =&gt; :controller do
   describe 'destroy' do
     before do
-      @subject = FactoryGirl.build(:reading_group_with_id)
+      @subject = FactoryGirl.build(:reading_group, :with_id)
     end
     context 'with a User logged in' do
       before do
         sign_in FactoryGirl.create(:user)
-        @ownership = FactoryGirl.build(:reading_group_ownership)
+        @ownership = FactoryGirl.build(:reading_group_attributes)
         @ownerships = []
-
       end
       context 'when the user owns the reading group' do
         before :each do
-          @ownership.expects(:destroy)
           @subject.expects(:destroy)
-
-          #Those two mocks looks the same but they are necessary since params[:id] is a String and @ReadingGroup.id is an Integer :(
-          @ownerships.expects(:find_by_reading_group_id).with("#{@subject.id}").returns(@ownership)
-          @ownerships.expects(:find_by_reading_group_id!).with(@subject.id).returns(@ownership)
-
-          User.any_instance.expects(:reading_group_ownerships).at_least_once.returns(@ownerships)
+          subject.expects(:reading_group_owner?)
           ReadingGroup.expects(:find).with(@subject.id).returns(@subject)
           delete :destroy, :id => @subject.id
@@ -107,7 +104,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
       context "when the user doesn't own the reading group" do
         before :each do
           @ownerships.expects(:find_by_reading_group_id).with("#{@subject.id}").returns(nil)
-          User.any_instance.expects(:reading_group_ownerships).at_least_once.returns(@ownerships)
+          User.any_instance.expects(:reading_group_attributes).at_least_once.returns(@ownerships)
           delete :destroy, :id => @subject.id
         end
@@ -126,9 +123,11 @@ describe ReadingGroupsController, :type =&gt; :controller do
   end
   describe 'index' do
+    let!(:reading_group_attribute) { FactoryGirl.build(:reading_group_attributes) }
     before :each do
-      @subject = FactoryGirl.build(:reading_group_with_id)
-      ReadingGroup.expects(:all).returns([@subject])
+      @subject = FactoryGirl.build(:reading_group, :with_id)
+      ReadingGroupAttributes.expects(:where).with(public: true).returns([reading_group_attribute])
+      ReadingGroup.expects(:find).with(reading_group_attribute.reading_group_id).returns([@subject])
       get :index
     end
@@ -137,16 +136,16 @@ describe ReadingGroupsController, :type =&gt; :controller do
   describe 'edit' do
     before do
-      @subject = FactoryGirl.build(:reading_group_with_id)
+      @subject = FactoryGirl.build(:reading_group, :with_id)
     end
     context 'with a User logged in' do
       before do
         @user = FactoryGirl.create(:user)
-        @ownership = FactoryGirl.build(:reading_group_ownership)
+        @ownership = FactoryGirl.build(:reading_group_attributes)
         @ownerships = []
-        User.any_instance.expects(:reading_group_ownerships).at_least_once.returns(@ownerships)
+        User.any_instance.expects(:reading_group_attributes).at_least_once.returns(@ownerships)
         sign_in @user
       end
@@ -168,7 +167,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
       context 'when the user does not own the reading group' do
         before do
-          @subject = FactoryGirl.build(:another_reading_group_with_id)
+          @subject = FactoryGirl.build(:another_reading_group, :with_id)
           @ownerships.expects(:find_by_reading_group_id).with("#{@subject.id}").returns(nil)
           get :edit, :id => @subject.id
@@ -190,8 +189,9 @@ describe ReadingGroupsController, :type =&gt; :controller do
   describe 'update' do
     before do
-      @subject = FactoryGirl.build(:reading_group_with_id)
+      @subject = FactoryGirl.build(:reading_group, :with_id)
       @subject_params = @subject.to_hash
+      @ownership = FactoryGirl.build(:reading_group_attributes, reading_group_id: @subject.id)
     end
     context 'when the user is logged in' do
@@ -201,11 +201,10 @@ describe ReadingGroupsController, :type =&gt; :controller do
       context 'when user owns the reading group' do
         before do
-          @ownership = FactoryGirl.build(:reading_group_ownership)
           @ownerships = []
           @ownerships.expects(:find_by_reading_group_id).with("#{@subject.id}").returns(@ownership)
-          User.any_instance.expects(:reading_group_ownerships).at_least_once.returns(@ownerships)
+          User.any_instance.expects(:reading_group_attributes).at_least_once.returns(@ownerships)
         end
         context 'with valid fields' do
@@ -216,7 +215,7 @@ describe ReadingGroupsController, :type =&gt; :controller do
           context 'rendering the show' do
             before :each do
-              post :update, :id => @subject.id, :reading_group => @subject_params
+              post :update, :id => @subject.id, :reading_group => @subject_params, :attributes => {public: @ownership.public}
             end
             it 'should redirect to the show view' do
@@ -226,7 +225,8 @@ describe ReadingGroupsController, :type =&gt; :controller do
           context 'without rendering the show view' do
             before :each do
-              post :update, :id => @subject.id, :reading_group => @subject_params
+              post :update, :id => @subject.id, :reading_group => @subject_params, :attributes => {public: @ownership.public}
+
             end
             it { is_expected.to respond_with(:redirect) }
@@ -238,7 +238,8 @@ describe ReadingGroupsController, :type =&gt; :controller do
             ReadingGroup.expects(:find).with(@subject.id).returns(@subject)
             ReadingGroup.any_instance.expects(:update).with(@subject_params).returns(false)
-            post :update, :id => @subject.id, :reading_group => @subject_params
+            post :update, :id => @subject.id, :reading_group => @subject_params, :attributes => {public: @ownership.public}
+
           end
           it { is_expected.to render_template(:edit) }
@@ -247,7 +248,8 @@ describe ReadingGroupsController, :type =&gt; :controller do
       context 'when the user does not own the reading group' do
         before :each do
-          post :update, :id => @subject.id, :reading_group => @subject_params
+          post :update, :id => @subject.id, :reading_group => @subject_params, :attributes => {public: @ownership.public}
+
         end
         it { is_expected.to redirect_to reading_group_path }
@@ -256,7 +258,8 @@ describe ReadingGroupsController, :type =&gt; :controller do
     context 'with no user logged in' do
       before :each do
-        post :update, :id => @subject.id, :reading_group => @subject_params
+        post :update, :id => @subject.id, :reading_group => @subject_params, :attributes => {public: @ownership.public}
+
       end
       it { is_expected.to redirect_to new_user_session_path }
 require 'rails_helper'
 describe ReadingsController, :type => :controller do
-  let(:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+  let(:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
   describe 'new' do
     before :each do
@@ -5,12 +5,15 @@ describe RepositoriesController, :type =&gt; :controller do
   describe 'new' do
     context 'with a User logged in' do
+      let!(:user) { FactoryGirl.create(:user) }
+      let!(:kalibro_configurations) { [FactoryGirl.build(:kalibro_configuration)] }
       before :each do
-        sign_in FactoryGirl.create(:user)
+        sign_in user
       end
       context 'when the current user owns the project' do
         before :each do
+          KalibroConfiguration.expects(:public_or_owned_by_user).with(user).returns(kalibro_configurations)
           Repository.expects(:repository_types).returns([])
           subject.expects(:project_owner?).returns true
@@ -41,11 +44,13 @@ describe RepositoriesController, :type =&gt; :controller do
   end
   describe 'create' do
+    let!(:kalibro_configurations) { [FactoryGirl.build(:kalibro_configuration)] }
+    let!(:user) { FactoryGirl.create(:user) }
     let (:repository) { FactoryGirl.build(:repository, project_id: project.id) }
     let(:repository_params) { FactoryGirl.build(:repository).to_hash }
     before do
-      sign_in FactoryGirl.create(:user)
+      sign_in user
     end
     context 'when the current user owns the project' do
@@ -66,6 +71,7 @@ describe RepositoriesController, :type =&gt; :controller do
       context 'with an invalid field' do
         before :each do
+          KalibroConfiguration.expects(:public_or_owned_by_user).with(user).returns(kalibro_configurations)
           Repository.any_instance.expects(:save).returns(false)
           Repository.expects(:repository_types).returns([])
@@ -91,9 +97,7 @@ describe RepositoriesController, :type =&gt; :controller do
     context 'without a specific module_result' do
       before :each do
-        processing = FactoryGirl.build(:processing)
-
-        KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration_with_id))
+        KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration, :with_id))
         Repository.expects(:find).with(repository.id).returns(repository)
         get :show, id: repository.id.to_s, project_id: project.id.to_s
@@ -105,9 +109,7 @@ describe RepositoriesController, :type =&gt; :controller do
     context 'for an specific module_result' do
       before :each do
-        processing = FactoryGirl.build(:processing)
-
-        KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration_with_id))
+        KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration, :with_id))
         Repository.expects(:find).with(repository.id).returns(repository)
         get :show, id: repository.id.to_s, project_id: project.id.to_s
@@ -161,12 +163,15 @@ describe RepositoriesController, :type =&gt; :controller do
     let(:repository) { FactoryGirl.build(:repository) }
     context 'with an User logged in' do
+      let!(:user) { FactoryGirl.create(:user) }
+      let!(:kalibro_configurations) { [FactoryGirl.build(:kalibro_configuration)] }
       before do
-        sign_in FactoryGirl.create(:user)
+        sign_in user
       end
       context 'when the user owns the repository' do
         before :each do
+          KalibroConfiguration.expects(:public_or_owned_by_user).with(user).returns(kalibro_configurations)
           subject.expects(:repository_owner?).returns true
           Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
           Repository.expects(:repository_types).returns(["SUBVERSION"])
@@ -197,12 +202,15 @@ describe RepositoriesController, :type =&gt; :controller do
   end
   describe 'update' do
+    let(:kalibro_configurations) { [FactoryGirl.build(:kalibro_configuration)] }
     let(:repository) { FactoryGirl.build(:repository) }
     let(:repository_params) { Hash[FactoryGirl.attributes_for(:repository).map { |k,v| [k.to_s, v.to_s] }] } #FIXME: Mocha is creating the expectations with strings, but FactoryGirl returns everything with sybols and integers
     context 'when the user is logged in' do
+      let!(:user) { FactoryGirl.create(:user) }
+
       before do
-        sign_in FactoryGirl.create(:user)
+        sign_in user
       end
       context 'when user owns the repository' do
@@ -224,6 +232,7 @@ describe RepositoriesController, :type =&gt; :controller do
         context 'with an invalid field' do
           before :each do
+            KalibroConfiguration.expects(:public_or_owned_by_user).with(user).returns(kalibro_configurations)
             Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
             Repository.any_instance.expects(:update).with(repository_params).returns(false)
             Repository.expects(:repository_types).returns([])
@@ -333,7 +342,7 @@ describe RepositoriesController, :type =&gt; :controller do
         subject.expects(:repository_owner?).returns true
         repository.expects(:process)
         Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
-        KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration_with_id))
+        KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration, :with_id))
         get :process_repository, project_id: project.id.to_s, id: repository.id
       end
       it { is_expected.to redirect_to(project_repository_path(repository.project_id, repository.id)) }
@@ -0,0 +1,14 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :kalibro_configuration_attributes, class: KalibroConfigurationAttributes do
+    sequence(:id, 1)
+    association :user, strategy: :build
+    association :kalibro_configuration, :with_id, strategy: :build
+    self.public true
+
+    trait :private do
+      self.public false
+    end
+  end
+end
-  FactoryGirl.define do
-  factory :kalibro_configuration, class: KalibroConfiguration do
+FactoryGirl.define do
+  factory :kalibro_configuration do
     name "Java"
     description "Code metrics for Java."
@@ -7,17 +7,18 @@
       id 1
     end
-    factory :kalibro_configuration_with_id, traits: [:with_id]
-  end
-
-  factory :another_kalibro_configuration, class: KalibroConfiguration do
-    name "Perl"
-    description "Code metrics for Perl."
+    trait :with_sequential_id do
+      sequence(:id, 1)
+    end
-    trait :with_id do
-      id 12
+    factory :another_kalibro_configuration do
+      name "Perl"
+      description "Code metrics for Perl."
     end
-    factory :another_kalibro_configuration_with_id, traits: [:with_id]
+    factory :public_kalibro_configuration do
+      name "Public Kalibro Configuration"
+      description "Public Configuration."
+    end
   end
 end
@@ -1,8 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :kalibro_configuration_ownership do
-    user_id 1
-    kalibro_configuration_id 1
-  end
-end
@@ -0,0 +1,14 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :reading_group_attributes, class: ReadingGroupAttributes do
+    sequence(:id, 1)
+    association :user, strategy: :build
+    association :reading_group, :with_id, strategy: :build
+    self.public true
+
+    trait :private do
+      self.public false
+    end
+  end
+end
@@ -1,8 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :reading_group_ownership do
-    user_id 1
-    reading_group_id 1
-  end
-end
@@ -4,20 +4,17 @@ FactoryGirl.define do
     description "Cacildis!"
     trait :with_id do
-      id 1
+      sequence(:id, 1)
     end
-    factory :reading_group_with_id, traits: [:with_id]
-  end
-
-  factory :another_reading_group, class: ReadingGroup do
-    name "My Reading Group"
-    description "The best one"
-
-    trait :with_id do
-      id 2
+    factory :another_reading_group do
+      name "My Reading Group"
+      description "The best one"
     end
-    factory :another_reading_group_with_id, traits: [:with_id]
+    factory :public_reading_group do
+      name "Public Reading Group"
+      description "Public"
+    end
   end
 end
@@ -6,5 +6,12 @@ FactoryGirl.define do
     name "Diego Martinez"
     email "diego@email.com"
     password "password"
+
+    factory :another_user do
+      id 2
+      name "Heitor Reis"
+      email "hr@email.com"
+      password "password"
+    end
   end
 end
@@ -3,7 +3,7 @@ require &#39;rails_helper&#39;
 describe KalibroConfigurationsHelper, :type => :helper do
   describe 'kalibro_configuration_owner?' do
     before :each do
-      @subject = FactoryGirl.build(:kalibro_configuration_with_id)
+      @subject = FactoryGirl.build(:kalibro_configuration, :with_id)
     end
     context 'returns false if not logged in' do
@@ -18,10 +18,10 @@ describe KalibroConfigurationsHelper, :type =&gt; :helper do
         helper.expects(:user_signed_in?).returns(true)
         helper.expects(:current_user).returns(FactoryGirl.build(:user))
-        @ownerships = []
-        @ownerships.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(nil)
+        @attributes = []
+        @attributes.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(nil)
-        User.any_instance.expects(:kalibro_configuration_ownerships).returns(@ownerships)
+        User.any_instance.expects(:kalibro_configuration_attributes).returns(@attributes)
       end
       it { expect(helper.kalibro_configuration_owner?(@subject.id)).to be_falsey }
@@ -32,10 +32,10 @@ describe KalibroConfigurationsHelper, :type =&gt; :helper do
         helper.expects(:user_signed_in?).returns(true)
         helper.expects(:current_user).returns(FactoryGirl.build(:user))
-        @ownership = FactoryGirl.build(:kalibro_configuration_ownership)
-        @ownerships = []
-        @ownerships.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(@ownership)
-        User.any_instance.expects(:kalibro_configuration_ownerships).returns(@ownerships)
+        @ownership = FactoryGirl.build(:kalibro_configuration_attributes)
+        @attributes = []
+        @attributes.expects(:find_by_kalibro_configuration_id).with(@subject.id).returns(@ownership)
+        User.any_instance.expects(:kalibro_configuration_attributes).returns(@attributes)
       end
       it { expect(helper.kalibro_configuration_owner?(@subject.id)).to be_truthy }
@@ -9,7 +9,7 @@ describe MetricConfigurationsHelper, :type =&gt; :helper do
   end
   describe 'reading_group_options' do
-    let! (:reading_group) { FactoryGirl.build(:reading_group_with_id) }
+    let! (:reading_group) { FactoryGirl.build(:reading_group, :with_id) }
     before :each do
       ReadingGroup.expects(:all).returns([reading_group])
@@ -4,7 +4,7 @@ describe ReadingGroupsHelper, :type =&gt; :helper do
   describe 'reading_group_owner?' do
     before :each do
-      @subject = FactoryGirl.build(:reading_group_with_id)
+      @subject = FactoryGirl.build(:reading_group, :with_id)
     end
     context 'returns false if not logged in' do
@@ -22,7 +22,7 @@ describe ReadingGroupsHelper, :type =&gt; :helper do
         @ownerships = []
         @ownerships.expects(:find_by_reading_group_id).with(@subject.id).returns(nil)
-        User.any_instance.expects(:reading_group_ownerships).returns(@ownerships)
+        User.any_instance.expects(:reading_group_attributes).returns(@ownerships)
       end
       it { expect(helper.reading_groups_owner?(@subject.id)).to be_falsey }
@@ -33,10 +33,10 @@ describe ReadingGroupsHelper, :type =&gt; :helper do
         helper.expects(:user_signed_in?).returns(true)
         helper.expects(:current_user).returns(FactoryGirl.build(:user))
-        @ownership = FactoryGirl.build(:reading_group_ownership)
+        @ownership = FactoryGirl.build(:reading_group_attributes)
         @ownerships = []
         @ownerships.expects(:find_by_reading_group_id).with(@subject.id).returns(@ownership)
-        User.any_instance.expects(:reading_group_ownerships).returns(@ownerships)
+        User.any_instance.expects(:reading_group_attributes).returns(@ownerships)
       end
       it { expect(helper.reading_groups_owner?(@subject.id)).to be_truthy }
@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+describe KalibroConfigurationAttributes, :type => :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+  end
+end
@@ -0,0 +1,102 @@
+require 'rails_helper'
+
+describe KalibroConfiguration, :type => :model do
+  describe 'methods' do
+    describe 'class methods' do
+      describe 'public_or_owned_by_user' do
+        def build_attrs(kc_iter, *traits, **params)
+          kalibro_configuration = kc_iter.next
+          attr = FactoryGirl.build(:kalibro_configuration_attributes, *traits, params.merge(kalibro_configuration: kalibro_configuration))
+          kalibro_configuration.stubs(:attributes).returns(attr)
+          attr
+        end
+
+        let!(:kalibro_configurations) { FactoryGirl.build_list(:kalibro_configuration, 4, :with_sequential_id) }
+        let!(:kc_iter) { kalibro_configurations.each }
+
+        let!(:one_user) { FactoryGirl.build(:user) }
+        let!(:other_user) { FactoryGirl.build(:another_user) }
+
+        let!(:ones_private_attrs) { build_attrs(kc_iter, :private, user: one_user) }
+        let!(:others_private_attrs) { build_attrs(kc_iter, :private, user: other_user) }
+        let!(:ones_public_attrs) { build_attrs(kc_iter, user: one_user) }
+        let!(:others_public_attrs) { build_attrs(kc_iter, user: other_user) }
+
+        let!(:public_attrs) { [ones_public_attrs, others_public_attrs] }
+        let(:public_kalibro_configurations) { public_attrs.map(&:kalibro_configuration) }
+
+        let(:ones_or_public_attrs) { public_attrs + [ones_private_attrs] }
+        let(:ones_or_public_kalibro_configurations) { ones_or_public_attrs.map(&:kalibro_configuration) }
+
+        context 'when the kalibro configuration exists' do
+          before :each do
+            # Map the kalibro_configuration attributes to the corresponding Kalibro Configuration
+            kalibro_configurations.each do |kc|
+              KalibroConfiguration.stubs(:find).with(kc.id).returns(kc)
+            end
+
+            KalibroConfigurationAttributes.expects(:where).with(public: true).returns(public_attrs)
+          end
+
+          context 'when user is not provided' do
+            it 'should find all public reading groups' do
+              expect(KalibroConfiguration.public).to eq(public_kalibro_configurations)
+            end
+          end
+
+          context 'when user is provided' do
+            before do
+              KalibroConfigurationAttributes.expects(:where).with(user_id: one_user.id, public: false).returns([ones_private_attrs])
+            end
+
+            it 'should find all public and owned reading groups' do
+              expect(KalibroConfiguration.public_or_owned_by_user(one_user)).to eq(ones_or_public_kalibro_configurations)
+            end
+          end
+        end
+
+        context 'when the kalibro configuration does not' do
+          before :each do
+            # Map the kalibro_configuration attributes to the corresponding Kalibro Configuration
+            kalibro_configurations.each do |kc|
+              KalibroConfiguration.stubs(:find).with(kc.id).raises(KalibroClient::Errors::RecordNotFound)
+            end
+
+            KalibroConfigurationAttributes.expects(:where).with(public: true).returns(public_attrs)
+          end
+
+          it 'is expected to be empty' do
+            expect(KalibroConfiguration.public).to be_empty
+          end
+        end
+      end
+    end
+
+    describe 'destroy' do
+      context 'when attributes exist' do
+        let!(:kalibro_configuration_attributes) { FactoryGirl.build(:kalibro_configuration_attributes) }
+        let!(:kalibro_configuration) { kalibro_configuration_attributes.kalibro_configuration }
+
+        it 'should be destroyed' do
+          kalibro_configuration.expects(:attributes).twice.returns(kalibro_configuration_attributes)
+          kalibro_configuration_attributes.expects(:destroy)
+          KalibroClient::Entities::Configurations::KalibroConfiguration.any_instance.expects(:destroy).returns(kalibro_configuration)
+          kalibro_configuration.destroy
+        end
+
+        it 'is expected to clean the attributes memoization' do
+          # Call attributes once so it memoizes
+          KalibroConfigurationAttributes.expects(:find_by).with(kalibro_configuration_id: kalibro_configuration.id).returns(kalibro_configuration_attributes)
+          expect(kalibro_configuration.attributes).to eq(kalibro_configuration_attributes)
+
+          # Destroying
+          kalibro_configuration.destroy
+
+          # The expectation call will try to find the attributes on the database which should be nil since it was destroyed
+          KalibroConfigurationAttributes.expects(:find_by).with(kalibro_configuration_id: kalibro_configuration.id).returns(nil)
+          expect(kalibro_configuration.attributes).to be_nil
+        end
+      end
+    end
+  end
+end
@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-describe KalibroConfigurationOwnership, :type => :model do
-  describe 'associations' do
-    it { is_expected.to belong_to(:user) }
-  end
-end
@@ -38,5 +38,32 @@ describe Project, :type =&gt; :model do
         expect(subject.attributes).to eq(project_attributes)
       end
     end
+
+    describe 'destroy' do
+      context 'when attributes exist' do
+        let!(:project) { FactoryGirl.build(:project) }
+        let!(:project_attributes) { FactoryGirl.build(:project_attributes, project_id: project.id) }
+
+        it 'should be destroyed' do
+          project.expects(:attributes).twice.returns(project_attributes)
+          project_attributes.expects(:destroy)
+          KalibroClient::Entities::Processor::Project.any_instance.expects(:destroy).returns(project)
+          project.destroy
+        end
+
+        it 'is expected to clean the attributes memoization' do
+          # Call attributes once so it memoizes
+          ProjectAttributes.expects(:find_by).with(project_id: project.id).returns(project_attributes)
+          expect(project.attributes).to eq(project_attributes)
+
+          # Destroying
+          project.destroy
+
+          # The expectation call will try to find the attributes on the database which should be nil since it was destroyed
+          ProjectAttributes.expects(:find_by).with(project_id: project.id).returns(nil)
+          expect(project.attributes).to_not eq(project_attributes)
+        end
+      end
+    end
   end
 end
@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+describe ReadingGroupAttributes, :type => :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+  end
+end
@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-describe ReadingGroupOwnership, :type => :model do
-  describe 'associations' do
-    it { is_expected.to belong_to(:user) }
-  end
-end
@@ -4,13 +4,13 @@ describe ReadingGroup, :type =&gt; :model do
   describe 'methods' do
     describe 'persisted?' do
       before :each do
-        @subject = FactoryGirl.build(:reading_group_with_id)
+        @subject = FactoryGirl.build(:reading_group, :with_id)
       end
     end
     describe 'update' do
       before :each do
-        @qt = FactoryGirl.build(:reading_group_with_id)
+        @qt = FactoryGirl.build(:reading_group, :with_id)
         @qt_params = @qt.to_hash
       end
@@ -36,7 +36,7 @@ describe ReadingGroup, :type =&gt; :model do
     end
     describe 'readings' do
-      subject { FactoryGirl.build(:reading_group_with_id) }
+      subject { FactoryGirl.build(:reading_group, :with_id) }
       let(:reading) { FactoryGirl.build(:reading_with_id) }
       it 'should call readings_of on the Reading model' do
@@ -45,5 +45,93 @@ describe ReadingGroup, :type =&gt; :model do
         expect(subject.readings).to include(reading)
       end
     end
+
+    describe 'destroy' do
+      context 'when attributes exist' do
+        let!(:reading_group_attributes) { FactoryGirl.build(:reading_group_attributes) }
+        let!(:reading_group) { reading_group_attributes.reading_group }
+
+        it 'should be destroyed' do
+          reading_group.expects(:attributes).twice.returns(reading_group_attributes)
+          reading_group_attributes.expects(:destroy)
+          KalibroClient::Entities::Configurations::ReadingGroup.any_instance.expects(:destroy).returns(reading_group)
+          reading_group.destroy
+        end
+
+        it 'is expected to clean the attributes memoization' do
+          # Call attributes once so it memoizes
+          ReadingGroupAttributes.expects(:find_by).with(reading_group_id: reading_group.id).returns(reading_group_attributes)
+          expect(reading_group.attributes).to eq(reading_group_attributes)
+
+          # Destroying
+          reading_group.destroy
+
+          # The expectation call will try to find the attributes on the database which should be nil since it was destroyed
+          ReadingGroupAttributes.expects(:find_by).with(reading_group_id: reading_group.id).returns(nil)
+          expect(reading_group.attributes).to be_nil
+        end
+      end
+    end
+  end
+
+  describe 'class methods' do
+    describe 'public_or_owned_by_user' do
+      let!(:user) { FactoryGirl.build(:user) }
+
+      let!(:owned_private_attrs)     { FactoryGirl.build(:reading_group_attributes, :private, user_id: user.id) }
+      let!(:owned_public_attrs)      { FactoryGirl.build(:reading_group_attributes,           user_id: user.id) }
+      let!(:not_owned_private_attrs) { FactoryGirl.build(:reading_group_attributes, :private, user_id: user.id+1) }
+      let!(:not_owned_public_attrs)  { FactoryGirl.build(:reading_group_attributes,           user_id: user.id+1) }
+
+      let!(:public_attrs) { [owned_public_attrs, not_owned_public_attrs] }
+      let(:public_reading_groups) { public_attrs.map(&:reading_group) }
+
+      let!(:owned_or_public_attrs) { public_attrs + [owned_private_attrs] }
+      let!(:owned_or_public_reading_groups) { owned_or_public_attrs.map(&:reading_group) }
+
+      let(:all_reading_groups) { owned_or_public_reading_groups + [not_owned_private_attrs.reading_group] }
+
+      context 'when reading groups exist' do
+        before :each do
+          # Make sure the reading groups are found when looked up by the Attributes by their id
+          all_reading_groups.each do |reading_group|
+            ReadingGroup.stubs(:find).with(reading_group.id).returns(reading_group)
+          end
+
+          ReadingGroupAttributes.expects(:where).with(public: true).returns(public_attrs)
+        end
+
+        context 'when user is not provided' do
+          it 'should find all public reading groups' do
+            expect(ReadingGroup.public).to eq(public_reading_groups)
+          end
+        end
+
+        context 'when user is provided' do
+          before do
+            ReadingGroupAttributes.expects(:where).with(user_id: user.id, public: false).returns([owned_private_attrs])
+          end
+
+          it 'should find all public and owned reading groups' do
+            expect(ReadingGroup.public_or_owned_by_user(user)).to eq(owned_or_public_reading_groups)
+          end
+        end
+      end
+
+      context 'when no reading groups exist' do
+        before :each do
+          # Map the reading group attributes to the corresponding Reading Group
+          all_reading_groups.each do |reading_group|
+            ReadingGroup.stubs(:find).with(reading_group.id).raises(KalibroClient::Errors::RecordNotFound)
+          end
+
+          ReadingGroupAttributes.expects(:where).with(public: true).returns(public_attrs)
+        end
+
+        it 'is expected to be empty' do
+          expect(ReadingGroup.public).to be_empty
+        end
+      end
+    end
   end
 end
@@ -11,8 +11,8 @@ describe User, :type =&gt; :model do
   describe 'associations' do
     it { is_expected.to have_many(:project_attributes) }
-    it { is_expected.to have_many(:reading_group_ownerships) }
-    it { is_expected.to have_many(:kalibro_configuration_ownerships) }
+    it { is_expected.to have_many(:reading_group_attributes) }
+    it { is_expected.to have_many(:kalibro_configuration_attributes) }
   end
   describe 'methods' do
	@@ -29,3 +29,4 @@ db_bootstrap.sql		@@ -29,3 +29,4 @@ db_bootstrap.sql
29	install.sh	29	install.sh
30	kalibro_gatekeeper.yml	30	kalibro_gatekeeper.yml
31	.capistrano	31	.capistrano
		32	+rerun.txt
1	.form-table {	1	.form-table {
2	margin: 0 !important;	2	margin: 0 !important;
		3	+ padding: 20px;
3	background: #fff;	4	background: #fff;
4	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);	5	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
5	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);	6	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
	@@ -13,11 +14,32 @@		@@ -13,11 +14,32 @@
13	display: inline-flex;	14	display: inline-flex;
14	}	15	}
15		16
		17	+.form-row:first-child {
		18	+ border-top: none;
		19	+}
		20	+
		21	+.form-row:last-child {
		22	+ border-bottom: none;
		23	+}
		24	+
16	.field-container {	25	.field-container {
17	position: relative;	26	position: relative;
18	float: left;	27	float: left;
19	width: 100%;	28	width: 100%;
20	- padding: 20px;	29	+ padding: 20px 0 20px 0;
		30	+}
		31	+
		32	+.form-row:first-child .field-container {
		33	+ padding-top: 0;
		34	+}
		35	+
		36	+.form-row:last-child .field-container {
		37	+ padding-bottom: 0;
		38	+}
		39	+
		40	+.field-container.checkbox, .field-container.radio {
		41	+ padding-top: 0;
		42	+ padding-bottom: 0;
21	}	43	}
22		44
23	.help-container {	45	.help-container {
	@@ -63,7 +63,7 @@ module OwnershipAuthentication		@@ -63,7 +63,7 @@ module OwnershipAuthentication
63	end	63	end
64		64
65	def check_reading_group_ownership(id)	65	def check_reading_group_ownership(id)
66	- if current_user.reading_group_ownerships.find_by_reading_group_id(id).nil?	66	+ if current_user.reading_group_attributes.find_by_reading_group_id(id).nil?
67	respond_to do \|format\|	67	respond_to do \|format\|
68	format.html { redirect_to reading_group_url(id: id), notice: t('not_allowed') }	68	format.html { redirect_to reading_group_url(id: id), notice: t('not_allowed') }
69	format.json { head :no_content }	69	format.json { head :no_content }
	@@ -74,7 +74,7 @@ module OwnershipAuthentication		@@ -74,7 +74,7 @@ module OwnershipAuthentication
74	end	74	end
75		75
76	def check_kalibro_configuration_ownership(id)	76	def check_kalibro_configuration_ownership(id)
77	- if current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id(id).nil?	77	+ if current_user.kalibro_configuration_attributes.find_by_kalibro_configuration_id(id).nil?
78	respond_to do \|format\|	78	respond_to do \|format\|
79	format.html { redirect_to kalibro_configurations_url(id: id), notice: t('not_allowed') }	79	format.html { redirect_to kalibro_configurations_url(id: id), notice: t('not_allowed') }
80	format.json { head :no_content }	80	format.json { head :no_content }
1	module KalibroConfigurationsHelper	1	module KalibroConfigurationsHelper
2	def kalibro_configuration_owner?(kalibro_configuration_id)	2	def kalibro_configuration_owner?(kalibro_configuration_id)
3	- user_signed_in? && !current_user.kalibro_configuration_ownerships.find_by_kalibro_configuration_id(kalibro_configuration_id).nil?	3	+ user_signed_in? && !current_user.kalibro_configuration_attributes.find_by_kalibro_configuration_id(kalibro_configuration_id).nil?
4	end	4	end
5		5
6	def link_to_edit_form(metric_configuration, kalibro_configuration_id)	6	def link_to_edit_form(metric_configuration, kalibro_configuration_id)
1	module ReadingGroupsHelper	1	module ReadingGroupsHelper
2	def reading_groups_owner? reading_group_id	2	def reading_groups_owner? reading_group_id
3	- user_signed_in? && !current_user.reading_group_ownerships.find_by_reading_group_id(reading_group_id).nil?	3	+ user_signed_in? && !current_user.reading_group_attributes.find_by_reading_group_id(reading_group_id).nil?
4	end	4	end
5	end	5	end
6	\ No newline at end of file	6	\ No newline at end of file
1	class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroConfiguration	1	class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroConfiguration
2	include KalibroRecord	2	include KalibroRecord
		3	+ attr_writer :attributes
		4	+
		5	+ def self.public_or_owned_by_user(user=nil)
		6	+ kalibro_configuration_attributes = KalibroConfigurationAttributes.where(public: true)
		7	+ kalibro_configuration_attributes += KalibroConfigurationAttributes.where(user_id: user.id, public: false) if user
		8	+
		9	+ kalibro_configuration_attributes.map { \|kalibro_configuration_attribute\|
		10	+ begin
		11	+ self.find(kalibro_configuration_attribute.kalibro_configuration_id)
		12	+ rescue KalibroClient::Errors::RecordNotFound
		13	+ nil
		14	+ end
		15	+ }.compact
		16	+ end
		17	+
		18	+ def self.public
		19	+ self.public_or_owned_by_user
		20	+ end
		21	+
		22	+ def attributes
		23	+ @attributes \|\|= KalibroConfigurationAttributes.find_by(kalibro_configuration_id: self.id)
		24	+ end
		25	+
		26	+ def destroy
		27	+ attributes.destroy unless attributes.nil?
		28	+ @attributes = nil
		29	+ super
		30	+ end
3	end	31	end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class KalibroConfigurationAttributes < ActiveRecord::Base
	2	+ belongs_to :user
	3	+ validates :kalibro_configuration_id, presence: true
	4	+
	5	+ def kalibro_configuration
	6	+ @kalibro_configuration \|\|= KalibroConfiguration.find(kalibro_configuration_id)
	7	+ end
	8	+
	9	+ def kalibro_configuration=(cfg)
	10	+ @kalibro_configuration = cfg
	11	+ self.kalibro_configuration_id = cfg.id
	12	+ end
	13	+end
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-class KalibroConfigurationOwnership < ActiveRecord::Base
2	- belongs_to :user
3	- validates :kalibro_configuration_id, presence: true
4	-end
1	class ReadingGroup < KalibroClient::Entities::Configurations::ReadingGroup	1	class ReadingGroup < KalibroClient::Entities::Configurations::ReadingGroup
2	include KalibroRecord	2	include KalibroRecord
		3	+ attr_writer :attributes
		4	+
		5	+ def self.public_or_owned_by_user(user=nil)
		6	+ reading_group_attributes = ReadingGroupAttributes.where(public: true)
		7	+ reading_group_attributes += ReadingGroupAttributes.where(user_id: user.id, public: false) if user
		8	+
		9	+ reading_group_attributes.map { \|reading_group_attribute\|
		10	+ begin
		11	+ self.find(reading_group_attribute.reading_group_id)
		12	+ rescue KalibroClient::Errors::RecordNotFound
		13	+ nil
		14	+ end
		15	+ }.compact
		16	+ end
		17	+
		18	+ def self.public
		19	+ self.public_or_owned_by_user
		20	+ end
		21	+
		22	+ def attributes
		23	+ @attributes \|\|= ReadingGroupAttributes.find_by(reading_group_id: self.id)
		24	+ end
		25	+
		26	+ def destroy
		27	+ attributes.destroy unless attributes.nil?
		28	+ @attributes = nil
		29	+ super
		30	+ end
3	end	31	end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class ReadingGroupAttributes < ActiveRecord::Base
	2	+ belongs_to :user
	3	+ validates :reading_group_id, presence: true
	4	+
	5	+ def reading_group
	6	+ @reading_group \|\|= ReadingGroup.find(reading_group_id)
	7	+ end
	8	+
	9	+ def reading_group=(group)
	10	+ @reading_group = group
	11	+ self.reading_group_id = group.id
	12	+ end
	13	+end