Merge pull request #183 from mezuro/hide_repositories

Hide repositories

Merge pull request #183 from mezuro/hide_repositories
Hide repositories
Diego Camarinha
2 parents caaa5b13 75aafbfe
Showing 27 changed files with 199 additions and 134 deletions Show diff stats
app/controllers/concerns/ownership_authentication.rb
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
app/models/project.rb
app/models/project_attributes.rb
app/models/project_image.rb
app/models/project_ownership.rb
app/models/user.rb
app/views/projects/_form.html.erb
db/migrate/20150225170704_create_project_attributes.rb
db/schema.rb
features/project/deletion.feature
features/project/edition.feature
features/project/listing.feature
features/project/show.feature
features/step_definitions/project_steps.rb
spec/controllers/concerns/ownership_authentication_spec.rb
spec/controllers/projects_controller_spec.rb
spec/factories/project_attributes.rb
spec/factories/project_images.rb
@@ -52,7 +52,7 @@ module OwnershipAuthentication
   private
  
   def check_project_ownership(id)
-    if current_user.project_ownerships.find_by_project_id(id).nil?
+    if current_user.project_attributes.find_by_project_id(id).nil?
       respond_to do |format|
         format.html { redirect_to projects_url, notice: "You're not allowed to do this operation" }
         format.json { head :no_content }
@@ -9,13 +9,12 @@ class ProjectsController &lt; ApplicationController
   # GET /projects/new
   def new
     @project = Project.new
-    @project_image = ProjectImage.new
   end
  
   # GET /projects
   # GET /projects.json
   def index
-    @projects = Project.all
+    @projects = Project.all.select { |project| !project.attributes.hidden }
   end
  
   # POST /projects
@@ -25,7 +24,7 @@ class ProjectsController &lt; ApplicationController
     @project = Project.new(project_params)
     respond_to do |format|
       create_and_redir(format)
-      ProjectImage.create(url: image_url, project_id: @project.id )
+      @project.attributes.update(image_url: image_url) unless @project.attributes.nil?
     end
   end
  
@@ -45,7 +44,7 @@ class ProjectsController &lt; ApplicationController
   def update
     set_project
     image_url = project_params.delete(:image_url)
-    if @project.update(project_params) && @project_image.update(url: image_url)
+    if @project.update(project_params) && @project.attributes.update(image_url: image_url)
       redirect_to(project_path(@project.id))
     else
       render "edit"
@@ -56,7 +55,7 @@ class ProjectsController &lt; ApplicationController
   # DELETE /project/1.json
   def destroy
     set_project
-    current_user.project_ownerships.find_by_project_id(@project.id).destroy
+    current_user.project_attributes.find_by_project_id(@project.id).destroy
     @project.destroy
     respond_to do |format|
       format.html { redirect_to projects_url }
@@ -68,7 +67,6 @@ class ProjectsController &lt; ApplicationController
   # Use callbacks to share common setup or constraints between actions.
   def set_project
     @project = find_resource(Project, params[:id].to_i)
-    @project_image = ProjectImage.find_by_project_id(@project.id) if @project.is_a?(Project)
   end
  
   # Never trust parameters from the scary internet, only allow the white list through.
@@ -80,7 +78,7 @@ class ProjectsController &lt; ApplicationController
   # Extracted code from create action
   def create_and_redir(format)
     if @project.save
-      current_user.project_ownerships.create project_id: @project.id
+      current_user.project_attributes.create(project_id: @project.id)
       format.html { redirect_to project_path(@project.id), notice: 'Project was successfully created.' }
       format.json { render action: 'show', status: :created, location: @project }
     else
 module ProjectsHelper
   def project_owner? project_id
-    user_signed_in? && !current_user.project_ownerships.find_by_project_id(project_id).nil?
+    user_signed_in? && !current_user.project_attributes.find_by_project_id(project_id).nil?
   end
 end
 \ No newline at end of file
 class Project < KalibroClient::Entities::Processor::Project
   include KalibroRecord
+
   def self.latest(count = 1)
-    all.sort { |a,b| b.id <=> a.id }.first(count)
+    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
   end
 end
