Merge pull request #153 from mezuro/close_issue25

Close issue25

Merge pull request #153 from mezuro/close_issue25
Close issue25
Rafael Manzo
2 parents 885f0fd6 779bfbf0
Showing 21 changed files with 142 additions and 58 deletions Show diff stats
Gemfile
Gemfile.lock
app/controllers/projects_controller.rb
app/models/module_result.rb
app/models/project_image.rb
app/views/projects/_form.html.erb
app/views/projects/edit.html.erb
app/views/projects/show.html.erb
config/kalibro_gatekeeper.yml.sample
config/kalibro_processor.yml.sample
db/migrate/20141006232631_create_project_images.rb
db/migrate/20141119173020_rename_project_image_image_url_to_url.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/projects_controller_spec.rb
spec/factories/project_images.rb
@@ -37,7 +37,7 @@ gem &#39;kalibro_gatekeeper_client&#39;, &#39;~&gt; 1.0.0&#39;
 gem "pg", "~> 0.17.0"
 # Twitter Bootstrap for layout
-gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
+gem 'twitter-bootstrap-rails', :git => 'https://github.com/seyhunak/twitter-bootstrap-rails.git'
 # Chart generation
 gem "chart-js-rails", "~> 0.0.6"
 GIT
-  remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
+  remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
   revision: 3edf24de985d946f16a2781644289cfdc51ba95b
   specs:
     twitter-bootstrap-rails (3.2.0)
@@ -8,6 +8,7 @@ class ProjectsController &lt; ApplicationController
   # GET /projects/new
   def new
     @project = Project.new
+    @project_image = ProjectImage.new
   end
   # GET /projects
@@ -19,9 +20,11 @@ class ProjectsController &lt; ApplicationController
   # POST /projects
   # POST /projects.json
   def create
+    image_url = project_params.delete(:image_url)
     @project = Project.new(project_params)
     respond_to do |format|
       create_and_redir(format)
+      ProjectImage.create(url: image_url, project_id: @project.id )
     end
   end
@@ -36,11 +39,12 @@ class ProjectsController &lt; ApplicationController
   # GET /projects/1/edit.json
   def edit
     set_project
-  end 
+  end
   def update
     set_project
-    if @project.update(project_params)
+    image_url = project_params.delete(:image_url)
+    if @project.update(project_params) && @project_image.update(url: image_url)
       redirect_to(project_path(@project.id))
     else
       render "edit"
