Renamed ProjectImage image_url to url

Rafael Manzo
1 parent 4187ef90
Showing 9 changed files with 17 additions and 29 deletions Show diff stats
app/controllers/projects_controller.rb
app/models/project.rb
app/views/projects/_form.html.erb
app/views/projects/show.html.erb
db/migrate/20141119173020_rename_project_image_image_url_to_url.rb
db/schema.rb
spec/factories/project_images.rb
spec/factories/projects.rb
spec/models/project_image_spec.rb
@@ -23,7 +23,7 @@ class ProjectsController &lt; ApplicationController
     @project = Project.new(project_params)
     respond_to do |format|
       create_and_redir(format)
-      ProjectImage.create(image_url: project_params[:image_url],project_id: @project.id )
+      ProjectImage.create(url: project_params[:url],project_id: @project.id )
     end
   end
@@ -46,7 +46,7 @@ class ProjectsController &lt; ApplicationController
   def update
     set_project
     @project_image = ProjectImage.find_by_project_id(@project.id)
-    if @project.update(project_params) && @project_image.update(image_url: project_params[:image_url])
+    if @project.update(project_params) && @project_image.update(url: project_params[:image_url])
       redirect_to(project_path(@project.id))
     else
       render "edit"
@@ -3,7 +3,7 @@ require &quot;validators/kalibro_uniqueness_validator.rb&quot;
 class Project < KalibroGatekeeperClient::Entities::Project
   include KalibroRecord
-  attr_accessor :name,:image_url
+  attr_accessor :name
   validates :name, presence: true, kalibro_uniqueness: true
   def repositories
@@ -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.image_url  %>
+          <%= f.text_field :image_url, class: 'text-area' ,value: @project_image.nil? ? '#' : @project_image.url  %>
         </div>
       </div>
     </div>
@@ -2,8 +2,8 @@
 <div class="page-header">
   <div class="row">
     <div class="col-md-2">
-      <% if @project_image && !@project_image.image_url.empty? %>
-        <%= image_tag "#{@project_image.image_url}", size:"128x128" %>
+      <% 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
@@ -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: 20141006232631) do
+ActiveRecord::Schema.define(version: 20141119173020) do
   create_table "mezuro_configuration_ownerships", force: true do |t|
     t.integer  "user_id"
@@ -22,7 +22,7 @@ ActiveRecord::Schema.define(version: 20141006232631) do
   create_table "project_images", force: true do |t|
     t.integer  "project_id"
-    t.string   "image_url"
+    t.string   "url"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -3,10 +3,10 @@
 FactoryGirl.define do
   factory :project_image do
     project_id 1
-    image_url "Example"
+    url "Example"
   end
   factory :project_no_image, class: ProjectImage do
-    image_url nil
+    url nil
   end
 end
@@ -5,7 +5,6 @@ FactoryGirl.define do
     id 1
     name "QT Calculator"
     description "A simple calculator for us."
-    image_url { FactoryGirl.build(:project_image) }
   end
   factory :another_project, class: Project do
@@ -3,23 +3,5 @@ require &#39;rails_helper&#39;
 RSpec.describe ProjectImage, :type => :model do
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
-    it { should belong_to(:project) }
-  end
-
-  describe 'methods' do
-
-    it 'should validate url blank' do
-      @project_no_image = FactoryGirl.create(:project_no_image)
-      expect(@project_no_image.image_url).to eq("no-image-available.png")
-    end
-
-    it "Can be assigns" do
-      expect(ProjectImage.new).to be_an_instance_of(ProjectImage)
-    end
-
-    it 'should validate url field' do
-      @project_no_image = FactoryGirl.create(:project_no_image)
-      expect(@project_no_image.check_no_image).to eq("")
-    end
   end
 end
	@@ -23,7 +23,7 @@ class ProjectsController < ApplicationController		@@ -23,7 +23,7 @@ class ProjectsController < ApplicationController
23	@project = Project.new(project_params)	23	@project = Project.new(project_params)
24	respond_to do \|format\|	24	respond_to do \|format\|
25	create_and_redir(format)	25	create_and_redir(format)
26	- ProjectImage.create(image_url: project_params[:image_url],project_id: @project.id )	26	+ ProjectImage.create(url: project_params[:url],project_id: @project.id )
27	end	27	end
28	end	28	end
29		29
	@@ -46,7 +46,7 @@ class ProjectsController < ApplicationController		@@ -46,7 +46,7 @@ class ProjectsController < ApplicationController