@@ -0,0 +1,8 @@
+class ProjectAttributes < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :project
+
+  def project
+    Project.find(self.project_id)
+  end
+end
+#FIXME: remove this after the migration has been done and modify the migration accordingly
 class ProjectImage < ActiveRecord::Base
   belongs_to :project
 end
+#FIXME: remove this after the migration has been done and modify the migration accordingly
 class ProjectOwnership < ActiveRecord::Base
   belongs_to :user
   validates :project_id, presence: true
@@ -8,12 +8,12 @@ class User &lt; ActiveRecord::Base
   validates :email, presence: true
   validates :email, uniqueness: true
  
-  has_many :project_ownerships
+  has_many :project_attributes, class_name: 'ProjectAttributes'
   has_many :reading_group_ownerships
   has_many :kalibro_configuration_ownerships
   # Alert: when adding new parameters to this model, they should also be added to registrations_controller
  
   def projects
-    project_ownerships.map { |project_ownership| project_ownership.project }
+    project_attributes.map { |project_attr| project_attr.project }
   end
 end
@@ -17,7 +17,7 @@
       <div class="form-row">
         <div class="field-container">
           <%= f.label "Image url", class: 'control-label' %><br>
-          <%= f.text_field :image_url, class: 'text-area', value: @project_image.nil? ? '#' : @project_image.url  %>
+          <%= f.text_field :image_url, class: 'text-area', value: @project.attributes.nil? || @project.attributes.image_url.nil? ? '#' : @project.attributes.image_url  %>
         </div>
       </div>
     </div>
@@ -0,0 +1,56 @@
+class CreateProjectAttributes < ActiveRecord::Migration
+  def up
+    create_table :project_attributes do |t|
+      t.integer :project_id
+      t.string :image_url
+      t.integer :user_id
+      t.boolean :hidden, default: false
+
+      t.timestamps null: false
+    end
+
+    ProjectOwnership.all.each do |project_ownership|
+      project_image = ProjectImage.find_by_project_id(project_ownership.project_id)
+      image_url = project_image.nil? ? "": project_image.url
+
+      begin
+        # We want to hides projects prior this date since they probably have a invalid configuration
+        if Project.find(project_ownership.project_id).updated_at < DateTime.parse("Mon, 23 Feb 2015")
+          hidden = true
+        else
+          hidden = false
+        end
+
+        ProjectAttributes.create(user_id: project_ownership.user_id, project_id: project_ownership.project_id, image_url: image_url, hidden: hidden)
+      rescue KalibroClient::Errors::RecordNotFound
+        puts "Could not find project with id #{project_ownership.project_id} owned by user with #{project_ownership.user_id} and image url #{image_url}"
+      end
+    end
+
+    drop_table :project_ownerships
+    drop_table :project_images
+  end
+
+  def down
+    create_table :project_ownerships do |t|
+      t.integer :user_id
+      t.integer :project_id
+
+      t.timestamps
+    end
+
+    create_table :project_images do |t|
+      t.belongs_to :project
+      t.string :url
+
+      t.timestamps
+    end
+
+    ProjectAttributes.all.each do |project_attribute|
+      ProjectOwnership.create(user_id: project_attribute.user_id, project_id: project_attribute.project_id)
+      ProjectImage.create(url: project_attribute.image_url, project_id: project_attribute.project_id)
+    end
+
+    drop_table :project_attributes
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
  
-ActiveRecord::Schema.define(version: 20141211114023) do
+ActiveRecord::Schema.define(version: 20150225170704) do
  
   create_table "kalibro_configuration_ownerships", force: :cascade do |t|
     t.integer  "user_id"
@@ -20,18 +20,13 @@ ActiveRecord::Schema.define(version: 20141211114023) do
     t.datetime "updated_at"
   end
  
-  create_table "project_images", force: :cascade do |t|
+  create_table "project_attributes", force: :cascade do |t|
     t.integer  "project_id"
-    t.string   "url",        limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "project_ownerships", force: :cascade do |t|
+    t.string   "image_url"
     t.integer  "user_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.boolean  "hidden",     default: false
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
  
   create_table "reading_group_ownerships", force: :cascade do |t|