@@ -60,26 +64,26 @@ class ProjectsController &lt; ApplicationController
   end
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_project
-      @project = Project.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def project_params
-      params[:project]
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_project
+    @project = Project.find(params[:id])
+    @project_image = ProjectImage.find_by_project_id(@project.id)
+  end
-    # Extracted code from create action
-    def create_and_redir(format)
-      if @project.save
-        current_user.project_ownerships.create project_id: @project.id
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def project_params
+    params[:project]
+  end
-        format.html { redirect_to project_path(@project.id), notice: 'Project was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @project }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @project.errors, status: :unprocessable_entity }
-      end
+  # Extracted code from create action
+  def create_and_redir(format)
+    if @project.save
+      current_user.project_ownerships.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
+      format.html { render action: 'new' }
+      format.json { render json: @project.errors, status: :unprocessable_entity }
     end
+  end
 end
@@ -23,4 +23,4 @@ class ModuleResult &lt; KalibroGatekeeperClient::Entities::ModuleResult
   def find_grade_by_metric_name(metric_results, name)
     metric_results.each { |metric_result| return metric_result.value if metric_result.metric_configuration_snapshot.metric.name == name }
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,3 @@
+class ProjectImage < ActiveRecord::Base
+  belongs_to :project
+end
 <%= form_for(@project, :html => { role: 'form' }) do |f| %>
-<%= render :partial => 'shared/form_errors', :locals => {:object => @project} %>
-
-<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' %><br>
-        <%= f.text_field :name, :required => true, class: 'text-field form-control' %>
+  <%= render :partial => 'shared/form_errors', :locals => {:object => @project} %>
+  <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' %><br>
+          <%= f.text_field :name, :required => true, class: 'text-field form-control' %>
+        </div>
       </div>
-    </div>
-
-    <div class="form-row">
-      <div class="field-container">
-        <%= f.label :description, class: 'control-label' %><br>
-        <%= f.text_area :description, class: 'text-area form-control' %>
+      <div class="form-row">
+        <div class="field-container">
+          <%= f.label :description, class: 'control-label' %><br>
+          <%= f.text_area :description, class: 'text-area form-control' %>
+        </div>
+      </div>
+      <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  %>
+        </div>
       </div>
     </div>
   </div>
-</div>
-<div class="row margin-left-none" style="margin-top: 20px">
-  <%= f.submit 'Save', class: 'btn btn-primary' %>
-  <%= link_to 'Back', projects_path, class: 'btn btn-default' %>
-</div>
+  <div class="row margin-left-none" style="margin-top: 20px">
+    <%= f.submit 'Save', class: 'btn btn-primary' %>
+    <%= link_to 'Back', projects_path, class: 'btn btn-default' %>
+  </div>
 <% end %>
@@ -2,4 +2,4 @@
   <h1>Edit Project</h1>
 </div>
-<%= render 'form' %>
 \ No newline at end of file
+<%= render 'form' %>
+
 <div class="page-header">
-  <h1><%= @project.name %></h1>
+  <div class="row">
+    <div class="col-md-2">
+      <% if @project_image && !@project_image.url.empty? %>
+        <%= image_tag "#{@project_image.url}", size:"128x128" %>
+      <% else %>
+        <center><i class="fa fa-file-image-o fa-5x"></i></center><br />
+        No image available
+      <% end %>
+    </div>
+    <div class="col-md-10">
+      <h1><%= @project.name %></h1>
+    </div>
+  </div>
 </div>
 <p>
 # Configuration loaded only for production environment
-address: http://localhost:8080/KalibroService/
 \ No newline at end of file
+-address: http://localhost:8080/KalibroService/
-address: http://localhost:8082
 \ No newline at end of file
+address: http://localhost:8082
@@ -0,0 +1,10 @@
+class CreateProjectImages < ActiveRecord::Migration
+  def change
+    create_table :project_images do |t|
+    	t.belongs_to :project
+      t.string :image_url
+
+      t.timestamps
+    end
+  end
+end
@@ -0,0 +1,7 @@
+class RenameProjectImageImageUrlToUrl < ActiveRecord::Migration
+  def change
+    change_table :project_images do |t|
+      t.rename :image_url, :url
+    end
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140124124835) do
+ActiveRecord::Schema.define(version: 20141119173020) do
   create_table "mezuro_configuration_ownerships", force: true do |t|
     t.integer  "user_id"
@@ -20,6 +20,13 @@ ActiveRecord::Schema.define(version: 20140124124835) do
     t.datetime "updated_at"
   end
+  create_table "project_images", force: true do |t|
+    t.integer  "project_id"
+    t.string   "url"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "project_ownerships", force: true do |t|
     t.integer  "user_id"
     t.integer  "project_id"
@@ -22,6 +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 am at the Sample Project page
     When I click the Destroy Project link
     Then I should be in the All Projects page
@@ -8,6 +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 am at the All Projects page
     When I click the Edit link
     Then I should be in the Edit Project page
@@ -34,6 +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 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"
@@ -44,6 +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 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"
@@ -58,6 +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 fill the Name field with "Qt-Calculator"
     When I press the Save button
     Then I should see "Name There is already a Project with name Qt-Calculator!"
@@ -67,6 +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 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
@@ -77,6 +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 am at the sample project edit page
     And I fill the Name field with " "
     When I press the Save button
@@ -25,6 +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 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,6 +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 a sample configuration with native metrics
   And I have a sample repository within the sample project
   When I am at the Sample Project page
