From 064ef703594868b7ace2ebe131ba145e27aef6d2 Mon Sep 17 00:00:00 2001 From: "Ira W. Snyder" Date: Mon, 26 Nov 2007 11:34:40 -0800 Subject: [PATCH] Massive Cleanup Signed-off-by: Ira W. Snyder --- app/controllers/game_genre_controller.rb | 51 ++++++++++++++++ app/controllers/game_platform_controller.rb | 51 ++++++++++++++++ app/controllers/gamegenre_controller.rb | 55 ------------------ app/controllers/gameplatform_controller.rb | 55 ------------------ app/controllers/media_controller.rb | 55 ------------------ app/controllers/video_genre_controller.rb | 51 ++++++++++++++++ app/controllers/video_media_controller.rb | 51 ++++++++++++++++ app/controllers/videogenre_controller.rb | 55 ------------------ app/helpers/game_genre_helper.rb | 2 + app/helpers/game_platform_helper.rb | 2 + app/helpers/gamegenre_helper.rb | 2 - app/helpers/gameplatform_helper.rb | 2 - app/helpers/media_helper.rb | 2 - app/helpers/video_genre_helper.rb | 2 + app/helpers/video_media_helper.rb | 2 + app/helpers/videogenre_helper.rb | 2 - app/models/game.rb | 22 +++---- app/models/game_genre.rb | 3 + app/models/game_platform.rb | 3 + app/models/gamegenre.rb | 3 - app/models/gameplatform.rb | 3 - app/models/video.rb | 14 ++--- app/models/{media.rb => video_genre.rb} | 2 +- app/models/{videogenre.rb => video_media.rb} | 2 +- app/views/game/_form.rhtml | 8 +-- app/views/game/list.rhtml | 4 +- app/views/game/searchresults.rhtml | 4 +- app/views/game/show.rhtml | 4 +- app/views/game_genre/_form.rhtml | 7 +++ app/views/game_genre/edit.rhtml | 9 +++ app/views/game_genre/list.rhtml | 27 +++++++++ .../{videogenre => game_genre}/new.rhtml | 2 +- app/views/game_genre/show.rhtml | 8 +++ app/views/game_platform/_form.rhtml | 7 +++ app/views/game_platform/edit.rhtml | 9 +++ app/views/game_platform/list.rhtml | 27 +++++++++ .../{gameplatform => game_platform}/new.rhtml | 2 +- app/views/game_platform/show.rhtml | 8 +++ app/views/gamegenre/_form.rhtml | 7 --- app/views/gamegenre/edit.rhtml | 9 --- app/views/gamegenre/list.rhtml | 27 --------- app/views/gamegenre/show.rhtml | 8 --- app/views/gameplatform/_form.rhtml | 7 --- app/views/gameplatform/edit.rhtml | 9 --- app/views/gameplatform/list.rhtml | 27 --------- app/views/gameplatform/show.rhtml | 8 --- .../{gamegenre.rhtml => game_genre.rhtml} | 2 +- ...gameplatform.rhtml => game_platform.rhtml} | 2 +- .../{media.rhtml => video_genre.rhtml} | 2 +- .../{videogenre.rhtml => video_media.rhtml} | 2 +- app/views/media/_form.rhtml | 7 --- app/views/media/edit.rhtml | 9 --- app/views/media/list.rhtml | 27 --------- app/views/media/show.rhtml | 8 --- app/views/video/_form.rhtml | 8 +-- app/views/video/list.rhtml | 4 +- app/views/video/searchresults.rhtml | 4 +- app/views/video/show.rhtml | 4 +- app/views/video_genre/_form.rhtml | 7 +++ app/views/video_genre/edit.rhtml | 9 +++ app/views/video_genre/list.rhtml | 27 +++++++++ app/views/{media => video_genre}/new.rhtml | 2 +- app/views/video_genre/show.rhtml | 8 +++ app/views/video_media/_form.rhtml | 7 +++ app/views/video_media/edit.rhtml | 9 +++ app/views/video_media/list.rhtml | 27 +++++++++ .../{gamegenre => video_media}/new.rhtml | 2 +- app/views/video_media/show.rhtml | 8 +++ app/views/videogenre/_form.rhtml | 7 --- app/views/videogenre/edit.rhtml | 9 --- app/views/videogenre/list.rhtml | 27 --------- app/views/videogenre/show.rhtml | 8 --- db/development.sqlite3 | Bin 25600 -> 30720 bytes db/migrate/028_create_video_genres.rb | 11 ++++ db/migrate/029_create_video_medias.rb | 11 ++++ db/migrate/030_create_game_genres.rb | 11 ++++ db/migrate/031_create_game_platforms.rb | 11 ++++ db/migrate/032_fix_rentables.rb | 12 ++++ db/schema.rb | 48 +++++++-------- .../{gamegenres.yml => game_genres.yml} | 0 .../{gameplatforms.yml => game_platforms.yml} | 0 .../fixtures/{medias.yml => video_genres.yml} | 0 .../{videogenres.yml => video_medias.yml} | 0 ..._test.rb => game_genre_controller_test.rb} | 34 +++++------ ...st.rb => game_platform_controller_test.rb} | 34 +++++------ ...test.rb => video_genre_controller_test.rb} | 34 +++++------ ...test.rb => video_media_controller_test.rb} | 34 +++++------ .../{gamegenre_test.rb => game_genre_test.rb} | 4 +- ...platform_test.rb => game_platform_test.rb} | 4 +- .../{media_test.rb => video_genre_test.rb} | 4 +- ...videogenre_test.rb => video_media_test.rb} | 4 +- 91 files changed, 622 insertions(+), 590 deletions(-) create mode 100644 app/controllers/game_genre_controller.rb create mode 100644 app/controllers/game_platform_controller.rb delete mode 100644 app/controllers/gamegenre_controller.rb delete mode 100644 app/controllers/gameplatform_controller.rb delete mode 100644 app/controllers/media_controller.rb create mode 100644 app/controllers/video_genre_controller.rb create mode 100644 app/controllers/video_media_controller.rb delete mode 100644 app/controllers/videogenre_controller.rb create mode 100644 app/helpers/game_genre_helper.rb create mode 100644 app/helpers/game_platform_helper.rb delete mode 100644 app/helpers/gamegenre_helper.rb delete mode 100644 app/helpers/gameplatform_helper.rb delete mode 100644 app/helpers/media_helper.rb create mode 100644 app/helpers/video_genre_helper.rb create mode 100644 app/helpers/video_media_helper.rb delete mode 100644 app/helpers/videogenre_helper.rb create mode 100644 app/models/game_genre.rb create mode 100644 app/models/game_platform.rb delete mode 100644 app/models/gamegenre.rb delete mode 100644 app/models/gameplatform.rb rename app/models/{media.rb => video_genre.rb} (59%) rename app/models/{videogenre.rb => video_media.rb} (59%) create mode 100644 app/views/game_genre/_form.rhtml create mode 100644 app/views/game_genre/edit.rhtml create mode 100644 app/views/game_genre/list.rhtml rename app/views/{videogenre => game_genre}/new.rhtml (86%) create mode 100644 app/views/game_genre/show.rhtml create mode 100644 app/views/game_platform/_form.rhtml create mode 100644 app/views/game_platform/edit.rhtml create mode 100644 app/views/game_platform/list.rhtml rename app/views/{gameplatform => game_platform}/new.rhtml (85%) create mode 100644 app/views/game_platform/show.rhtml delete mode 100644 app/views/gamegenre/_form.rhtml delete mode 100644 app/views/gamegenre/edit.rhtml delete mode 100644 app/views/gamegenre/list.rhtml delete mode 100644 app/views/gamegenre/show.rhtml delete mode 100644 app/views/gameplatform/_form.rhtml delete mode 100644 app/views/gameplatform/edit.rhtml delete mode 100644 app/views/gameplatform/list.rhtml delete mode 100644 app/views/gameplatform/show.rhtml rename app/views/layouts/{gamegenre.rhtml => game_genre.rhtml} (87%) rename app/views/layouts/{gameplatform.rhtml => game_platform.rhtml} (87%) rename app/views/layouts/{media.rhtml => video_genre.rhtml} (87%) rename app/views/layouts/{videogenre.rhtml => video_media.rhtml} (87%) delete mode 100644 app/views/media/_form.rhtml delete mode 100644 app/views/media/edit.rhtml delete mode 100644 app/views/media/list.rhtml delete mode 100644 app/views/media/show.rhtml create mode 100644 app/views/video_genre/_form.rhtml create mode 100644 app/views/video_genre/edit.rhtml create mode 100644 app/views/video_genre/list.rhtml rename app/views/{media => video_genre}/new.rhtml (86%) create mode 100644 app/views/video_genre/show.rhtml create mode 100644 app/views/video_media/_form.rhtml create mode 100644 app/views/video_media/edit.rhtml create mode 100644 app/views/video_media/list.rhtml rename app/views/{gamegenre => video_media}/new.rhtml (86%) create mode 100644 app/views/video_media/show.rhtml delete mode 100644 app/views/videogenre/_form.rhtml delete mode 100644 app/views/videogenre/edit.rhtml delete mode 100644 app/views/videogenre/list.rhtml delete mode 100644 app/views/videogenre/show.rhtml create mode 100644 db/migrate/028_create_video_genres.rb create mode 100644 db/migrate/029_create_video_medias.rb create mode 100644 db/migrate/030_create_game_genres.rb create mode 100644 db/migrate/031_create_game_platforms.rb create mode 100644 db/migrate/032_fix_rentables.rb rename test/fixtures/{gamegenres.yml => game_genres.yml} (100%) rename test/fixtures/{gameplatforms.yml => game_platforms.yml} (100%) rename test/fixtures/{medias.yml => video_genres.yml} (100%) rename test/fixtures/{videogenres.yml => video_medias.yml} (100%) rename test/functional/{gamegenre_controller_test.rb => game_genre_controller_test.rb} (63%) rename test/functional/{gameplatform_controller_test.rb => game_platform_controller_test.rb} (62%) rename test/functional/{videogenre_controller_test.rb => video_genre_controller_test.rb} (63%) rename test/functional/{media_controller_test.rb => video_media_controller_test.rb} (63%) rename test/unit/{gamegenre_test.rb => game_genre_test.rb} (66%) rename test/unit/{gameplatform_test.rb => game_platform_test.rb} (64%) rename test/unit/{media_test.rb => video_genre_test.rb} (66%) rename test/unit/{videogenre_test.rb => video_media_test.rb} (66%) diff --git a/app/controllers/game_genre_controller.rb b/app/controllers/game_genre_controller.rb new file mode 100644 index 0000000..ef2b4e1 --- /dev/null +++ b/app/controllers/game_genre_controller.rb @@ -0,0 +1,51 @@ +class GameGenreController < ApplicationController + def index + list + render :action => 'list' + end + + # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) + verify :method => :post, :only => [ :destroy, :create, :update ], + :redirect_to => { :action => :list } + + def list + @game_genre_pages, @game_genres = paginate :game_genres, :per_page => 10 + end + + def show + @game_genre = GameGenre.find(params[:id]) + end + + def new + @game_genre = GameGenre.new + end + + def create + @game_genre = GameGenre.new(params[:game_genre]) + if @game_genre.save + flash[:notice] = 'GameGenre was successfully created.' + redirect_to :action => 'list' + else + render :action => 'new' + end + end + + def edit + @game_genre = GameGenre.find(params[:id]) + end + + def update + @game_genre = GameGenre.find(params[:id]) + if @game_genre.update_attributes(params[:game_genre]) + flash[:notice] = 'GameGenre was successfully updated.' + redirect_to :action => 'show', :id => @game_genre + else + render :action => 'edit' + end + end + + def destroy + GameGenre.find(params[:id]).destroy + redirect_to :action => 'list' + end +end diff --git a/app/controllers/game_platform_controller.rb b/app/controllers/game_platform_controller.rb new file mode 100644 index 0000000..155bf97 --- /dev/null +++ b/app/controllers/game_platform_controller.rb @@ -0,0 +1,51 @@ +class GamePlatformController < ApplicationController + def index + list + render :action => 'list' + end + + # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) + verify :method => :post, :only => [ :destroy, :create, :update ], + :redirect_to => { :action => :list } + + def list + @game_platform_pages, @game_platforms = paginate :game_platforms, :per_page => 10 + end + + def show + @game_platform = GamePlatform.find(params[:id]) + end + + def new + @game_platform = GamePlatform.new + end + + def create + @game_platform = GamePlatform.new(params[:game_platform]) + if @game_platform.save + flash[:notice] = 'GamePlatform was successfully created.' + redirect_to :action => 'list' + else + render :action => 'new' + end + end + + def edit + @game_platform = GamePlatform.find(params[:id]) + end + + def update + @game_platform = GamePlatform.find(params[:id]) + if @game_platform.update_attributes(params[:game_platform]) + flash[:notice] = 'GamePlatform was successfully updated.' + redirect_to :action => 'show', :id => @game_platform + else + render :action => 'edit' + end + end + + def destroy + GamePlatform.find(params[:id]).destroy + redirect_to :action => 'list' + end +end diff --git a/app/controllers/gamegenre_controller.rb b/app/controllers/gamegenre_controller.rb deleted file mode 100644 index e3005b1..0000000 --- a/app/controllers/gamegenre_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -class GamegenreController < ApplicationController - - # Make sure that a user logs in before doing any action here - before_filter :authorize - - def index - list - render :action => 'list' - end - - # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy, :create, :update ], - :redirect_to => { :action => :list } - - def list - @gamegenre_pages, @gamegenres = paginate :gamegenres, :per_page => 10 - end - - def show - @gamegenre = Gamegenre.find(params[:id]) - end - - def new - @gamegenre = Gamegenre.new - end - - def create - @gamegenre = Gamegenre.new(params[:gamegenre]) - if @gamegenre.save - flash[:notice] = 'Gamegenre was successfully created.' - redirect_to :action => 'list' - else - render :action => 'new' - end - end - - def edit - @gamegenre = Gamegenre.find(params[:id]) - end - - def update - @gamegenre = Gamegenre.find(params[:id]) - if @gamegenre.update_attributes(params[:gamegenre]) - flash[:notice] = 'Gamegenre was successfully updated.' - redirect_to :action => 'show', :id => @gamegenre - else - render :action => 'edit' - end - end - - def destroy - Gamegenre.find(params[:id]).destroy - redirect_to :action => 'list' - end -end diff --git a/app/controllers/gameplatform_controller.rb b/app/controllers/gameplatform_controller.rb deleted file mode 100644 index 4e009c8..0000000 --- a/app/controllers/gameplatform_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -class GameplatformController < ApplicationController - - # Make sure that a user logs in before doing any action here - before_filter :authorize - - def index - list - render :action => 'list' - end - - # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy, :create, :update ], - :redirect_to => { :action => :list } - - def list - @gameplatform_pages, @gameplatforms = paginate :gameplatforms, :per_page => 10 - end - - def show - @gameplatform = Gameplatform.find(params[:id]) - end - - def new - @gameplatform = Gameplatform.new - end - - def create - @gameplatform = Gameplatform.new(params[:gameplatform]) - if @gameplatform.save - flash[:notice] = 'Gameplatform was successfully created.' - redirect_to :action => 'list' - else - render :action => 'new' - end - end - - def edit - @gameplatform = Gameplatform.find(params[:id]) - end - - def update - @gameplatform = Gameplatform.find(params[:id]) - if @gameplatform.update_attributes(params[:gameplatform]) - flash[:notice] = 'Gameplatform was successfully updated.' - redirect_to :action => 'show', :id => @gameplatform - else - render :action => 'edit' - end - end - - def destroy - Gameplatform.find(params[:id]).destroy - redirect_to :action => 'list' - end -end diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb deleted file mode 100644 index be0c368..0000000 --- a/app/controllers/media_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -class MediaController < ApplicationController - - # Make sure that a user logs in before doing any action here - before_filter :authorize - - def index - list - render :action => 'list' - end - - # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy, :create, :update ], - :redirect_to => { :action => :list } - - def list - @media_pages, @medias = paginate :medias, :per_page => 10 - end - - def show - @media = Media.find(params[:id]) - end - - def new - @media = Media.new - end - - def create - @media = Media.new(params[:media]) - if @media.save - flash[:notice] = 'Media was successfully created.' - redirect_to :action => 'list' - else - render :action => 'new' - end - end - - def edit - @media = Media.find(params[:id]) - end - - def update - @media = Media.find(params[:id]) - if @media.update_attributes(params[:media]) - flash[:notice] = 'Media was successfully updated.' - redirect_to :action => 'show', :id => @media - else - render :action => 'edit' - end - end - - def destroy - Media.find(params[:id]).destroy - redirect_to :action => 'list' - end -end diff --git a/app/controllers/video_genre_controller.rb b/app/controllers/video_genre_controller.rb new file mode 100644 index 0000000..6fe0d8f --- /dev/null +++ b/app/controllers/video_genre_controller.rb @@ -0,0 +1,51 @@ +class VideoGenreController < ApplicationController + def index + list + render :action => 'list' + end + + # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) + verify :method => :post, :only => [ :destroy, :create, :update ], + :redirect_to => { :action => :list } + + def list + @video_genre_pages, @video_genres = paginate :video_genres, :per_page => 10 + end + + def show + @video_genre = VideoGenre.find(params[:id]) + end + + def new + @video_genre = VideoGenre.new + end + + def create + @video_genre = VideoGenre.new(params[:video_genre]) + if @video_genre.save + flash[:notice] = 'VideoGenre was successfully created.' + redirect_to :action => 'list' + else + render :action => 'new' + end + end + + def edit + @video_genre = VideoGenre.find(params[:id]) + end + + def update + @video_genre = VideoGenre.find(params[:id]) + if @video_genre.update_attributes(params[:video_genre]) + flash[:notice] = 'VideoGenre was successfully updated.' + redirect_to :action => 'show', :id => @video_genre + else + render :action => 'edit' + end + end + + def destroy + VideoGenre.find(params[:id]).destroy + redirect_to :action => 'list' + end +end diff --git a/app/controllers/video_media_controller.rb b/app/controllers/video_media_controller.rb new file mode 100644 index 0000000..3c75f06 --- /dev/null +++ b/app/controllers/video_media_controller.rb @@ -0,0 +1,51 @@ +class VideoMediaController < ApplicationController + def index + list + render :action => 'list' + end + + # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) + verify :method => :post, :only => [ :destroy, :create, :update ], + :redirect_to => { :action => :list } + + def list + @video_media_pages, @video_medias = paginate :video_medias, :per_page => 10 + end + + def show + @video_media = VideoMedia.find(params[:id]) + end + + def new + @video_media = VideoMedia.new + end + + def create + @video_media = VideoMedia.new(params[:video_media]) + if @video_media.save + flash[:notice] = 'VideoMedia was successfully created.' + redirect_to :action => 'list' + else + render :action => 'new' + end + end + + def edit + @video_media = VideoMedia.find(params[:id]) + end + + def update + @video_media = VideoMedia.find(params[:id]) + if @video_media.update_attributes(params[:video_media]) + flash[:notice] = 'VideoMedia was successfully updated.' + redirect_to :action => 'show', :id => @video_media + else + render :action => 'edit' + end + end + + def destroy + VideoMedia.find(params[:id]).destroy + redirect_to :action => 'list' + end +end diff --git a/app/controllers/videogenre_controller.rb b/app/controllers/videogenre_controller.rb deleted file mode 100644 index c0cef4f..0000000 --- a/app/controllers/videogenre_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -class VideogenreController < ApplicationController - - # Make sure that a user logs in before doing any action here - before_filter :authorize - - def index - list - render :action => 'list' - end - - # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy, :create, :update ], - :redirect_to => { :action => :list } - - def list - @videogenre_pages, @videogenres = paginate :videogenres, :per_page => 10 - end - - def show - @videogenre = Videogenre.find(params[:id]) - end - - def new - @videogenre = Videogenre.new - end - - def create - @videogenre = Videogenre.new(params[:videogenre]) - if @videogenre.save - flash[:notice] = 'Videogenre was successfully created.' - redirect_to :action => 'list' - else - render :action => 'new' - end - end - - def edit - @videogenre = Videogenre.find(params[:id]) - end - - def update - @videogenre = Videogenre.find(params[:id]) - if @videogenre.update_attributes(params[:videogenre]) - flash[:notice] = 'Videogenre was successfully updated.' - redirect_to :action => 'show', :id => @videogenre - else - render :action => 'edit' - end - end - - def destroy - Videogenre.find(params[:id]).destroy - redirect_to :action => 'list' - end -end diff --git a/app/helpers/game_genre_helper.rb b/app/helpers/game_genre_helper.rb new file mode 100644 index 0000000..321bfdb --- /dev/null +++ b/app/helpers/game_genre_helper.rb @@ -0,0 +1,2 @@ +module GameGenreHelper +end diff --git a/app/helpers/game_platform_helper.rb b/app/helpers/game_platform_helper.rb new file mode 100644 index 0000000..7e5adce --- /dev/null +++ b/app/helpers/game_platform_helper.rb @@ -0,0 +1,2 @@ +module GamePlatformHelper +end diff --git a/app/helpers/gamegenre_helper.rb b/app/helpers/gamegenre_helper.rb deleted file mode 100644 index d53499c..0000000 --- a/app/helpers/gamegenre_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module GamegenreHelper -end diff --git a/app/helpers/gameplatform_helper.rb b/app/helpers/gameplatform_helper.rb deleted file mode 100644 index a8bb6d0..0000000 --- a/app/helpers/gameplatform_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module GameplatformHelper -end diff --git a/app/helpers/media_helper.rb b/app/helpers/media_helper.rb deleted file mode 100644 index d08298b..0000000 --- a/app/helpers/media_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module MediaHelper -end diff --git a/app/helpers/video_genre_helper.rb b/app/helpers/video_genre_helper.rb new file mode 100644 index 0000000..f1e8a9a --- /dev/null +++ b/app/helpers/video_genre_helper.rb @@ -0,0 +1,2 @@ +module VideoGenreHelper +end diff --git a/app/helpers/video_media_helper.rb b/app/helpers/video_media_helper.rb new file mode 100644 index 0000000..d167258 --- /dev/null +++ b/app/helpers/video_media_helper.rb @@ -0,0 +1,2 @@ +module VideoMediaHelper +end diff --git a/app/helpers/videogenre_helper.rb b/app/helpers/videogenre_helper.rb deleted file mode 100644 index f369342..0000000 --- a/app/helpers/videogenre_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module VideogenreHelper -end diff --git a/app/models/game.rb b/app/models/game.rb index f2e627c..55639a7 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -1,16 +1,16 @@ class Game < Rentable - has_many :game_genres, :through => Gamegenre - has_many :gameplatforms, :through => Gameplatform + has_many :game_genres + has_many :game_platforms - validates_presence_of :game_genre - validates_presence_of :platform + validates_presence_of :game_genre_id + validates_presence_of :game_platform_id def genre - return Gamegenre.find(game_genre).name + GameGenre.find_by_id(game_genre_id) end - def game_platform - return Gameplatform.find(platform).name + def platform + GamePlatform.find_by_id(game_platform_id) end def calculated_price @@ -35,12 +35,4 @@ class Game < Rentable return Time.now.advance(:days => period).to_date end - def genre_name - Gamegenre.find_by_id(game_genre).name - end - - def platform_name - Gameplatform.find_by_id(platform).name - end - end diff --git a/app/models/game_genre.rb b/app/models/game_genre.rb new file mode 100644 index 0000000..8bcc2f3 --- /dev/null +++ b/app/models/game_genre.rb @@ -0,0 +1,3 @@ +class GameGenre < ActiveRecord::Base + belongs_to :game +end diff --git a/app/models/game_platform.rb b/app/models/game_platform.rb new file mode 100644 index 0000000..379684e --- /dev/null +++ b/app/models/game_platform.rb @@ -0,0 +1,3 @@ +class GamePlatform < ActiveRecord::Base + belongs_to :game +end diff --git a/app/models/gamegenre.rb b/app/models/gamegenre.rb deleted file mode 100644 index 37c1eff..0000000 --- a/app/models/gamegenre.rb +++ /dev/null @@ -1,3 +0,0 @@ -class Gamegenre < ActiveRecord::Base - belongs_to :game -end diff --git a/app/models/gameplatform.rb b/app/models/gameplatform.rb deleted file mode 100644 index c14fcf7..0000000 --- a/app/models/gameplatform.rb +++ /dev/null @@ -1,3 +0,0 @@ -class Gameplatform < ActiveRecord::Base - belongs_to :game -end diff --git a/app/models/video.rb b/app/models/video.rb index b20602a..7739aeb 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,17 +1,17 @@ class Video < Rentable has_many :video_genres - has_many :medias + has_many :video_medias validates_presence_of :director - validates_presence_of :video_genre - validates_presence_of :media + validates_presence_of :video_genre_id + validates_presence_of :video_media_id def genre - return Videogenre.find(video_genre).name + VideoGenre.find_by_id(video_genre_id) end - def media_name - return Media.find(media).name + def media + VideoMedia.find_by_id(video_media_id) end def calculated_price @@ -39,6 +39,6 @@ class Video < Rentable protected def validate errors.add(:video_genre, "does not exist in the database") if video_genre.nil? - errors.add(:media, "does not exist in the database") if media.nil? + errors.add(:video_media, "does not exist in the database") if video_media.nil? end end diff --git a/app/models/media.rb b/app/models/video_genre.rb similarity index 59% rename from app/models/media.rb rename to app/models/video_genre.rb index fc20733..d28062b 100644 --- a/app/models/media.rb +++ b/app/models/video_genre.rb @@ -1,4 +1,4 @@ -class Media < ActiveRecord::Base +class VideoGenre < ActiveRecord::Base belongs_to :video validates_presence_of :name diff --git a/app/models/videogenre.rb b/app/models/video_media.rb similarity index 59% rename from app/models/videogenre.rb rename to app/models/video_media.rb index 5182e33..3c24b02 100644 --- a/app/models/videogenre.rb +++ b/app/models/video_media.rb @@ -1,4 +1,4 @@ -class Videogenre < ActiveRecord::Base +class VideoMedia < ActiveRecord::Base belongs_to :video validates_presence_of :name diff --git a/app/views/game/_form.rhtml b/app/views/game/_form.rhtml index 69c3904..e74b713 100644 --- a/app/views/game/_form.rhtml +++ b/app/views/game/_form.rhtml @@ -7,10 +7,10 @@


