From 105d11bfe770f37cad5d1c772f172b7607da3a2a Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Sat, 1 Feb 2014 01:26:58 +0100 Subject: [PATCH] Change naming convention for presenter objects --- app/controllers/asciicasts_controller.rb | 8 ++++---- app/controllers/home_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- ...asciicast_presenter.rb => asciicast_page_presenter.rb} | 2 +- ...cast_presenter.rb => bare_asciicast_page_presenter.rb} | 2 +- ...ciicast_list_presenter.rb => browse_page_presenter.rb} | 2 +- .../{home_presenter.rb => home_page_presenter.rb} | 2 +- .../{user_presenter.rb => user_page_presenter.rb} | 2 +- spec/controllers/asciicasts_controller_spec.rb | 8 ++++---- spec/controllers/home_controller_spec.rb | 4 ++-- ...presenter_spec.rb => asciicast_page_presenter_spec.rb} | 2 +- ...nter_spec.rb => bare_asciicast_page_presenter_spec.rb} | 2 +- ...st_presenter_spec.rb => browse_page_presenter_spec.rb} | 2 +- ...home_presenter_spec.rb => home_page_presenter_spec.rb} | 2 +- ...user_presenter_spec.rb => user_page_presenter_spec.rb} | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) rename app/presenters/{asciicast_presenter.rb => asciicast_page_presenter.rb} (97%) rename app/presenters/{bare_asciicast_presenter.rb => bare_asciicast_page_presenter.rb} (91%) rename app/presenters/{asciicast_list_presenter.rb => browse_page_presenter.rb} (96%) rename app/presenters/{home_presenter.rb => home_page_presenter.rb} (94%) rename app/presenters/{user_presenter.rb => user_page_presenter.rb} (97%) rename spec/presenters/{asciicast_presenter_spec.rb => asciicast_page_presenter_spec.rb} (99%) rename spec/presenters/{bare_asciicast_presenter_spec.rb => bare_asciicast_page_presenter_spec.rb} (95%) rename spec/presenters/{asciicast_list_presenter_spec.rb => browse_page_presenter_spec.rb} (98%) rename spec/presenters/{home_presenter_spec.rb => home_page_presenter_spec.rb} (98%) rename spec/presenters/{user_presenter_spec.rb => user_page_presenter_spec.rb} (99%) diff --git a/app/controllers/asciicasts_controller.rb b/app/controllers/asciicasts_controller.rb index 66769e4..462cfbf 100644 --- a/app/controllers/asciicasts_controller.rb +++ b/app/controllers/asciicasts_controller.rb @@ -10,8 +10,8 @@ class AsciicastsController < ApplicationController def index render locals: { - page: AsciicastListPresenter.build(params[:category], params[:order], - params[:page]) + page: BrowsePagePresenter.build(params[:category], params[:order], + params[:page]) } end @@ -20,7 +20,7 @@ class AsciicastsController < ApplicationController format.html do view_counter.increment(asciicast, cookies) render locals: { - page: AsciicastPresenter.build(asciicast, current_user, params) + page: AsciicastPagePresenter.build(asciicast, current_user, params) } end @@ -36,7 +36,7 @@ class AsciicastsController < ApplicationController def bare response.headers.delete('X-Frame-Options') - render locals: { page: BareAsciicastPresenter.build(asciicast, params) }, + render locals: { page: BareAsciicastPagePresenter.build(asciicast, params) }, layout: 'bare' end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1a64b6d..0e05e60 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,7 +1,7 @@ class HomeController < ApplicationController def show - render locals: { page: HomePresenter.new } + render locals: { page: HomePagePresenter.new } end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1083da9..f8aebf0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -10,7 +10,7 @@ class UsersController < ApplicationController def show user = User.find_by_nickname!(params[:nickname]) - render locals: { page: UserPresenter.build(user, current_user) } + render locals: { page: UserPagePresenter.build(user, current_user) } end def create diff --git a/app/presenters/asciicast_presenter.rb b/app/presenters/asciicast_page_presenter.rb similarity index 97% rename from app/presenters/asciicast_presenter.rb rename to app/presenters/asciicast_page_presenter.rb index 6aa441f..80c3d5e 100644 --- a/app/presenters/asciicast_presenter.rb +++ b/app/presenters/asciicast_page_presenter.rb @@ -1,4 +1,4 @@ -class AsciicastPresenter +class AsciicastPagePresenter attr_reader :asciicast, :current_user, :playback_options diff --git a/app/presenters/bare_asciicast_presenter.rb b/app/presenters/bare_asciicast_page_presenter.rb similarity index 91% rename from app/presenters/bare_asciicast_presenter.rb rename to app/presenters/bare_asciicast_page_presenter.rb index 5e56e9b..1f93211 100644 --- a/app/presenters/bare_asciicast_presenter.rb +++ b/app/presenters/bare_asciicast_page_presenter.rb @@ -1,4 +1,4 @@ -class BareAsciicastPresenter +class BareAsciicastPagePresenter attr_reader :asciicast, :playback_options diff --git a/app/presenters/asciicast_list_presenter.rb b/app/presenters/browse_page_presenter.rb similarity index 96% rename from app/presenters/asciicast_list_presenter.rb rename to app/presenters/browse_page_presenter.rb index 852d465..3502a8e 100644 --- a/app/presenters/asciicast_list_presenter.rb +++ b/app/presenters/browse_page_presenter.rb @@ -1,4 +1,4 @@ -class AsciicastListPresenter +class BrowsePagePresenter DEFAULT_CATEGORY = :all DEFAULT_ORDER = :recency diff --git a/app/presenters/home_presenter.rb b/app/presenters/home_page_presenter.rb similarity index 94% rename from app/presenters/home_presenter.rb rename to app/presenters/home_page_presenter.rb index 0af2b1f..0fa1a80 100644 --- a/app/presenters/home_presenter.rb +++ b/app/presenters/home_page_presenter.rb @@ -1,4 +1,4 @@ -class HomePresenter +class HomePagePresenter attr_reader :playback_options diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_page_presenter.rb similarity index 97% rename from app/presenters/user_presenter.rb rename to app/presenters/user_page_presenter.rb index dad1073..5ece3cb 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_page_presenter.rb @@ -1,4 +1,4 @@ -class UserPresenter +class UserPagePresenter PER_PAGE = 15 diff --git a/spec/controllers/asciicasts_controller_spec.rb b/spec/controllers/asciicasts_controller_spec.rb index 6dd48b1..6c5628a 100644 --- a/spec/controllers/asciicasts_controller_spec.rb +++ b/spec/controllers/asciicasts_controller_spec.rb @@ -22,7 +22,7 @@ describe AsciicastsController do before do allow(controller).to receive(:render) - allow(AsciicastListPresenter).to receive(:build). + allow(BrowsePagePresenter).to receive(:build). with('featured', 'recency', '2') { asciicast_list_presenter } get :index, category: 'featured', order: 'recency', page: '2' @@ -30,7 +30,7 @@ describe AsciicastsController do it { should be_success } - it "renders template with AsciicastListPresenter as page" do + it "renders template with BrowsePagePresenter as page" do expect(controller).to have_received(:render). with(locals: { page: asciicast_list_presenter }) end @@ -52,7 +52,7 @@ describe AsciicastsController do before do allow(controller).to receive(:render) allow(controller).to receive(:current_user) { user } - allow(AsciicastPresenter).to receive(:build). + allow(AsciicastPagePresenter).to receive(:build). with(asciicast, user, hash_including('speed' => '3.0')). and_return(asciicast_presenter) @@ -66,7 +66,7 @@ describe AsciicastsController do with(asciicast, cookies) end - it "renders template with AsciicastPresenter as page" do + it "renders template with AsciicastPagePresenter as page" do expect(controller).to have_received(:render). with(locals: { page: asciicast_presenter }) end diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index 38853e8..5ddea24 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -8,9 +8,9 @@ describe HomeController do get :show end - it "renders template with HomePresenter as page" do + it "renders template with HomePagePresenter as page" do expect(controller).to have_received(:render). - with(locals: { page: kind_of(HomePresenter) }) + with(locals: { page: kind_of(HomePagePresenter) }) end end diff --git a/spec/presenters/asciicast_presenter_spec.rb b/spec/presenters/asciicast_page_presenter_spec.rb similarity index 99% rename from spec/presenters/asciicast_presenter_spec.rb rename to spec/presenters/asciicast_page_presenter_spec.rb index 8e1d444..ebab285 100644 --- a/spec/presenters/asciicast_presenter_spec.rb +++ b/spec/presenters/asciicast_page_presenter_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe AsciicastPresenter do +describe AsciicastPagePresenter do describe '.build' do subject { described_class.build(asciicast, user, playback_options) } diff --git a/spec/presenters/bare_asciicast_presenter_spec.rb b/spec/presenters/bare_asciicast_page_presenter_spec.rb similarity index 95% rename from spec/presenters/bare_asciicast_presenter_spec.rb rename to spec/presenters/bare_asciicast_page_presenter_spec.rb index 791d09b..a94a318 100644 --- a/spec/presenters/bare_asciicast_presenter_spec.rb +++ b/spec/presenters/bare_asciicast_page_presenter_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe BareAsciicastPresenter do +describe BareAsciicastPagePresenter do describe '.build' do subject { described_class.build(asciicast, playback_options) } diff --git a/spec/presenters/asciicast_list_presenter_spec.rb b/spec/presenters/browse_page_presenter_spec.rb similarity index 98% rename from spec/presenters/asciicast_list_presenter_spec.rb rename to spec/presenters/browse_page_presenter_spec.rb index d13868f..bf961f1 100644 --- a/spec/presenters/asciicast_list_presenter_spec.rb +++ b/spec/presenters/browse_page_presenter_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe AsciicastListPresenter do +describe BrowsePagePresenter do describe '.build' do subject { described_class.build(category, order, page, per_page) } diff --git a/spec/presenters/home_presenter_spec.rb b/spec/presenters/home_page_presenter_spec.rb similarity index 98% rename from spec/presenters/home_presenter_spec.rb rename to spec/presenters/home_page_presenter_spec.rb index ba0969b..be0627e 100644 --- a/spec/presenters/home_presenter_spec.rb +++ b/spec/presenters/home_page_presenter_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe HomePresenter do +describe HomePagePresenter do let(:presenter) { described_class.new } diff --git a/spec/presenters/user_presenter_spec.rb b/spec/presenters/user_page_presenter_spec.rb similarity index 99% rename from spec/presenters/user_presenter_spec.rb rename to spec/presenters/user_page_presenter_spec.rb index a192f38..861d0b4 100644 --- a/spec/presenters/user_presenter_spec.rb +++ b/spec/presenters/user_page_presenter_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe UserPresenter do +describe UserPagePresenter do describe '.build' do subject { described_class.build(user, current_user, page, per_page) }