@@ -22,7 +22,7 @@ Feature: Project Deletion
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have a sample project_image 
+    And I have sample project_attributes
     And I am at the Sample Project page
     When I click the Destroy Project link
     Then I should be in the All Projects page
@@ -8,7 +8,7 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have a sample project_image
+    And I have sample project_attributes
     And I am at the All Projects page
     When I click the Edit link
     Then I should be in the Edit Project page
@@ -35,7 +35,7 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have a sample project_image
+    And I have sample project_attributes
     And I am at the All Projects page
     When I click the Edit link
     Then The field "project[name]" should be filled with the sample project "name"
@@ -46,7 +46,7 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have a sample project_image
+    And I have sample project_attributes
     And I am at the sample project edit page
     And I fill the Name field with "Kalibro"
     And I fill the Description field with "Web Service to collect metrics"
@@ -61,7 +61,7 @@ Feature: Project
     And I have a project named "Qt-Calculator"
     And I own a project named "Kalibro"
     And I am at the sample project edit page
-    And I have a sample project_image
+    And I have sample project_attributes
     And I fill the Name field with "Qt-Calculator"
     When I press the Save button
     Then I should see "Name has already been taken"
@@ -71,7 +71,7 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have a sample project_image
+    And I have sample project_attributes
     And I am at the sample project edit page
     And I fill the Description field with "Web Service to collect metrics"
     When I press the Save button
@@ -82,7 +82,7 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have a sample project_image
+    And I have sample project_attributes
     And I am at the sample project edit page
     And I fill the Name field with " "
     When I press the Save button
@@ -25,7 +25,7 @@ Feature: Project listing
     Given I am a regular user
     And I am signed in
     And I have a sample project
-    And I have a sample project_image
+    And I have sample project_attributes
     And I am at the All Projects page
     When I click the Show link
     Then the sample project should be there
 \ No newline at end of file
@@ -7,7 +7,7 @@ Feature: Show Project
 Scenario: Should not show the create repository link to user that doesn't own the project
   Given I am a regular user
   And I have a sample project
-  And I have a sample project_image
+  And I have sample project_attributes
   And I have a sample configuration with native metrics
   And I have a sample repository within the sample project
   When I am at the Sample Project page
@@ -20,7 +20,7 @@ Scenario: Should show the create repository link the project owner
   Given I am a regular user
   And I am signed in
   And I own a sample project
-  And I have a sample project_image
+  And I have sample project_attributes
   When I am at the Sample Project page
   Then I should see "New Repository"
  
@@ -28,7 +28,7 @@ Scenario: Should show the create repository link the project owner
 @kalibro_processor_restart
 Scenario: Considering the project has no repositories
   Given I have a sample project
-  And I have a sample project_image
+  And I have sample project_attributes
   When I am at the Sample Project page
   Then I should see "There are no Repositories yet!"
  
@@ -43,6 +43,6 @@ Scenario: Considering the project has repositories
 @kalibro_processor_restart
 Scenario: Checking project contents
   Given I have a sample project
-  And I have a sample project_image
+  And I have sample project_attributes
   When I am at the Sample Project page
   Then the sample project should be there
@@ -8,8 +8,8 @@ Given(/^I have a sample project$/) do
   @project = FactoryGirl.create(:project)
 end
  
-Given(/^I have a sample project_image$/) do
-  @project_image = FactoryGirl.create(:project_image, {id: nil})
+Given(/^I have sample project_attributes$/) do
+  @project_attributes = FactoryGirl.create(:project_attributes, {id: nil})
 end
  
 Given(/^I have a project named "(.*?)"$/) do |name|
@@ -18,12 +18,12 @@ end
  
 Given(/^I own a sample project$/) do
   @project = FactoryGirl.create(:project)
-  FactoryGirl.create(:project_ownership, {user_id: @user.id, project_id: @project.id})
+  FactoryGirl.create(:project_attributes, {user_id: @user.id, project_id: @project.id})
 end
  
 Given(/^I own a project named "(.*?)"$/) do |name|
   @project = FactoryGirl.create(:project, {name: name})
-  FactoryGirl.create(:project_ownership, {user_id: @user.id, project_id: @project.id})
+  FactoryGirl.create(:project_attributes, {user_id: @user.id, project_id: @project.id})
 end
  
 Given(/^I am at the Sample Project page$/) do