<%= check_box 'game', 'newrelease' %>

-


-<%= select 'game', 'platform', Gameplatform.find(:all).collect {|c| [c.name.to_s, c.id] } %>

+


+<%= select 'game', 'game_platform_id', GamePlatform.find(:all).collect {|c| [c.name.to_s, c.id] } %>

-


-<%= select 'game', 'game_genre', Gamegenre.find(:all).collect {|c| [c.name.to_s, c.id] } %>

+


+<%= select 'game', 'game_genre_id', GameGenre.find(:all).collect {|c| [c.name.to_s, c.id] } %>

diff --git a/app/views/game/list.rhtml b/app/views/game/list.rhtml index a32c14d..4528322 100644 --- a/app/views/game/list.rhtml +++ b/app/views/game/list.rhtml @@ -16,8 +16,8 @@ <%=h game.title %> <%=h tf_to_yesno(game.checkedout?) %> <%=h tf_to_yesno(game.newrelease) %> - <%=h game.genre %> - <%=h game.game_platform %> + <%=h game.genre.name %> + <%=h game.platform.name %> <%= link_to 'View', :action => 'show', :id => game %> <%= link_to 'Edit', :action => 'edit', :id => game %> <%= link_to 'Remove', { :action => 'destroy', :id => game }, :confirm => 'Are you sure?', :method => :post %> diff --git a/app/views/game/searchresults.rhtml b/app/views/game/searchresults.rhtml index 203f4cc..b8c5d76 100644 --- a/app/views/game/searchresults.rhtml +++ b/app/views/game/searchresults.rhtml @@ -19,8 +19,8 @@ <%=h game.title %> <%=h tf_to_yesno(game.checkedout?) %> <%=h tf_to_yesno(game.newrelease) %> - <%=h game.genre %> - <%=h game.game_platform %> + <%=h game.genre.name %> + <%=h game.platform.name %> <%= link_to 'View', :action => 'show', :id => game %> <%= link_to 'Edit', :action => 'edit', :id => game %> <%= link_to 'Remove', { :action => 'destroy', :id => game }, :confirm => 'Are you sure?', :method => :post %> diff --git a/app/views/game/show.rhtml b/app/views/game/show.rhtml index e31791b..e7c5333 100644 --- a/app/views/game/show.rhtml +++ b/app/views/game/show.rhtml @@ -1,8 +1,8 @@

