diff --git a/app/controllers/api/v0/playlists_controller.rb b/app/controllers/api/playlists_controller.rb similarity index 52% rename from app/controllers/api/v0/playlists_controller.rb rename to app/controllers/api/playlists_controller.rb index b4e49a2..ac46b33 100644 --- a/app/controllers/api/v0/playlists_controller.rb +++ b/app/controllers/api/playlists_controller.rb @@ -1,4 +1,4 @@ -class Api::V0::PlaylistsController < Api::ApplicationController +class Api::PlaylistsController < Api::ApplicationController respond_to :json def index diff --git a/app/controllers/api/v0/sessions_controller.rb b/app/controllers/api/sessions_controller.rb similarity index 83% rename from app/controllers/api/v0/sessions_controller.rb rename to app/controllers/api/sessions_controller.rb index 8918122..fe4e939 100644 --- a/app/controllers/api/v0/sessions_controller.rb +++ b/app/controllers/api/sessions_controller.rb @@ -1,4 +1,4 @@ -class Api::V0::SessionsController < Api::ApplicationController +class Api::SessionsController < Api::ApplicationController skip_before_filter :authenticate!, :only => [:create] def create diff --git a/app/views/api/v0/playlists/index.rabl b/app/views/api/playlists/index.rabl similarity index 100% rename from app/views/api/v0/playlists/index.rabl rename to app/views/api/playlists/index.rabl diff --git a/app/views/api/v0/sessions/create.rabl b/app/views/api/sessions/create.rabl similarity index 100% rename from app/views/api/v0/sessions/create.rabl rename to app/views/api/sessions/create.rabl diff --git a/config/routes.rb b/config/routes.rb index 80c6ccc..b625e3a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,7 @@ Scube::Application.routes.draw do namespace :api do - namespace :v0 do - resources :playlists, :only => [:index] - resources :sessions, :only => [:create] - end + resources :playlists, :only => [:index] + resources :sessions, :only => [:create] match '*all' => 'application#cor_preflight', :via => :options end diff --git a/spec/controllers/api/v0/playlists_controller_spec.rb b/spec/controllers/api/playlists_controller_spec.rb similarity index 94% rename from spec/controllers/api/v0/playlists_controller_spec.rb rename to spec/controllers/api/playlists_controller_spec.rb index f29df71..7e04cd4 100644 --- a/spec/controllers/api/v0/playlists_controller_spec.rb +++ b/spec/controllers/api/playlists_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::V0::PlaylistsController do +describe Api::PlaylistsController do before do controller.current_user = Factory.create(:user) end diff --git a/spec/controllers/api/v0/sessions_controller_spec.rb b/spec/controllers/api/sessions_controller_spec.rb similarity index 96% rename from spec/controllers/api/v0/sessions_controller_spec.rb rename to spec/controllers/api/sessions_controller_spec.rb index 7bbca43..2fedf2b 100644 --- a/spec/controllers/api/v0/sessions_controller_spec.rb +++ b/spec/controllers/api/sessions_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::V0::SessionsController do +describe Api::SessionsController do describe 'POST create' do let(:user) { Factory.create(:user) } diff --git a/spec/integration/api/v0/api_sign_in_spec.rb b/spec/integration/api/api_sign_in_spec.rb similarity index 90% rename from spec/integration/api/v0/api_sign_in_spec.rb rename to spec/integration/api/api_sign_in_spec.rb index b8bcadb..5ab63af 100644 --- a/spec/integration/api/v0/api_sign_in_spec.rb +++ b/spec/integration/api/api_sign_in_spec.rb @@ -4,7 +4,7 @@ feature 'API sign in' do let(:user) { Factory.create(:user) } def do_create - post api_v0_sessions_path, :format => :json, :session => { + post api_sessions_path, :format => :json, :session => { :email => user.email, :password => user.password } diff --git a/spec/integration/api/cross_origin_request_spec.rb b/spec/integration/api/cross_origin_request_spec.rb index 6492626..c11ffae 100644 --- a/spec/integration/api/cross_origin_request_spec.rb +++ b/spec/integration/api/cross_origin_request_spec.rb @@ -18,7 +18,7 @@ feature 'API cross origin request' do # FIXME: request without redirect request_via_redirect( :options, - api_v0_playlists_path(:format => :json), + api_playlists_path(:format => :json), nil, { 'Origin' => origin } ) @@ -33,7 +33,7 @@ feature 'API cross origin request' do scenario 'basic request' do # FIXME: replace with a more stable/generic action - get api_v0_playlists_path(:format => :json), nil, { + get api_playlists_path(:format => :json), nil, { 'Origin' => origin } diff --git a/spec/routing/options_requests_spec.rb b/spec/routing/options_requests_spec.rb index 1a7d20e..93a7d80 100644 --- a/spec/routing/options_requests_spec.rb +++ b/spec/routing/options_requests_spec.rb @@ -2,10 +2,10 @@ require 'spec_helper' describe '/api OPTIONS requests routing' do it 'routes to Api::ApplicationController#cor_preflight' do - { :options => '/api/v0' }.should route_to( + { :options => '/api/some_route' }.should route_to( :controller => 'api/application', :action => 'cor_preflight', - :all => 'v0' + :all => 'some_route' ) end end