@@ -111,12 +111,12 @@ describe OwnershipAuthentication, type: :controller do
         end
  
         context 'when the user owns the Repository' do
-          let!(:project_ownership) { FactoryGirl.build(:project_ownership, {user_id: current_user.id, project_id: project.id}) }
+          let!(:project_attributes) { FactoryGirl.build(:project_attributes, {user_id: current_user.id, project_id: project.id}) }
  
           before do
-            project_ownerships = Object.new
-            project_ownerships.expects(:find_by_project_id).with(project.id).returns(project_ownership)
-            current_user.expects(:project_ownerships).returns(project_ownerships)
+            project_attrs = Object.new
+            project_attrs.expects(:find_by_project_id).with(project.id).returns(project_attributes)
+            current_user.expects(:project_attributes).returns(project_attrs)
           end
  
           it 'should return true' do
@@ -126,9 +126,9 @@ describe OwnershipAuthentication, type: :controller do
  
         context 'when the user does not own the Repository' do
           before do
-            project_ownerships = Object.new
-            project_ownerships.expects(:find_by_project_id).with(project.id).returns(nil)
-            current_user.expects(:project_ownerships).returns(project_ownerships)
+            project_attrs = Object.new
+            project_attrs.expects(:find_by_project_id).with(project.id).returns(nil)
+            current_user.expects(:project_attributes).returns(project_attrs)
           end
  
           it 'should respond' do # FIXME: this is not the best test, but it it's the closest we can do I think
@@ -91,21 +91,20 @@ describe ProjectsController, :type =&gt; :controller do
     context 'with a User logged in' do
       before do
         sign_in FactoryGirl.create(:user)
-        @ownership = FactoryGirl.build(:project_ownership)
-        @ownerships = []
-
+        @project_attributes = FactoryGirl.build(:project_attributes)
+        @attributes = []
       end
  
       context 'when the user owns the project' do
         before :each do
-          @ownership.expects(:destroy)
+          @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 :(
-          @ownerships.expects(:find_by_project_id).with("#{@subject.id}").returns(@ownership)
-          @ownerships.expects(:find_by_project_id).with(@subject.id).returns(@ownership)
+          @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_ownerships).at_least_once.returns(@ownerships)
+          User.any_instance.expects(:project_attributes).at_least_once.returns(@attributes)
  
           subject.expects(:find_resource).with(Project, @subject.id).returns(@subject)
           delete :destroy, :id => @subject.id
@@ -120,8 +119,8 @@ describe ProjectsController, :type =&gt; :controller do
  
       context "when the user doesn't own the project" do
         before :each do
-          @ownerships.expects(:find_by_project_id).with("#{@subject.id}").returns(nil)
-          User.any_instance.expects(:project_ownerships).at_least_once.returns(@ownerships)
+          @attributes.expects(:find_by_project_id).with("#{@subject.id}").returns(nil)
+          User.any_instance.expects(:project_attributes).at_least_once.returns(@attributes)
  
           delete :destroy, :id => @subject.id
         end
@@ -140,9 +139,12 @@ describe ProjectsController, :type =&gt; :controller do
   end
  
   describe 'index' do
+    let(:project_attributes) { FactoryGirl.build(:project_attributes) }
+
     before :each do
       @subject = FactoryGirl.build(:project_with_id)
       Project.expects(:all).returns([@subject])
+      @subject.expects(:attributes).returns(project_attributes)
       get :index
     end
  
@@ -152,15 +154,14 @@ describe ProjectsController, :type =&gt; :controller do
   describe 'edit' do
     before do
       @subject = FactoryGirl.build(:project_with_id)
-      @project_image = FactoryGirl.create(:project_image)
     end
  
     context 'with an User logged in' do
       before do
         @user = FactoryGirl.create(:user)
-        @ownership = FactoryGirl.build(:project_ownership)
-        @ownerships = []
-        User.any_instance.expects(:project_ownerships).at_least_once.returns(@ownerships)
+        @attribute = FactoryGirl.build(:project_attributes)
+        @attributes = []
+        User.any_instance.expects(:project_attributes).at_least_once.returns(@attributes)
  
         sign_in @user
       end