Game ID: <%=h @game.id.to_s %>

Title: <%=h @game.title %>

New Release: <%=h tf_to_yesno(@game.newrelease) %>

-

Genre: <%=h @game.genre_name %>

-

Platform: <%=h @game.platform_name %>

+

Genre: <%=h @game.genre.name %>

+

Platform: <%=h @game.platform.name %>

<%= link_to 'Edit', :action => 'edit', :id => @game %> | diff --git a/app/views/game_genre/_form.rhtml b/app/views/game_genre/_form.rhtml new file mode 100644 index 0000000..63713d6 --- /dev/null +++ b/app/views/game_genre/_form.rhtml @@ -0,0 +1,7 @@ +<%= error_messages_for 'game_genre' %> + + +


+<%= text_field 'game_genre', 'name' %>

+ + diff --git a/app/views/game_genre/edit.rhtml b/app/views/game_genre/edit.rhtml new file mode 100644 index 0000000..f539e97 --- /dev/null +++ b/app/views/game_genre/edit.rhtml @@ -0,0 +1,9 @@ +

Editing game_genre

+ +<% form_tag :action => 'update', :id => @game_genre do %> + <%= render :partial => 'form' %> + <%= submit_tag 'Edit' %> +<% end %> + +<%= link_to 'Show', :action => 'show', :id => @game_genre %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/game_genre/list.rhtml b/app/views/game_genre/list.rhtml new file mode 100644 index 0000000..83c005c --- /dev/null +++ b/app/views/game_genre/list.rhtml @@ -0,0 +1,27 @@ +

