From 40f4ced3b8d1a5d6249f39d25ea70626c41845e1 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Sun, 30 Jun 2013 21:37:30 +0000 Subject: [PATCH] Add inflection for API acronym --- app/controllers/api/application_controller.rb | 2 +- app/controllers/api/playlists_controller.rb | 2 +- app/controllers/api/sessions_controller.rb | 2 +- app/controllers/api/sounds_controller.rb | 2 +- app/controllers/api/tracks_controller.rb | 2 +- config/initializers/inflections.rb | 4 ++++ spec/controllers/api/application_controller_spec.rb | 6 +++--- spec/controllers/api/playlists_controller_spec.rb | 2 +- spec/controllers/api/sessions_controller_spec.rb | 2 +- spec/controllers/api/tracks_controller_spec.rb | 2 +- spec/routing/options_requests_spec.rb | 2 +- 11 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/controllers/api/application_controller.rb b/app/controllers/api/application_controller.rb index 894e50b..92b1010 100644 --- a/app/controllers/api/application_controller.rb +++ b/app/controllers/api/application_controller.rb @@ -1,4 +1,4 @@ -class Api::ApplicationController < ApplicationController +class API::ApplicationController < ApplicationController skip_before_filter :verify_authenticity_token skip_before_filter :authenticate!, :only => [:cor_preflight] diff --git a/app/controllers/api/playlists_controller.rb b/app/controllers/api/playlists_controller.rb index 436de1e..bbdc3c7 100644 --- a/app/controllers/api/playlists_controller.rb +++ b/app/controllers/api/playlists_controller.rb @@ -1,4 +1,4 @@ -class Api::PlaylistsController < Api::ApplicationController +class API::PlaylistsController < API::ApplicationController respond_to :json def index diff --git a/app/controllers/api/sessions_controller.rb b/app/controllers/api/sessions_controller.rb index fe4e939..85b2bbf 100644 --- a/app/controllers/api/sessions_controller.rb +++ b/app/controllers/api/sessions_controller.rb @@ -1,4 +1,4 @@ -class Api::SessionsController < Api::ApplicationController +class API::SessionsController < API::ApplicationController skip_before_filter :authenticate!, :only => [:create] def create diff --git a/app/controllers/api/sounds_controller.rb b/app/controllers/api/sounds_controller.rb index ed95edd..c7b8111 100644 --- a/app/controllers/api/sounds_controller.rb +++ b/app/controllers/api/sounds_controller.rb @@ -1,4 +1,4 @@ -class Api::SoundsController < Api::ApplicationController +class API::SoundsController < API::ApplicationController # FIXME: add some tests! def show sound = Sound.find params[:id] diff --git a/app/controllers/api/tracks_controller.rb b/app/controllers/api/tracks_controller.rb index 71268a9..e78b390 100644 --- a/app/controllers/api/tracks_controller.rb +++ b/app/controllers/api/tracks_controller.rb @@ -1,4 +1,4 @@ -class Api::TracksController < Api::ApplicationController +class API::TracksController < API::ApplicationController def index @tracks = Track.all end diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 5d8d9be..54e3418 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -13,3 +13,7 @@ # ActiveSupport::Inflector.inflections do |inflect| # inflect.acronym 'RESTful' # end + +ActiveSupport::Inflector.inflections do |inflect| + inflect.acronym 'API' +end diff --git a/spec/controllers/api/application_controller_spec.rb b/spec/controllers/api/application_controller_spec.rb index 4ae8922..1fdac73 100644 --- a/spec/controllers/api/application_controller_spec.rb +++ b/spec/controllers/api/application_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::ApplicationController do +describe API::ApplicationController do include UserControllerHelpers before do @@ -13,7 +13,7 @@ describe Api::ApplicationController do end context 'preflight' do - controller(Api::ApplicationController) do + controller(API::ApplicationController) do alias_method :index, :cor_preflight end @@ -35,7 +35,7 @@ describe Api::ApplicationController do end describe 'before filter' do - controller(Api::ApplicationController) do + controller(API::ApplicationController) do def index head :ok end diff --git a/spec/controllers/api/playlists_controller_spec.rb b/spec/controllers/api/playlists_controller_spec.rb index 2bd0e9a..a413a8e 100644 --- a/spec/controllers/api/playlists_controller_spec.rb +++ b/spec/controllers/api/playlists_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::PlaylistsController do +describe API::PlaylistsController do include UserControllerHelpers before do diff --git a/spec/controllers/api/sessions_controller_spec.rb b/spec/controllers/api/sessions_controller_spec.rb index 2fedf2b..c23aea3 100644 --- a/spec/controllers/api/sessions_controller_spec.rb +++ b/spec/controllers/api/sessions_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::SessionsController do +describe API::SessionsController do describe 'POST create' do let(:user) { Factory.create(:user) } diff --git a/spec/controllers/api/tracks_controller_spec.rb b/spec/controllers/api/tracks_controller_spec.rb index 7a8af42..512bd78 100644 --- a/spec/controllers/api/tracks_controller_spec.rb +++ b/spec/controllers/api/tracks_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::TracksController do +describe API::TracksController do include UserControllerHelpers before do diff --git a/spec/routing/options_requests_spec.rb b/spec/routing/options_requests_spec.rb index 93a7d80..aba8a78 100644 --- a/spec/routing/options_requests_spec.rb +++ b/spec/routing/options_requests_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe '/api OPTIONS requests routing' do - it 'routes to Api::ApplicationController#cor_preflight' do + it 'routes to API::ApplicationController#cor_preflight' do { :options => '/api/some_route' }.should route_to( :controller => 'api/application', :action => 'cor_preflight',