@@ -168,8 +169,7 @@ describe ProjectsController, :type =&gt; :controller do
       context 'when the user owns the project' do
         before :each do
           subject.expects(:find_resource).with(Project, @subject.id).returns(@subject)
-          @ownerships.expects(:find_by_project_id).with("#{@subject.id}").returns(@ownership)
-          ProjectImage.expects(:find_by_project_id).with(@subject.id).returns(@project_image)
+          @attributes.expects(:find_by_project_id).with("#{@subject.id}").returns(@attribute)
  
           get :edit, :id => @subject.id
         end
@@ -184,7 +184,7 @@ describe ProjectsController, :type =&gt; :controller do
       context 'when the user does not own the project' do
         before do
           @subject = FactoryGirl.build(:another_project)
-          @ownerships.expects(:find_by_project_id).with("#{@subject.id}").returns(nil)
+          @attributes.expects(:find_by_project_id).with("#{@subject.id}").returns(nil)
  
           get :edit, :id => @subject.id
         end
@@ -205,7 +205,6 @@ describe ProjectsController, :type =&gt; :controller do
  
   describe 'update' do
     before do
-      @project_image = FactoryGirl.build(:project_image)
       @subject = FactoryGirl.build(:project_with_id)
       @subject_params = @subject.to_hash
     end
@@ -217,17 +216,18 @@ describe ProjectsController, :type =&gt; :controller do
  
       context 'when user owns the project' do
         before do
-          @ownership = FactoryGirl.build(:project_ownership)
-          @ownerships = []
-          @ownerships.expects(:find_by_project_id).with("#{@subject.id}").returns(@ownership)
-          User.any_instance.expects(:project_ownerships).at_least_once.returns(@ownerships)
-          ProjectImage.expects(:find_by_project_id).with(@subject.id).returns(@project_image)
+          @project_attributes = FactoryGirl.build(:project_attributes)
+          @attributes = []
+          @attributes.expects(:find_by_project_id).with("#{@subject.id}").returns(@project_attributes)
+          User.any_instance.expects(:project_attributes).at_least_once.returns(@attributes)
         end
  
         context 'with valid fields' do
           before :each do
             subject.expects(:find_resource).with(Project, @subject.id).returns(@subject)
             Project.any_instance.expects(:update).with(@subject_params).returns(true)
+            @project_attributes.expects(:update).with(image_url: @subject_params[:image_url]).returns(true)
+            @subject.expects(:attributes).returns(@project_attributes)
           end
  
           context 'rendering the show' do
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :project_attributes, :class => 'ProjectAttributes' do
+    project_id 1
+    image_url "MyString"
+    user_id 1
+    hidden false
+  end
+end
@@ -1,12 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :project_image do
-    project_id 1
-    url "logo.png"
-  end
-
-  factory :project_no_image, class: ProjectImage do
-    url nil
-  end
-end
@@ -1,8 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :project_ownership do
-    user_id 1
-    project_id 1
-  end
-end
@@ -19,10 +19,10 @@ describe ProjectsHelper, :type =&gt; :helper do
         helper.expects(:user_signed_in?).returns(true)
         helper.expects(:current_user).returns(FactoryGirl.build(:user))
  
-        @ownerships = []
-        @ownerships.expects(:find_by_project_id).with(@subject.id).returns(nil)
+        @attributes = []
+        @attributes.expects(:find_by_project_id).with(@subject.id).returns(nil)
  
-        User.any_instance.expects(:project_ownerships).returns(@ownerships)
+        User.any_instance.expects(:project_attributes).returns(@attributes)
       end
  
       it { expect(helper.project_owner?(@subject.id)).to be_falsey }
@@ -33,10 +33,10 @@ describe ProjectsHelper, :type =&gt; :helper do
         helper.expects(:user_signed_in?).returns(true)
         helper.expects(:current_user).returns(FactoryGirl.build(:user))
  