Listing game_genres

+ + + + <% for column in GameGenre.content_columns %> + + <% end %> + + +<% for game_genre in @game_genres %> + + <% for column in GameGenre.content_columns %> + + <% end %> + + + + +<% end %> +
<%= column.human_name %>
<%=h game_genre.send(column.name) %><%= link_to 'Show', :action => 'show', :id => game_genre %><%= link_to 'Edit', :action => 'edit', :id => game_genre %><%= link_to 'Destroy', { :action => 'destroy', :id => game_genre }, :confirm => 'Are you sure?', :method => :post %>
+ +<%= link_to 'Previous page', { :page => @game_genre_pages.current.previous } if @game_genre_pages.current.previous %> +<%= link_to 'Next page', { :page => @game_genre_pages.current.next } if @game_genre_pages.current.next %> + +
+ +<%= link_to 'New game_genre', :action => 'new' %> diff --git a/app/views/videogenre/new.rhtml b/app/views/game_genre/new.rhtml similarity index 86% rename from app/views/videogenre/new.rhtml rename to app/views/game_genre/new.rhtml index e842ea3..46de91d 100644 --- a/app/views/videogenre/new.rhtml +++ b/app/views/game_genre/new.rhtml @@ -1,4 +1,4 @@ -

New videogenre

+

New game_genre

<% form_tag :action => 'create' do %> <%= render :partial => 'form' %> diff --git a/app/views/game_genre/show.rhtml b/app/views/game_genre/show.rhtml new file mode 100644 index 0000000..5b05499 --- /dev/null +++ b/app/views/game_genre/show.rhtml @@ -0,0 +1,8 @@ +<% for column in GameGenre.content_columns %> +

+ <%= column.human_name %>: <%=h @game_genre.send(column.name) %> +

+<% end %> + +<%= link_to 'Edit', :action => 'edit', :id => @game_genre %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/game_platform/_form.rhtml b/app/views/game_platform/_form.rhtml new file mode 100644 index 0000000..1601bba --- /dev/null +++ b/app/views/game_platform/_form.rhtml @@ -0,0 +1,7 @@ +<%= error_messages_for 'game_platform' %> + + +


+<%= text_field 'game_platform', 'name' %>

+ + diff --git a/app/views/game_platform/edit.rhtml b/app/views/game_platform/edit.rhtml new file mode 100644 index 0000000..237e1d5 --- /dev/null +++ b/app/views/game_platform/edit.rhtml @@ -0,0 +1,9 @@ +

Editing game_platform

+ +<% form_tag :action => 'update', :id => @game_platform do %> + <%= render :partial => 'form' %> + <%= submit_tag 'Edit' %> +<% end %> + +<%= link_to 'Show', :action => 'show', :id => @game_platform %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/game_platform/list.rhtml b/app/views/game_platform/list.rhtml new file mode 100644 index 0000000..3206a36 --- /dev/null +++ b/app/views/game_platform/list.rhtml @@ -0,0 +1,27 @@ +

Listing game_platforms

+ + + + <% for column in GamePlatform.content_columns %> + + <% end %> + + +<% for game_platform in @game_platforms %> + + <% for column in GamePlatform.content_columns %> + + <% end %> + + + + +<% end %> +
<%= column.human_name %>
<%=h game_platform.send(column.name) %><%= link_to 'Show', :action => 'show', :id => game_platform %><%= link_to 'Edit', :action => 'edit', :id => game_platform %><%= link_to 'Destroy', { :action => 'destroy', :id => game_platform }, :confirm => 'Are you sure?', :method => :post %>
+ +<%= link_to 'Previous page', { :page => @game_platform_pages.current.previous } if @game_platform_pages.current.previous %> +<%= link_to 'Next page', { :page => @game_platform_pages.current.next } if @game_platform_pages.current.next %> + +
+ +<%= link_to 'New game_platform', :action => 'new' %> diff --git a/app/views/gameplatform/new.rhtml b/app/views/game_platform/new.rhtml similarity index 85% rename from app/views/gameplatform/new.rhtml rename to app/views/game_platform/new.rhtml index 7341fb4..fdc286d 100644 --- a/app/views/gameplatform/new.rhtml +++ b/app/views/game_platform/new.rhtml @@ -1,4 +1,4 @@ -

New gameplatform

+

New game_platform

<% form_tag :action => 'create' do %> <%= render :partial => 'form' %> diff --git a/app/views/game_platform/show.rhtml b/app/views/game_platform/show.rhtml new file mode 100644 index 0000000..72cd5d9 --- /dev/null +++ b/app/views/game_platform/show.rhtml @@ -0,0 +1,8 @@ +<% for column in GamePlatform.content_columns %> +

+ <%= column.human_name %>: <%=h @game_platform.send(column.name) %> +

+<% end %> + +<%= link_to 'Edit', :action => 'edit', :id => @game_platform %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/gamegenre/_form.rhtml b/app/views/gamegenre/_form.rhtml deleted file mode 100644 index 9378e76..0000000 --- a/app/views/gamegenre/_form.rhtml +++ /dev/null @@ -1,7 +0,0 @@ -<%= error_messages_for 'gamegenre' %> - - -


-<%= text_field 'gamegenre', 'name' %>

- - diff --git a/app/views/gamegenre/edit.rhtml b/app/views/gamegenre/edit.rhtml deleted file mode 100644 index e5246a9..0000000 --- a/app/views/gamegenre/edit.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -

Editing gamegenre

- -<% form_tag :action => 'update', :id => @gamegenre do %> - <%= render :partial => 'form' %> - <%= submit_tag 'Edit' %> -<% end %> - -<%= link_to 'Show', :action => 'show', :id => @gamegenre %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/gamegenre/list.rhtml b/app/views/gamegenre/list.rhtml deleted file mode 100644 index 21e0ea3..0000000 --- a/app/views/gamegenre/list.rhtml +++ /dev/null @@ -1,27 +0,0 @@ -

Listing gamegenres

- - - - <% for column in Gamegenre.content_columns %> - - <% end %> - - -<% for gamegenre in @gamegenres %> - - <% for column in Gamegenre.content_columns %> - - <% end %> - - - - -<% end %> -
<%= column.human_name %>
<%=h gamegenre.send(column.name) %><%= link_to 'Show', :action => 'show', :id => gamegenre %><%= link_to 'Edit', :action => 'edit', :id => gamegenre %><%= link_to 'Destroy', { :action => 'destroy', :id => gamegenre }, :confirm => 'Are you sure?', :method => :post %>
- -<%= link_to 'Previous page', { :page => @gamegenre_pages.current.previous } if @gamegenre_pages.current.previous %> -<%= link_to 'Next page', { :page => @gamegenre_pages.current.next } if @gamegenre_pages.current.next %> - -
- -<%= link_to 'New gamegenre', :action => 'new' %> diff --git a/app/views/gamegenre/show.rhtml b/app/views/gamegenre/show.rhtml deleted file mode 100644 index 417f406..0000000 --- a/app/views/gamegenre/show.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -<% for column in Gamegenre.content_columns %> -

- <%= column.human_name %>: <%=h @gamegenre.send(column.name) %> -

-<% end %> - -<%= link_to 'Edit', :action => 'edit', :id => @gamegenre %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/gameplatform/_form.rhtml b/app/views/gameplatform/_form.rhtml deleted file mode 100644 index 7ea8d9b..0000000 --- a/app/views/gameplatform/_form.rhtml +++ /dev/null @@ -1,7 +0,0 @@ -<%= error_messages_for 'gameplatform' %> - - -


-<%= text_field 'gameplatform', 'name' %>

- - diff --git a/app/views/gameplatform/edit.rhtml b/app/views/gameplatform/edit.rhtml deleted file mode 100644 index 5eb3cbd..0000000 --- a/app/views/gameplatform/edit.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -

Editing gameplatform