@@ -19,6 +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
   When I am at the Sample Project page
   Then I should see "New Repository"
@@ -26,6 +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
   When I am at the Sample Project page
   Then I should see "There are no Repositories yet!"
@@ -40,5 +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
   When I am at the Sample Project page
   Then the sample project should be there
@@ -8,6 +8,10 @@ Given(/^I have a sample project$/) do
   @project = FactoryGirl.create(:project, {id: nil})
 end
+Given(/^I have a sample project_image$/) do
+  @project_image = FactoryGirl.create(:project_image, {id: nil})
+end
+
 Given(/^I have a project named "(.*?)"$/) do |name|
   @project = FactoryGirl.create(:project, {id: nil, name: name})
 end
@@ -18,10 +18,10 @@ describe ProjectsController, :type =&gt; :controller do
     end
     context 'with valid fields' do
-	    let(:project) { FactoryGirl.build(:project) }
-	    let(:subject_params) { Hash[FactoryGirl.attributes_for(:project).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
+      let(:project) { FactoryGirl.build(:project) }
+      let(:subject_params) { Hash[FactoryGirl.attributes_for(:project).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
-     	before :each do
+      before :each do
         Project.any_instance.expects(:save).returns(true)
       end
@@ -62,8 +62,8 @@ describe ProjectsController, :type =&gt; :controller do
   end
   describe 'show' do
-  	subject { FactoryGirl.build(:project) }
-  	let(:repository) { FactoryGirl.build(:repository) }
+    subject { FactoryGirl.build(:project) }
+    let(:repository) { FactoryGirl.build(:repository) }
     before :each do
       Project.expects(:find).with(subject.id.to_s).returns(subject)
       subject.expects(:repositories).returns(repository)
@@ -116,7 +116,7 @@ describe ProjectsController, :type =&gt; :controller do
           delete :destroy, :id => @subject.id
         end
-         it { is_expected.to redirect_to(projects_path)  }
+        it { is_expected.to redirect_to(projects_path)  }
       end
     end
@@ -142,6 +142,7 @@ describe ProjectsController, :type =&gt; :controller do
   describe 'edit' do
     before do
       @subject = FactoryGirl.build(:project)
+      @project_image = FactoryGirl.create(:project_image)
     end
     context 'with an User logged in' do
@@ -149,7 +150,6 @@ describe ProjectsController, :type =&gt; :controller do
         @user = FactoryGirl.create(:user)
         @ownership = FactoryGirl.build(:project_ownership)
         @ownerships = []
-
         User.any_instance.expects(:project_ownerships).at_least_once.returns(@ownerships)
         sign_in @user
@@ -159,6 +159,7 @@ describe ProjectsController, :type =&gt; :controller do
         before :each do
           Project.expects(:find).with(@subject.id.to_s).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)
           get :edit, :id => @subject.id
         end
@@ -194,8 +195,9 @@ describe ProjectsController, :type =&gt; :controller do
   describe 'update' do
     before do
+      @project_image = FactoryGirl.build(:project_image)
       @subject = FactoryGirl.build(:project)
-      @subject_params = Hash[FactoryGirl.attributes_for(:project).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
+      @subject_params = Hash[FactoryGirl.attributes_for(:project).map { |k,v| [k.to_s, v.to_s] }]
     end
     context 'when the user is logged in' do
@@ -207,9 +209,9 @@ describe ProjectsController, :type =&gt; :controller 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)
         end
         context 'with valid fields' do
@@ -221,7 +223,6 @@ describe ProjectsController, :type =&gt; :controller do
           context 'rendering the show' do
             before :each do
               Project.expects(:exists?).returns(true)
-
               post :update, :id => @subject.id, :project => @subject_params
             end
@@ -0,0 +1,12 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :project_image do
+    project_id 1
+    url "Example"
+  end
+
+  factory :project_no_image, class: ProjectImage do
+    url nil
+  end
+end
@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+RSpec.describe ProjectImage, :type => :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:project) }
+  end
+end
	@@ -37,7 +37,7 @@ gem 'kalibro_gatekeeper_client', '~> 1.0.0'		@@ -37,7 +37,7 @@ gem 'kalibro_gatekeeper_client', '~> 1.0.0'
37	gem "pg", "~> 0.17.0"	37	gem "pg", "~> 0.17.0"
38		38
39	# Twitter Bootstrap for layout	39	# Twitter Bootstrap for layout
40	-gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'	40	+gem 'twitter-bootstrap-rails', :git => 'https://github.com/seyhunak/twitter-bootstrap-rails.git'
41		41
42	# Chart generation	42	# Chart generation
43	gem "chart-js-rails", "~> 0.0.6"	43	gem "chart-js-rails", "~> 0.0.6"
1	GIT	1	GIT
2	- remote: git://github.com/seyhunak/twitter-bootstrap-rails.git	2	+ remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3	revision: 3edf24de985d946f16a2781644289cfdc51ba95b	3	revision: 3edf24de985d946f16a2781644289cfdc51ba95b
4	specs:	4	specs:
5	twitter-bootstrap-rails (3.2.0)	5	twitter-bootstrap-rails (3.2.0)
	@@ -23,4 +23,4 @@ class ModuleResult < KalibroGatekeeperClient::Entities::ModuleResult		@@ -23,4 +23,4 @@ class ModuleResult < KalibroGatekeeperClient::Entities::ModuleResult
23	def find_grade_by_metric_name(metric_results, name)	23	def find_grade_by_metric_name(metric_results, name)
24	metric_results.each { \|metric_result\| return metric_result.value if metric_result.metric_configuration_snapshot.metric.name == name }	24	metric_results.each { \|metric_result\| return metric_result.value if metric_result.metric_configuration_snapshot.metric.name == name }
25	end	25	end
26	-end
27	\ No newline at end of file	26	\ No newline at end of file
		27	+end
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+class ProjectImage < ActiveRecord::Base
	2	+ belongs_to :project
	3	+end
	@@ -2,4 +2,4 @@		@@ -2,4 +2,4 @@
2	<h1>Edit Project</h1>	2	<h1>Edit Project</h1>
3	</div>	3	</div>
4		4
5	-<%= render 'form' %>
6	\ No newline at end of file	5	\ No newline at end of file
		6	+<%= render 'form' %>
		1	+
1	<div class="page-header">	2	<div class="page-header">
2	- <h1><%= @project.name %></h1>	3	+ <div class="row">
		4	+ <div class="col-md-2">
		5	+ <% if @project_image && !@project_image.url.empty? %>
		6	+ <%= image_tag "#{@project_image.url}", size:"128x128" %>
		7	+ <% else %>
		8	+ <center><i class="fa fa-file-image-o fa-5x"></i></center><br />
		9	+ No image available
		10	+ <% end %>
		11	+ </div>
		12	+ <div class="col-md-10">
		13	+ <h1><%= @project.name %></h1>
		14	+ </div>
		15	+ </div>
3	</div>	16	</div>
4		17
5	<p>	18	<p>
1	# Configuration loaded only for production environment	1	# Configuration loaded only for production environment
2	-address: http://localhost:8080/KalibroService/
3	\ No newline at end of file	2	\ No newline at end of file
		3	+-address: http://localhost:8080/KalibroService/
1	-address: http://localhost:8082
2	\ No newline at end of file	1	\ No newline at end of file
		2	+address: http://localhost:8082
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+class CreateProjectImages < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :project_images do \|t\|
	4	+ t.belongs_to :project
	5	+ t.string :image_url
	6	+
	7	+ t.timestamps
	8	+ end
	9	+ end
	10	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+class RenameProjectImageImageUrlToUrl < ActiveRecord::Migration
	2	+ def change
	3	+ change_table :project_images do \|t\|
	4	+ t.rename :image_url, :url
	5	+ end
	6	+ end
	7	+end