-        @ownership = FactoryGirl.build(:project_ownership)
-        @ownerships = []
-        @ownerships.expects(:find_by_project_id).with(@subject.id).returns(@ownership)
-        User.any_instance.expects(:project_ownerships).returns(@ownerships)
+        @project_attributes = FactoryGirl.build(:project_attributes)
+        @attributes = []
+        @attributes.expects(:find_by_project_id).with(@subject.id).returns(@project_attributes)
+        User.any_instance.expects(:project_attributes).returns(@attributes)
       end
  
       it { expect(helper.project_owner?(@subject.id)).to be_truthy }
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+RSpec.describe ProjectAttributes, type: :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe 'methods' do
+    describe 'project' do
+      subject { FactoryGirl.build(:project_attributes) }
+      let(:project) {FactoryGirl.build(:project_with_id)}
+
+      before :each do
+        Project.expects(:find).with(subject.project_id).returns(project)
+      end
+
+      it 'should return the project' do
+        expect(subject.project).to eq(project)
+      end
+    end
+  end
+end
@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe ProjectImage, :type => :model do
-  describe 'associations' do
-    it { is_expected.to belong_to(:project) }
-  end
-end
@@ -1,22 +0,0 @@
-require 'rails_helper'
-
-describe ProjectOwnership, :type => :model do
-  describe 'associations' do
-    it { is_expected.to belong_to(:user) }
-  end
-
-  describe 'methods' do
-    describe 'project' do
-      subject {FactoryGirl.build(:project_ownership)}
-      let(:project) {FactoryGirl.build(:project_with_id)}
-
-      before :each do
-        Project.expects(:find).with(subject.project_id).returns(project)
-      end
-
-      it 'should return the project' do
-        expect(subject.project).to eq(project)
-      end
-    end
-  end
-end
@@ -3,22 +3,40 @@ require &#39;rails_helper&#39;
 describe Project, :type => :model do
   describe 'methods' do
     describe 'latest' do
+      let!(:project) { FactoryGirl.build(:project_with_id, id: 1) }
+      let!(:another_project) { FactoryGirl.build(:another_project, id: 2) }
+      let!(:project_attributes) { FactoryGirl.build(:project_attributes) }
+
       before :each do
-        @qt      = FactoryGirl.build(:project_with_id)
-        @kalibro = FactoryGirl.build(:another_project)
+        project.expects(:attributes).returns(project_attributes)
+        another_project.expects(:attributes).returns(project_attributes)
  
-        Project.expects(:all).returns([@qt, @kalibro])
+        Project.expects(:all).returns([project, another_project])
       end
  
       it 'should return the two projects ordered' do
-        expect(Project.latest(2)).to eq([@kalibro, @qt])
+        expect(Project.latest(2)).to eq([another_project, project])
       end
  
       context 'when no parameter is passed' do
         it 'should return just the most recent project' do
-          expect(Project.latest).to eq([@kalibro])
+          expect(Project.latest).to eq([another_project])
         end
       end
     end
+
+    describe 'attributes' do
+      subject { FactoryGirl.build(:project_with_id) }
+
+      let!(:project_attributes) { FactoryGirl.build(:project_attributes) }
+
+      before :each do
+        ProjectAttributes.expects(:find_by_project_id).returns(project_attributes)
+      end
+
+      it 'is expected to return the project attributes' do
+        expect(subject.attributes).to eq(project_attributes)
+      end
+    end
   end
 end
@@ -10,7 +10,7 @@ describe User, :type =&gt; :model do
   end
  
   describe 'associations' do
-    it { is_expected.to have_many(:project_ownerships) }
+    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) }
   end
@@ -19,11 +19,11 @@ describe User, :type =&gt; :model do
     describe 'projects' do
       subject { FactoryGirl.build(:user) }
       let(:project) {FactoryGirl.build(:project_with_id)}
-      let(:project_ownership) {FactoryGirl.build(:project_ownership)}
+      let(:project_attributes) {FactoryGirl.build(:project_attributes)}
  
       before :each do
-        project_ownership.expects(:project).returns(project)
-        subject.expects(:project_ownerships).returns([project_ownership])
+        project_attributes.expects(:project).returns(project)
+        subject.expects(:project_attributes).returns([project_attributes])
       end
  
       it 'should return a list of projects owned by the user' do