- -<% form_tag :action => 'update', :id => @gameplatform do %> - <%= render :partial => 'form' %> - <%= submit_tag 'Edit' %> -<% end %> - -<%= link_to 'Show', :action => 'show', :id => @gameplatform %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/gameplatform/list.rhtml b/app/views/gameplatform/list.rhtml deleted file mode 100644 index e2be35d..0000000 --- a/app/views/gameplatform/list.rhtml +++ /dev/null @@ -1,27 +0,0 @@ -

Listing gameplatforms

- - - - <% for column in Gameplatform.content_columns %> - - <% end %> - - -<% for gameplatform in @gameplatforms %> - - <% for column in Gameplatform.content_columns %> - - <% end %> - - - - -<% end %> -
<%= column.human_name %>
<%=h gameplatform.send(column.name) %><%= link_to 'Show', :action => 'show', :id => gameplatform %><%= link_to 'Edit', :action => 'edit', :id => gameplatform %><%= link_to 'Destroy', { :action => 'destroy', :id => gameplatform }, :confirm => 'Are you sure?', :method => :post %>
- -<%= link_to 'Previous page', { :page => @gameplatform_pages.current.previous } if @gameplatform_pages.current.previous %> -<%= link_to 'Next page', { :page => @gameplatform_pages.current.next } if @gameplatform_pages.current.next %> - -
- -<%= link_to 'New gameplatform', :action => 'new' %> diff --git a/app/views/gameplatform/show.rhtml b/app/views/gameplatform/show.rhtml deleted file mode 100644 index 12b8ce5..0000000 --- a/app/views/gameplatform/show.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -<% for column in Gameplatform.content_columns %> -

- <%= column.human_name %>: <%=h @gameplatform.send(column.name) %> -

-<% end %> - -<%= link_to 'Edit', :action => 'edit', :id => @gameplatform %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/layouts/gamegenre.rhtml b/app/views/layouts/game_genre.rhtml similarity index 87% rename from app/views/layouts/gamegenre.rhtml rename to app/views/layouts/game_genre.rhtml index ab082d2..29a36ae 100644 --- a/app/views/layouts/gamegenre.rhtml +++ b/app/views/layouts/game_genre.rhtml @@ -4,7 +4,7 @@ - Gamegenre: <%= controller.action_name %> + GameGenre: <%= controller.action_name %> <%= stylesheet_link_tag 'scaffold' %> diff --git a/app/views/layouts/gameplatform.rhtml b/app/views/layouts/game_platform.rhtml similarity index 87% rename from app/views/layouts/gameplatform.rhtml rename to app/views/layouts/game_platform.rhtml index 8abc654..ebeb521 100644 --- a/app/views/layouts/gameplatform.rhtml +++ b/app/views/layouts/game_platform.rhtml @@ -4,7 +4,7 @@ - Gameplatform: <%= controller.action_name %> + GamePlatform: <%= controller.action_name %> <%= stylesheet_link_tag 'scaffold' %> diff --git a/app/views/layouts/media.rhtml b/app/views/layouts/video_genre.rhtml similarity index 87% rename from app/views/layouts/media.rhtml rename to app/views/layouts/video_genre.rhtml index 6fefa03..ce9a7f1 100644 --- a/app/views/layouts/media.rhtml +++ b/app/views/layouts/video_genre.rhtml @@ -4,7 +4,7 @@ - Media: <%= controller.action_name %> + VideoGenre: <%= controller.action_name %> <%= stylesheet_link_tag 'scaffold' %> diff --git a/app/views/layouts/videogenre.rhtml b/app/views/layouts/video_media.rhtml similarity index 87% rename from app/views/layouts/videogenre.rhtml rename to app/views/layouts/video_media.rhtml index ede979e..fd5434b 100644 --- a/app/views/layouts/videogenre.rhtml +++ b/app/views/layouts/video_media.rhtml @@ -4,7 +4,7 @@ - Videogenre: <%= controller.action_name %> + VideoMedia: <%= controller.action_name %> <%= stylesheet_link_tag 'scaffold' %> diff --git a/app/views/media/_form.rhtml b/app/views/media/_form.rhtml deleted file mode 100644 index d29cadb..0000000 --- a/app/views/media/_form.rhtml +++ /dev/null @@ -1,7 +0,0 @@ -<%= error_messages_for 'media' %> - - -


-<%= text_field 'media', 'name' %>

- - diff --git a/app/views/media/edit.rhtml b/app/views/media/edit.rhtml deleted file mode 100644 index 6a99fbc..0000000 --- a/app/views/media/edit.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -

Editing media

- -<% form_tag :action => 'update', :id => @media do %> - <%= render :partial => 'form' %> - <%= submit_tag 'Edit' %> -<% end %> - -<%= link_to 'Show', :action => 'show', :id => @media %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/media/list.rhtml b/app/views/media/list.rhtml deleted file mode 100644 index 020d74f..0000000 --- a/app/views/media/list.rhtml +++ /dev/null @@ -1,27 +0,0 @@ -

Listing medias

- - - - <% for column in Media.content_columns %> - - <% end %> - - -<% for media in @medias %> - - <% for column in Media.content_columns %> - - <% end %> - - - - -<% end %> -
<%= column.human_name %>
<%=h media.send(column.name) %><%= link_to 'Show', :action => 'show', :id => media %><%= link_to 'Edit', :action => 'edit', :id => media %><%= link_to 'Destroy', { :action => 'destroy', :id => media }, :confirm => 'Are you sure?', :method => :post %>
- -<%= link_to 'Previous page', { :page => @media_pages.current.previous } if @media_pages.current.previous %> -<%= link_to 'Next page', { :page => @media_pages.current.next } if @media_pages.current.next %> - -
- -<%= link_to 'New media', :action => 'new' %> diff --git a/app/views/media/show.rhtml b/app/views/media/show.rhtml deleted file mode 100644 index 695e6b0..0000000 --- a/app/views/media/show.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -<% for column in Media.content_columns %> -

- <%= column.human_name %>: <%=h @media.send(column.name) %> -

-<% end %> - -<%= link_to 'Edit', :action => 'edit', :id => @media %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/video/_form.rhtml b/app/views/video/_form.rhtml index 51b9628..91a9e4b 100644 --- a/app/views/video/_form.rhtml +++ b/app/views/video/_form.rhtml @@ -7,13 +7,13 @@


<%= check_box 'video', 'newrelease' %>

-


-<%= select 'video', 'video_genre', Videogenre.find(:all).collect {|c| [c.name.to_s, c.id] } %>

+


+<%= select 'video', 'video_genre_id', VideoGenre.find(:all).collect {|c| [c.name.to_s, c.id] } %>


<%= text_field 'video', 'director' %>

-


-<%= select 'video', 'media', Media.find(:all).collect {|c| [c.name.to_s, c.id] } %>

+


+<%= select 'video', 'video_media_id', VideoMedia.find(:all).collect {|c| [c.name.to_s, c.id] } %>

diff --git a/app/views/video/list.rhtml b/app/views/video/list.rhtml index 113ee97..198eeb1 100644 --- a/app/views/video/list.rhtml +++ b/app/views/video/list.rhtml @@ -17,9 +17,9 @@ <%=h video.title %> <%=h tf_to_yesno(video.checkedout?) %> <%=h tf_to_yesno(video.newrelease) %> - <%=h video.genre %> + <%=h video.genre.name %> <%=h video.director %> - <%=h video.media_name %> + <%=h video.media.name %> <%= link_to 'View', :action => 'show', :id => video %> <%= link_to 'Edit', :action => 'edit', :id => video %> <%= link_to 'Remove', { :action => 'destroy', :id => video }, :confirm => 'Are you sure?', :method => :post %> diff --git a/app/views/video/searchresults.rhtml b/app/views/video/searchresults.rhtml index eae7d23..587ddf7 100644 --- a/app/views/video/searchresults.rhtml +++ b/app/views/video/searchresults.rhtml @@ -20,9 +20,9 @@ <%=h video.title %> <%=h tf_to_yesno(video.checkedout?) %> <%=h tf_to_yesno(video.newrelease) %> - <%=h video.genre %> + <%=h video.genre.name %> <%=h video.director %> - <%=h video.media_name %> + <%=h video.media.name %> <%= link_to 'View', :action => 'show', :id => video %> <%= link_to 'Edit', :action => 'edit', :id => video %> <%= link_to 'Remove', { :action => 'destroy', :id => video }, :confirm => 'Are you sure?', :post => true %> diff --git a/app/views/video/show.rhtml b/app/views/video/show.rhtml index 631ec4b..d20135a 100644 --- a/app/views/video/show.rhtml +++ b/app/views/video/show.rhtml @@ -1,9 +1,9 @@

Video ID: <%=h @video.id.to_s %>

Title: <%=h @video.title %>

New Release: <%=h tf_to_yesno(@video.newrelease) %>

-

Genre: <%=h @video.genre %>

+

Genre: <%=h @video.genre.name %>

Director: <%=h @video.director %>

-

Media: <%=h @video.media_name %>

+

Media: <%=h @video.media.name %>

<%= link_to 'Edit', :action => 'edit', :id => @video %> | <%= link_to 'Back', :action => 'list' %> diff --git a/app/views/video_genre/_form.rhtml b/app/views/video_genre/_form.rhtml new file mode 100644 index 0000000..92b3dfd --- /dev/null +++ b/app/views/video_genre/_form.rhtml @@ -0,0 +1,7 @@ +<%= error_messages_for 'video_genre' %> + + +


+<%= text_field 'video_genre', 'name' %>

+ + diff --git a/app/views/video_genre/edit.rhtml b/app/views/video_genre/edit.rhtml new file mode 100644 index 0000000..9d45a13 --- /dev/null +++ b/app/views/video_genre/edit.rhtml @@ -0,0 +1,9 @@ +