46	def update	46	def update
47	set_project	47	set_project
48	@project_image = ProjectImage.find_by_project_id(@project.id)	48	@project_image = ProjectImage.find_by_project_id(@project.id)
49	- if @project.update(project_params) && @project_image.update(image_url: project_params[:image_url])	49	+ if @project.update(project_params) && @project_image.update(url: project_params[:image_url])
50	redirect_to(project_path(@project.id))	50	redirect_to(project_path(@project.id))
51	else	51	else
52	render "edit"	52	render "edit"
	@@ -3,7 +3,7 @@ require "validators/kalibro_uniqueness_validator.rb"		@@ -3,7 +3,7 @@ require "validators/kalibro_uniqueness_validator.rb"
3	class Project < KalibroGatekeeperClient::Entities::Project	3	class Project < KalibroGatekeeperClient::Entities::Project
4	include KalibroRecord	4	include KalibroRecord
5		5
6	- attr_accessor :name,:image_url	6	+ attr_accessor :name
7	validates :name, presence: true, kalibro_uniqueness: true	7	validates :name, presence: true, kalibro_uniqueness: true
8		8
9	def repositories	9	def repositories
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	<div class="form-row">	17	<div class="form-row">
18	<div class="field-container">	18	<div class="field-container">
19	<%= f.label "Image url", class: 'control-label' %><br>	19	<%= f.label "Image url", class: 'control-label' %><br>
20	- <%= f.text_field :image_url, class: 'text-area' ,value: @project_image.nil? ? '#' : @project_image.image_url %>	20	+ <%= f.text_field :image_url, class: 'text-area' ,value: @project_image.nil? ? '#' : @project_image.url %>
21	</div>	21	</div>
22	</div>	22	</div>
23	</div>	23	</div>
@@ -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
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	#	11	#
12	# It's strongly recommended that you check this file into your version control system.	12	# It's strongly recommended that you check this file into your version control system.
13		13
14	-ActiveRecord::Schema.define(version: 20141006232631) do	14	+ActiveRecord::Schema.define(version: 20141119173020) do
15		15
16	create_table "mezuro_configuration_ownerships", force: true do \|t\|	16	create_table "mezuro_configuration_ownerships", force: true do \|t\|
17	t.integer "user_id"	17	t.integer "user_id"
	@@ -22,7 +22,7 @@ ActiveRecord::Schema.define(version: 20141006232631) do		@@ -22,7 +22,7 @@ ActiveRecord::Schema.define(version: 20141006232631) do
22		22
23	create_table "project_images", force: true do \|t\|	23	create_table "project_images", force: true do \|t\|
24	t.integer "project_id"	24	t.integer "project_id"
25	- t.string "image_url"	25	+ t.string "url"
26	t.datetime "created_at"	26	t.datetime "created_at"
27	t.datetime "updated_at"	27	t.datetime "updated_at"
28	end	28	end
	@@ -3,10 +3,10 @@		@@ -3,10 +3,10 @@
3	FactoryGirl.define do	3	FactoryGirl.define do
4	factory :project_image do	4	factory :project_image do
5	project_id 1	5	project_id 1
6	- image_url "Example"	6	+ url "Example"
7	end	7	end
8		8
9	factory :project_no_image, class: ProjectImage do	9	factory :project_no_image, class: ProjectImage do
10	- image_url nil	10	+ url nil
11	end	11	end
12	end	12	end
	@@ -5,7 +5,6 @@ FactoryGirl.define do		@@ -5,7 +5,6 @@ FactoryGirl.define do
5	id 1	5	id 1
6	name "QT Calculator"	6	name "QT Calculator"
7	description "A simple calculator for us."	7	description "A simple calculator for us."
8	- image_url { FactoryGirl.build(:project_image) }
9	end	8	end
10		9
11	factory :another_project, class: Project do	10	factory :another_project, class: Project do
	@@ -3,23 +3,5 @@ require 'rails_helper'		@@ -3,23 +3,5 @@ require 'rails_helper'
3	RSpec.describe ProjectImage, :type => :model do	3	RSpec.describe ProjectImage, :type => :model do
4	describe 'associations' do	4	describe 'associations' do
5	it { is_expected.to belong_to(:project) }	5	it { is_expected.to belong_to(:project) }
6	- it { should belong_to(:project) }
7	- end
8	-
9	- describe 'methods' do
10	-
11	- it 'should validate url blank' do
12	- @project_no_image = FactoryGirl.create(:project_no_image)
13	- expect(@project_no_image.image_url).to eq("no-image-available.png")
14	- end
15	-
16	- it "Can be assigns" do
17	- expect(ProjectImage.new).to be_an_instance_of(ProjectImage)
18	- end
19	-
20	- it 'should validate url field' do
21	- @project_no_image = FactoryGirl.create(:project_no_image)
22	- expect(@project_no_image.check_no_image).to eq("")
23	- end
24	end	6	end
25	end	7	end