...	...	@@ -52,7 +52,7 @@ module OwnershipAuthentication
52	52	private
53	53
54	54	def check_project_ownership(id)
55		- if current_user.project_ownerships.find_by_project_id(id).nil?
	55	+ if current_user.project_attributes.find_by_project_id(id).nil?
56	56	respond_to do \|format\|
57	57	format.html { redirect_to projects_url, notice: "You're not allowed to do this operation" }
58	58	format.json { head :no_content }
...	...
...	...	@@ -9,13 +9,12 @@ class ProjectsController < ApplicationController
9	9	# GET /projects/new
10	10	def new
11	11	@project = Project.new
12		- @project_image = ProjectImage.new
13	12	end
14	13
15	14	# GET /projects
16	15	# GET /projects.json
17	16	def index
18		- @projects = Project.all
	17	+ @projects = Project.all.select { \|project\| !project.attributes.hidden }
19	18	end
20	19
21	20	# POST /projects
...	...	@@ -25,7 +24,7 @@ class ProjectsController < ApplicationController
25	24	@project = Project.new(project_params)
26	25	respond_to do \|format\|
27	26	create_and_redir(format)
28		- ProjectImage.create(url: image_url, project_id: @project.id )
	27	+ @project.attributes.update(image_url: image_url) unless @project.attributes.nil?
29	28	end
30	29	end
31	30
...	...	@@ -45,7 +44,7 @@ class ProjectsController < ApplicationController
45	44	def update
46	45	set_project
47	46	image_url = project_params.delete(:image_url)
48		- if @project.update(project_params) && @project_image.update(url: image_url)
	47	+ if @project.update(project_params) && @project.attributes.update(image_url: image_url)
49	48	redirect_to(project_path(@project.id))
50	49	else
51	50	render "edit"
...	...	@@ -56,7 +55,7 @@ class ProjectsController < ApplicationController
56	55	# DELETE /project/1.json
57	56	def destroy
58	57	set_project
59		- current_user.project_ownerships.find_by_project_id(@project.id).destroy
	58	+ current_user.project_attributes.find_by_project_id(@project.id).destroy
60	59	@project.destroy
61	60	respond_to do \|format\|
62	61	format.html { redirect_to projects_url }
...	...	@@ -68,7 +67,6 @@ class ProjectsController < ApplicationController
68	67	# Use callbacks to share common setup or constraints between actions.
69	68	def set_project
70	69	@project = find_resource(Project, params[:id].to_i)
71		- @project_image = ProjectImage.find_by_project_id(@project.id) if @project.is_a?(Project)
72	70	end
73	71
74	72	# Never trust parameters from the scary internet, only allow the white list through.
...	...	@@ -80,7 +78,7 @@ class ProjectsController < ApplicationController
80	78	# Extracted code from create action
81	79	def create_and_redir(format)
82	80	if @project.save
83		- current_user.project_ownerships.create project_id: @project.id
	81	+ current_user.project_attributes.create(project_id: @project.id)
84	82	format.html { redirect_to project_path(@project.id), notice: 'Project was successfully created.' }
85	83	format.json { render action: 'show', status: :created, location: @project }
86	84	else
...	...
1	1	module ProjectsHelper
2	2	def project_owner? project_id
3		- user_signed_in? && !current_user.project_ownerships.find_by_project_id(project_id).nil?
	3	+ user_signed_in? && !current_user.project_attributes.find_by_project_id(project_id).nil?
4	4	end
5	5	end
6	6	\ No newline at end of file
...	...
1	1	class Project < KalibroClient::Entities::Processor::Project
2	2	include KalibroRecord
	3	+
3	4	def self.latest(count = 1)
4		- all.sort { \|a,b\| b.id <=> a.id }.first(count)
	5	+ all.sort { \|a,b\| b.id <=> a.id }.select { \|project\| !project.attributes.hidden}.first(count)
	6	+ end
	7	+
	8	+ def attributes
	9	+ project_attributes = ProjectAttributes.find_by_project_id(self.id)
	10	+ project_attributes.nil? ? ProjectAttributes.new : project_attributes