Editing video_genre

+ +<% form_tag :action => 'update', :id => @video_genre do %> + <%= render :partial => 'form' %> + <%= submit_tag 'Edit' %> +<% end %> + +<%= link_to 'Show', :action => 'show', :id => @video_genre %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/video_genre/list.rhtml b/app/views/video_genre/list.rhtml new file mode 100644 index 0000000..2e64727 --- /dev/null +++ b/app/views/video_genre/list.rhtml @@ -0,0 +1,27 @@ +

Listing video_genres

+ + + + <% for column in VideoGenre.content_columns %> + + <% end %> + + +<% for video_genre in @video_genres %> + + <% for column in VideoGenre.content_columns %> + + <% end %> + + + + +<% end %> +
<%= column.human_name %>
<%=h video_genre.send(column.name) %><%= link_to 'Show', :action => 'show', :id => video_genre %><%= link_to 'Edit', :action => 'edit', :id => video_genre %><%= link_to 'Destroy', { :action => 'destroy', :id => video_genre }, :confirm => 'Are you sure?', :method => :post %>
+ +<%= link_to 'Previous page', { :page => @video_genre_pages.current.previous } if @video_genre_pages.current.previous %> +<%= link_to 'Next page', { :page => @video_genre_pages.current.next } if @video_genre_pages.current.next %> + +
+ +<%= link_to 'New video_genre', :action => 'new' %> diff --git a/app/views/media/new.rhtml b/app/views/video_genre/new.rhtml similarity index 86% rename from app/views/media/new.rhtml rename to app/views/video_genre/new.rhtml index ee6bf50..8624080 100644 --- a/app/views/media/new.rhtml +++ b/app/views/video_genre/new.rhtml @@ -1,4 +1,4 @@ -

New media

+

New video_genre

<% form_tag :action => 'create' do %> <%= render :partial => 'form' %> diff --git a/app/views/video_genre/show.rhtml b/app/views/video_genre/show.rhtml new file mode 100644 index 0000000..cab19df --- /dev/null +++ b/app/views/video_genre/show.rhtml @@ -0,0 +1,8 @@ +<% for column in VideoGenre.content_columns %> +

+ <%= column.human_name %>: <%=h @video_genre.send(column.name) %> +

+<% end %> + +<%= link_to 'Edit', :action => 'edit', :id => @video_genre %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/video_media/_form.rhtml b/app/views/video_media/_form.rhtml new file mode 100644 index 0000000..fe6cc56 --- /dev/null +++ b/app/views/video_media/_form.rhtml @@ -0,0 +1,7 @@ +<%= error_messages_for 'video_media' %> + + +


+<%= text_field 'video_media', 'name' %>

+ + diff --git a/app/views/video_media/edit.rhtml b/app/views/video_media/edit.rhtml new file mode 100644 index 0000000..f7bb5d1 --- /dev/null +++ b/app/views/video_media/edit.rhtml @@ -0,0 +1,9 @@ +

Editing video_media

+ +<% form_tag :action => 'update', :id => @video_media do %> + <%= render :partial => 'form' %> + <%= submit_tag 'Edit' %> +<% end %> + +<%= link_to 'Show', :action => 'show', :id => @video_media %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/video_media/list.rhtml b/app/views/video_media/list.rhtml new file mode 100644 index 0000000..90ca633 --- /dev/null +++ b/app/views/video_media/list.rhtml @@ -0,0 +1,27 @@ +

Listing video_medias

+ + + + <% for column in VideoMedia.content_columns %> + + <% end %> + + +<% for video_media in @video_medias %> + + <% for column in VideoMedia.content_columns %> + + <% end %> + + + + +<% end %> +
<%= column.human_name %>
<%=h video_media.send(column.name) %><%= link_to 'Show', :action => 'show', :id => video_media %><%= link_to 'Edit', :action => 'edit', :id => video_media %><%= link_to 'Destroy', { :action => 'destroy', :id => video_media }, :confirm => 'Are you sure?', :method => :post %>
+ +<%= link_to 'Previous page', { :page => @video_media_pages.current.previous } if @video_media_pages.current.previous %> +<%= link_to 'Next page', { :page => @video_media_pages.current.next } if @video_media_pages.current.next %> + +
+ +<%= link_to 'New video_media', :action => 'new' %> diff --git a/app/views/gamegenre/new.rhtml b/app/views/video_media/new.rhtml similarity index 86% rename from app/views/gamegenre/new.rhtml rename to app/views/video_media/new.rhtml index 98a943f..8df951f 100644 --- a/app/views/gamegenre/new.rhtml +++ b/app/views/video_media/new.rhtml @@ -1,4 +1,4 @@ -

New gamegenre

+

New video_media

<% form_tag :action => 'create' do %> <%= render :partial => 'form' %> diff --git a/app/views/video_media/show.rhtml b/app/views/video_media/show.rhtml new file mode 100644 index 0000000..05d3c2b --- /dev/null +++ b/app/views/video_media/show.rhtml @@ -0,0 +1,8 @@ +<% for column in VideoMedia.content_columns %> +

+ <%= column.human_name %>: <%=h @video_media.send(column.name) %> +

+<% end %> + +<%= link_to 'Edit', :action => 'edit', :id => @video_media %> | +<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/videogenre/_form.rhtml b/app/views/videogenre/_form.rhtml deleted file mode 100644 index 4082225..0000000 --- a/app/views/videogenre/_form.rhtml +++ /dev/null @@ -1,7 +0,0 @@ -<%= error_messages_for 'videogenre' %> - - -


-<%= text_field 'videogenre', 'name' %>

- - diff --git a/app/views/videogenre/edit.rhtml b/app/views/videogenre/edit.rhtml deleted file mode 100644 index b281524..0000000 --- a/app/views/videogenre/edit.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -

Editing videogenre

- -<% form_tag :action => 'update', :id => @videogenre do %> - <%= render :partial => 'form' %> - <%= submit_tag 'Edit' %> -<% end %> - -<%= link_to 'Show', :action => 'show', :id => @videogenre %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/app/views/videogenre/list.rhtml b/app/views/videogenre/list.rhtml deleted file mode 100644 index 1ef4849..0000000 --- a/app/views/videogenre/list.rhtml +++ /dev/null @@ -1,27 +0,0 @@ -

Listing videogenres

- - - - <% for column in Videogenre.content_columns %> - - <% end %> - - -<% for videogenre in @videogenres %> - - <% for column in Videogenre.content_columns %> - - <% end %> - - - - -<% end %> -
<%= column.human_name %>
<%=h videogenre.send(column.name) %><%= link_to 'Show', :action => 'show', :id => videogenre %><%= link_to 'Edit', :action => 'edit', :id => videogenre %><%= link_to 'Destroy', { :action => 'destroy', :id => videogenre }, :confirm => 'Are you sure?', :method => :post %>
- -<%= link_to 'Previous page', { :page => @videogenre_pages.current.previous } if @videogenre_pages.current.previous %> -<%= link_to 'Next page', { :page => @videogenre_pages.current.next } if @videogenre_pages.current.next %> - -
- -<%= link_to 'New videogenre', :action => 'new' %> diff --git a/app/views/videogenre/show.rhtml b/app/views/videogenre/show.rhtml deleted file mode 100644 index 9df8b32..0000000 --- a/app/views/videogenre/show.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -<% for column in Videogenre.content_columns %> -

- <%= column.human_name %>: <%=h @videogenre.send(column.name) %> -