5	11	end
6	12	end
...	...
...	...	@@ -0,0 +1,8 @@
	1	+class ProjectAttributes < ActiveRecord::Base
	2	+ belongs_to :user
	3	+ belongs_to :project
	4	+
	5	+ def project
	6	+ Project.find(self.project_id)
	7	+ end
	8	+end
...	...
	1	+#FIXME: remove this after the migration has been done and modify the migration accordingly
1	2	class ProjectImage < ActiveRecord::Base
2	3	belongs_to :project
3	4	end
...	...
	1	+#FIXME: remove this after the migration has been done and modify the migration accordingly
1	2	class ProjectOwnership < ActiveRecord::Base
2	3	belongs_to :user
3	4	validates :project_id, presence: true
...	...
...	...	@@ -8,12 +8,12 @@ class User < ActiveRecord::Base
8	8	validates :email, presence: true
9	9	validates :email, uniqueness: true
10	10
11		- has_many :project_ownerships
	11	+ has_many :project_attributes, class_name: 'ProjectAttributes'
12	12	has_many :reading_group_ownerships
13	13	has_many :kalibro_configuration_ownerships
14	14	# Alert: when adding new parameters to this model, they should also be added to registrations_controller
15	15
16	16	def projects
17		- project_ownerships.map { \|project_ownership\| project_ownership.project }
	17	+ project_attributes.map { \|project_attr\| project_attr.project }
18	18	end
19	19	end
...	...
...	...	@@ -17,7 +17,7 @@
17	17	<div class="form-row">
18	18	<div class="field-container">
19	19	<%= f.label "Image url", class: 'control-label' %><br>
20		- <%= f.text_field :image_url, class: 'text-area', value: @project_image.nil? ? '#' : @project_image.url %>
	20	+ <%= f.text_field :image_url, class: 'text-area', value: @project.attributes.nil? \|\| @project.attributes.image_url.nil? ? '#' : @project.attributes.image_url %>
21	21	</div>
22	22	</div>
23	23	</div>
...	...
...	...	@@ -0,0 +1,56 @@
	1	+class CreateProjectAttributes < ActiveRecord::Migration
	2	+ def up
	3	+ create_table :project_attributes do \|t\|
	4	+ t.integer :project_id
	5	+ t.string :image_url
	6	+ t.integer :user_id
	7	+ t.boolean :hidden, default: false
	8	+
	9	+ t.timestamps null: false
	10	+ end
	11	+
	12	+ ProjectOwnership.all.each do \|project_ownership\|
	13	+ project_image = ProjectImage.find_by_project_id(project_ownership.project_id)
	14	+ image_url = project_image.nil? ? "": project_image.url
	15	+
	16	+ begin
	17	+ # We want to hides projects prior this date since they probably have a invalid configuration
	18	+ if Project.find(project_ownership.project_id).updated_at < DateTime.parse("Mon, 23 Feb 2015")
	19	+ hidden = true
	20	+ else
	21	+ hidden = false
	22	+ end
	23	+
	24	+ ProjectAttributes.create(user_id: project_ownership.user_id, project_id: project_ownership.project_id, image_url: image_url, hidden: hidden)
	25	+ rescue KalibroClient::Errors::RecordNotFound
	26	+ puts "Could not find project with id #{project_ownership.project_id} owned by user with #{project_ownership.user_id} and image url #{image_url}"
	27	+ end
	28	+ end
	29	+
	30	+ drop_table :project_ownerships
	31	+ drop_table :project_images
	32	+ end
	33	+
	34	+ def down
	35	+ create_table :project_ownerships do \|t\|
	36	+ t.integer :user_id
	37	+ t.integer :project_id
	38	+
	39	+ t.timestamps
	40	+ end
	41	+
	42	+ create_table :project_images do \|t\|
	43	+ t.belongs_to :project
	44	+ t.string :url
	45	+
	46	+ t.timestamps
	47	+ end
	48	+
	49	+ ProjectAttributes.all.each do \|project_attribute\|
	50	+ ProjectOwnership.create(user_id: project_attribute.user_id, project_id: project_attribute.project_id)
	51	+ ProjectImage.create(url: project_attribute.image_url, project_id: project_attribute.project_id)
	52	+ end
	53	+
	54	+ drop_table :project_attributes
	55	+ end
	56	+end
...	...