-<% end %> - -<%= link_to 'Edit', :action => 'edit', :id => @videogenre %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/db/development.sqlite3 b/db/development.sqlite3 index 332cbaf3fbf99a24fc7624f3817a64ce94f7c18d..9fcfb9958539d71bb59fb722468e46b2a791ff1d 100644 GIT binary patch delta 1129 zcmZuwO>7fK6rMM;V3ShT<|lSz(oF1F#EK)8rdC>|D0Q6_RdOm3Y#^`ZsJ$ZUrzyKwPk$NG$d>QzC(p?<@|bKj!&;4mdwZ4d!^3Jj5K`OzU_*ON zfHs0~FigUTpgRcNfg!AuFu7j$ZZy9+Hi3Q3NAkzWst+piNW9dDLQq!+4PpplP=;-i z+4MdDIg+^DjGYYO#*lU}h;a_#9Eomv<5-T2-IinL{@=KuHMP%9gaQxHpQwgr>e-n5 zdFmHAGxc3_eEQZQ9mf%dQwUCxA^+R-MnT5T|EsPBEdMGl`!)O|GsSDNSh#mo9sEU< z1(ZdV1)Jf}7TNe*`%Sx~#dY)&kv!?c|KS_>S6stIoWZ^D6#fPeW?=-qtb2FY(nCEc zlF}gw2%WPG?wocE>XD~sHwxkaZ2$%JC}>yYTMb56O;Y{M~OhKVJb z=T(;r7>z4hQiqWat+2@H6t6Jha>Mnhu4U7+^Nv`n@+yZf1{Hr)hlvjVTifKqW+j?6 zO=gLz30d0^yhiiv3RU;fY>C-)hAlycs?Yq)63kjScksW;xDi=-$SP5u9TQ-I-=akPzfn-e_tSy zN`ZIUWpgFo#jAFoKF-ZfXA9G`ko`J8O}k@sI4+lqlan5b1R}{Kc)6C`j;^XZabK6z zyNEnb(f74lEx*-jX>YD$7hs&5ut{%_~Zse85vW+G5jk}EwiHx;f(lA|Ceu_P_OC>JOv#;Tde0d(dR@f$$_E{On&~8pD8KI`}v0`_=WoT03DN( zSORn?h*W@yYEG6`yt+w+g@+3mTnvoTObN`|8yk5UH-AtRV4Cb~baj#h%Vri6bpdu? zhJOr48D>v(l%D+3#c#5&%bd;TuBZ4wVb01B%D`mIEX}x`(U2i@Vx#k9mGC<(jm)C# zlNW_Gu~dlwJ)jm=FACc$) diff --git a/db/migrate/028_create_video_genres.rb b/db/migrate/028_create_video_genres.rb new file mode 100644 index 0000000..ba80f5f --- /dev/null +++ b/db/migrate/028_create_video_genres.rb @@ -0,0 +1,11 @@ +class CreateVideoGenres < ActiveRecord::Migration + def self.up + create_table :video_genres do |t| + t.column :name, :string, :null => false + end + end + + def self.down + drop_table :video_genres + end +end diff --git a/db/migrate/029_create_video_medias.rb b/db/migrate/029_create_video_medias.rb new file mode 100644 index 0000000..6ed0b50 --- /dev/null +++ b/db/migrate/029_create_video_medias.rb @@ -0,0 +1,11 @@ +class CreateVideoMedias < ActiveRecord::Migration + def self.up + create_table :video_medias do |t| + t.column :name, :string, :null => false + end + end + + def self.down + drop_table :video_medias + end +end diff --git a/db/migrate/030_create_game_genres.rb b/db/migrate/030_create_game_genres.rb new file mode 100644 index 0000000..b50f4f2 --- /dev/null +++ b/db/migrate/030_create_game_genres.rb @@ -0,0 +1,11 @@ +class CreateGameGenres < ActiveRecord::Migration + def self.up + create_table :game_genres do |t| + t.column :name, :string, :null => false + end + end + + def self.down + drop_table :game_genres + end +end diff --git a/db/migrate/031_create_game_platforms.rb b/db/migrate/031_create_game_platforms.rb new file mode 100644 index 0000000..e854637 --- /dev/null +++ b/db/migrate/031_create_game_platforms.rb @@ -0,0 +1,11 @@ +class CreateGamePlatforms < ActiveRecord::Migration + def self.up + create_table :game_platforms do |t| + t.column :name, :string, :null => false + end + end + + def self.down + drop_table :game_platforms + end +end diff --git a/db/migrate/032_fix_rentables.rb b/db/migrate/032_fix_rentables.rb new file mode 100644 index 0000000..b0e45ed --- /dev/null +++ b/db/migrate/032_fix_rentables.rb @@ -0,0 +1,12 @@ +class FixRentables < ActiveRecord::Migration + def self.up + drop_table :gamegenres + drop_table :medias + drop_table :gameplatforms + drop_table :videogenres + end + + def self.down + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/db/schema.rb b/db/schema.rb index f9d22a0..45c829e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2,7 +2,7 @@ # migrations feature of ActiveRecord to incrementally modify your database, and # then regenerate this schema definition. -ActiveRecord::Schema.define(:version => 27) do +ActiveRecord::Schema.define(:version => 32) do create_table "coitems", :force => true do |t| t.column "customer_id", :integer @@ -19,23 +19,19 @@ ActiveRecord::Schema.define(:version => 27) do t.column "debt", :decimal, :default => 0.0 end - create_table "game_policies", :force => true do |t| - t.column "day", :integer, :null => false - t.column "fee", :decimal, :precision => 8, :scale => 2, :null => false - t.column "period", :integer - t.column "description", :string - end - - create_table "gamegenres", :force => true do |t| + create_table "game_genres", :force => true do |t| t.column "name", :string, :null => false end - create_table "gameplatforms", :force => true do |t| + create_table "game_platforms", :force => true do |t| t.column "name", :string, :null => false end - create_table "medias", :force => true do |t| - t.column "name", :string, :null => false + create_table "game_policies", :force => true do |t| + t.column "day", :integer, :null => false + t.column "fee", :decimal, :precision => 8, :scale => 2, :null => false + t.column "period", :integer + t.column "description", :string end create_table "merchandise_purchases", :force => true do |t| @@ -64,14 +60,14 @@ ActiveRecord::Schema.define(:version => 27) do end create_table "rentables", :force => true do |t| - t.column "type", :string - t.column "title", :string - t.column "newrelease", :boolean, :default => false - t.column "video_genre", :integer - t.column "director", :string - t.column "media", :integer - t.column "game_genre", :integer - t.column "platform", :integer + t.column "type", :string + t.column "title", :string + t.column "newrelease", :boolean + t.column "video_genre_id", :integer + t.column "director", :string + t.column "video_media_id", :integer + t.column "game_genre_id", :integer + t.column "game_platform_id", :integer end # Could not dump table "sqlite_sequence" because of following StandardError @@ -84,6 +80,14 @@ ActiveRecord::Schema.define(:version => 27) do t.column "manager", :boolean, :default => false end + create_table "video_genres", :force => true do |t| + t.column "name", :string, :null => false + end + + create_table "video_medias", :force => true do |t| + t.column "name", :string, :null => false + end + create_table "video_policies", :force => true do |t| t.column "day", :integer, :null => false t.column "fee", :decimal, :precision => 8, :scale => 2, :null => false @@ -91,8 +95,4 @@ ActiveRecord::Schema.define(:version => 27) do t.column "description", :string end - create_table "videogenres", :force => true do |t| - t.column "name", :string, :null => false - end - end diff --git a/test/fixtures/gamegenres.yml b/test/fixtures/game_genres.yml similarity index 100% rename from test/fixtures/gamegenres.yml rename to test/fixtures/game_genres.yml diff --git a/test/fixtures/gameplatforms.yml b/test/fixtures/game_platforms.yml similarity index 100% rename from test/fixtures/gameplatforms.yml rename to test/fixtures/game_platforms.yml diff --git a/test/fixtures/medias.yml b/test/fixtures/video_genres.yml similarity index 100% rename from test/fixtures/medias.yml rename to test/fixtures/video_genres.yml diff --git a/test/fixtures/videogenres.yml b/test/fixtures/video_medias.yml similarity index 100% rename from test/fixtures/videogenres.yml rename to test/fixtures/video_medias.yml diff --git a/test/functional/gamegenre_controller_test.rb b/test/functional/game_genre_controller_test.rb similarity index 63% rename from test/functional/gamegenre_controller_test.rb rename to test/functional/game_genre_controller_test.rb index aa660e6..88138c1 100644 --- a/test/functional/gamegenre_controller_test.rb +++ b/test/functional/game_genre_controller_test.rb @@ -1,18 +1,18 @@ require File.dirname(__FILE__) + '/../test_helper' -require 'gamegenre_controller' +require 'game_genre_controller' # Re-raise errors caught by the controller. -class GamegenreController; def rescue_action(e) raise e end; end +class GameGenreController; def rescue_action(e) raise e end; end -class GamegenreControllerTest < Test::Unit::TestCase - fixtures :gamegenres +class GameGenreControllerTest < Test::Unit::TestCase + fixtures :game_genres def setup - @controller = GamegenreController.new + @controller = GameGenreController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @first_id = gamegenres(:first).id + @first_id = game_genres(:first).id end def test_index @@ -27,7 +27,7 @@ class GamegenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'list' - assert_not_nil assigns(:gamegenres) + assert_not_nil assigns(:game_genres) end def test_show @@ -36,8 +36,8 @@ class GamegenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'show' - assert_not_nil assigns(:gamegenre) - assert assigns(:gamegenre).valid? + assert_not_nil assigns(:game_genre) + assert assigns(:game_genre).valid? end def test_new @@ -46,18 +46,18 @@ class GamegenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'new' - assert_not_nil assigns(:gamegenre) + assert_not_nil assigns(:game_genre) end def test_create - num_gamegenres = Gamegenre.count + num_game_genres = GameGenre.count - post :create, :gamegenre => {} + post :create, :game_genre => {} assert_response :redirect assert_redirected_to :action => 'list' - assert_equal num_gamegenres + 1, Gamegenre.count + assert_equal num_game_genres + 1, GameGenre.count end def test_edit @@ -66,8 +66,8 @@ class GamegenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'edit' - assert_not_nil assigns(:gamegenre) - assert assigns(:gamegenre).valid? + assert_not_nil assigns(:game_genre) + assert assigns(:game_genre).valid? end def test_update @@ -78,7 +78,7 @@ class GamegenreControllerTest < Test::Unit::TestCase def test_destroy assert_nothing_raised { - Gamegenre.find(@first_id) + GameGenre.find(@first_id) } post :destroy, :id => @first_id @@ -86,7 +86,7 @@ class GamegenreControllerTest < Test::Unit::TestCase assert_redirected_to :action => 'list' assert_raise(ActiveRecord::RecordNotFound) { - Gamegenre.find(@first_id) + GameGenre.find(@first_id) } end end diff --git a/test/functional/gameplatform_controller_test.rb b/test/functional/game_platform_controller_test.rb similarity index 62% rename from test/functional/gameplatform_controller_test.rb rename to test/functional/game_platform_controller_test.rb index f170664..8726593 100644 --- a/test/functional/gameplatform_controller_test.rb +++ b/test/functional/game_platform_controller_test.rb @@ -1,18 +1,18 @@ require File.dirname(__FILE__) + '/../test_helper' -require 'gameplatform_controller' +require 'game_platform_controller' # Re-raise errors caught by the controller. -class GameplatformController; def rescue_action(e) raise e end; end +class GamePlatformController; def rescue_action(e) raise e end; end -class GameplatformControllerTest < Test::Unit::TestCase - fixtures :gameplatforms +class GamePlatformControllerTest < Test::Unit::TestCase + fixtures :game_platforms def setup - @controller = GameplatformController.new + @controller = GamePlatformController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @first_id = gameplatforms(:first).id + @first_id = game_platforms(:first).id end def test_index @@ -27,7 +27,7 @@ class GameplatformControllerTest < Test::Unit::TestCase assert_response :success assert_template 'list' - assert_not_nil assigns(:gameplatforms) + assert_not_nil assigns(:game_platforms) end def test_show @@ -36,8 +36,8 @@ class GameplatformControllerTest < Test::Unit::TestCase assert_response :success assert_template 'show' - assert_not_nil assigns(:gameplatform) - assert assigns(:gameplatform).valid? + assert_not_nil assigns(:game_platform) + assert assigns(:game_platform).valid? end def test_new @@ -46,18 +46,18 @@ class GameplatformControllerTest < Test::Unit::TestCase assert_response :success assert_template 'new' - assert_not_nil assigns(:gameplatform) + assert_not_nil assigns(:game_platform) end def test_create - num_gameplatforms = Gameplatform.count + num_game_platforms = GamePlatform.count - post :create, :gameplatform => {} + post :create, :game_platform => {} assert_response :redirect assert_redirected_to :action => 'list' - assert_equal num_gameplatforms + 1, Gameplatform.count + assert_equal num_game_platforms + 1, GamePlatform.count end def test_edit @@ -66,8 +66,8 @@ class GameplatformControllerTest < Test::Unit::TestCase assert_response :success assert_template 'edit' - assert_not_nil assigns(:gameplatform) - assert assigns(:gameplatform).valid? + assert_not_nil assigns(:game_platform) + assert assigns(:game_platform).valid? end def test_update @@ -78,7 +78,7 @@ class GameplatformControllerTest < Test::Unit::TestCase def test_destroy assert_nothing_raised { - Gameplatform.find(@first_id) + GamePlatform.find(@first_id) } post :destroy, :id => @first_id @@ -86,7 +86,7 @@ class GameplatformControllerTest < Test::Unit::TestCase assert_redirected_to :action => 'list' assert_raise(ActiveRecord::RecordNotFound) { - Gameplatform.find(@first_id) + GamePlatform.find(@first_id) } end end diff --git a/test/functional/videogenre_controller_test.rb b/test/functional/video_genre_controller_test.rb similarity index 63% rename from test/functional/videogenre_controller_test.rb rename to test/functional/video_genre_controller_test.rb index 2186b18..fa307fc 100644 --- a/test/functional/videogenre_controller_test.rb +++ b/test/functional/video_genre_controller_test.rb @@ -1,18 +1,18 @@ require File.dirname(__FILE__) + '/../test_helper' -require 'videogenre_controller' +require 'video_genre_controller' # Re-raise errors caught by the controller. -class VideogenreController; def rescue_action(e) raise e end; end +class VideoGenreController; def rescue_action(e) raise e end; end -class VideogenreControllerTest < Test::Unit::TestCase - fixtures :videogenres +class VideoGenreControllerTest < Test::Unit::TestCase + fixtures :video_genres def setup - @controller = VideogenreController.new + @controller = VideoGenreController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @first_id = videogenres(:first).id + @first_id = video_genres(:first).id end def test_index @@ -27,7 +27,7 @@ class VideogenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'list' - assert_not_nil assigns(:videogenres) + assert_not_nil assigns(:video_genres) end def test_show @@ -36,8 +36,8 @@ class VideogenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'show' - assert_not_nil assigns(:videogenre) - assert assigns(:videogenre).valid? + assert_not_nil assigns(:video_genre) + assert assigns(:video_genre).valid? end def test_new @@ -46,18 +46,18 @@ class VideogenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'new' - assert_not_nil assigns(:videogenre) + assert_not_nil assigns(:video_genre) end def test_create - num_videogenres = Videogenre.count + num_video_genres = VideoGenre.count - post :create, :videogenre => {} + post :create, :video_genre => {} assert_response :redirect assert_redirected_to :action => 'list' - assert_equal num_videogenres + 1, Videogenre.count + assert_equal num_video_genres + 1, VideoGenre.count end def test_edit @@ -66,8 +66,8 @@ class VideogenreControllerTest < Test::Unit::TestCase assert_response :success assert_template 'edit' - assert_not_nil assigns(:videogenre) - assert assigns(:videogenre).valid? + assert_not_nil assigns(:video_genre) + assert assigns(:video_genre).valid? end def test_update @@ -78,7 +78,7 @@ class VideogenreControllerTest < Test::Unit::TestCase def test_destroy assert_nothing_raised { - Videogenre.find(@first_id) + VideoGenre.find(@first_id) } post :destroy, :id => @first_id @@ -86,7 +86,7 @@ class VideogenreControllerTest < Test::Unit::TestCase assert_redirected_to :action => 'list' assert_raise(ActiveRecord::RecordNotFound) { - Videogenre.find(@first_id) + VideoGenre.find(@first_id) } end end diff --git a/test/functional/media_controller_test.rb b/test/functional/video_media_controller_test.rb similarity index 63% rename from test/functional/media_controller_test.rb rename to test/functional/video_media_controller_test.rb index b2824ad..fbec6fc 100644 --- a/test/functional/media_controller_test.rb +++ b/test/functional/video_media_controller_test.rb @@ -1,18 +1,18 @@ require File.dirname(__FILE__) + '/../test_helper' -require 'media_controller' +require 'video_media_controller' # Re-raise errors caught by the controller. -class MediaController; def rescue_action(e) raise e end; end +class VideoMediaController; def rescue_action(e) raise e end; end -class MediaControllerTest < Test::Unit::TestCase - fixtures :medias +class VideoMediaControllerTest < Test::Unit::TestCase + fixtures :video_medias def setup - @controller = MediaController.new + @controller = VideoMediaController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @first_id = medias(:first).id + @first_id = video_medias(:first).id end def test_index @@ -27,7 +27,7 @@ class MediaControllerTest < Test::Unit::TestCase assert_response :success assert_template 'list' - assert_not_nil assigns(:medias) + assert_not_nil assigns(:video_medias) end def test_show @@ -36,8 +36,8 @@ class MediaControllerTest < Test::Unit::TestCase assert_response :success assert_template 'show' - assert_not_nil assigns(:media) - assert assigns(:media).valid? + assert_not_nil assigns(:video_media) + assert assigns(:video_media).valid? end def test_new @@ -46,18 +46,18 @@ class MediaControllerTest < Test::Unit::TestCase assert_response :success assert_template 'new' - assert_not_nil assigns(:media) + assert_not_nil assigns(:video_media) end def test_create - num_medias = Media.count + num_video_medias = VideoMedia.count - post :create, :media => {} + post :create, :video_media => {} assert_response :redirect assert_redirected_to :action => 'list' - assert_equal num_medias + 1, Media.count + assert_equal num_video_medias + 1, VideoMedia.count end def test_edit @@ -66,8 +66,8 @@ class MediaControllerTest < Test::Unit::TestCase assert_response :success assert_template 'edit' - assert_not_nil assigns(:media) - assert assigns(:media).valid? + assert_not_nil assigns(:video_media) + assert assigns(:video_media).valid? end def test_update @@ -78,7 +78,7 @@ class MediaControllerTest < Test::Unit::TestCase def test_destroy assert_nothing_raised { - Media.find(@first_id) + VideoMedia.find(@first_id) } post :destroy, :id => @first_id @@ -86,7 +86,7 @@ class MediaControllerTest < Test::Unit::TestCase assert_redirected_to :action => 'list' assert_raise(ActiveRecord::RecordNotFound) { - Media.find(@first_id) + VideoMedia.find(@first_id) } end end diff --git a/test/unit/gamegenre_test.rb b/test/unit/game_genre_test.rb similarity index 66% rename from test/unit/gamegenre_test.rb rename to test/unit/game_genre_test.rb index 1a72d2c..f47f4e4 100644 --- a/test/unit/gamegenre_test.rb +++ b/test/unit/game_genre_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class GamegenreTest < Test::Unit::TestCase - fixtures :gamegenres +class GameGenreTest < Test::Unit::TestCase + fixtures :game_genres # Replace this with your real tests. def test_truth diff --git a/test/unit/gameplatform_test.rb b/test/unit/game_platform_test.rb similarity index 64% rename from test/unit/gameplatform_test.rb rename to test/unit/game_platform_test.rb index a796e92..97108b2 100644 --- a/test/unit/gameplatform_test.rb +++ b/test/unit/game_platform_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class GameplatformTest < Test::Unit::TestCase - fixtures :gameplatforms +class GamePlatformTest < Test::Unit::TestCase + fixtures :game_platforms # Replace this with your real tests. def test_truth diff --git a/test/unit/media_test.rb b/test/unit/video_genre_test.rb similarity index 66% rename from test/unit/media_test.rb rename to test/unit/video_genre_test.rb index 3883727..a7e3f8d 100644 --- a/test/unit/media_test.rb +++ b/test/unit/video_genre_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class MediaTest < Test::Unit::TestCase - fixtures :medias +class VideoGenreTest < Test::Unit::TestCase + fixtures :video_genres # Replace this with your real tests. def test_truth diff --git a/test/unit/videogenre_test.rb b/test/unit/video_media_test.rb similarity index 66% rename from test/unit/videogenre_test.rb rename to test/unit/video_media_test.rb index 5290195..346f66f 100644 --- a/test/unit/videogenre_test.rb +++ b/test/unit/video_media_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' -class VideogenreTest < Test::Unit::TestCase - fixtures :videogenres +class VideoMediaTest < Test::Unit::TestCase + fixtures :video_medias # Replace this with your real tests. def test_truth -- 2.25.1