Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236

This commit is contained in:
Pavel Chipiga 2012-05-04 00:52:56 +03:00
parent b1b5363972
commit 5157f31081
6 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/groups/base_controller.rb
View File

@ -6,7 +6,7 @@ class Groups::BaseController < ApplicationController
protected
def find_group
if group_id = params[:owner_name] || params[:group_id] || params[:id]
if group_id = params[:uname] || params[:group_id] || params[:id]
@group = Group.find_by_insensitive_uname! group_id
end
end

2
app/controllers/users/base_controller.rb
View File

@ -6,7 +6,7 @@ class Users::BaseController < ApplicationController
protected
def find_user
if user_id = params[:owner_name] || params[:user_id] || params[:id]
if user_id = params[:uname] || params[:user_id] || params[:id]
@user = User.find_by_insensitive_uname! user_id
end
end

127
config/routes.rb
View File

@ -20,6 +20,20 @@ Rosa::Application.routes.draw do
root :to => 'activity_feeds#index'
end
namespace :admin do
resources :users do
get :list, :on => :collection
end
resources :register_requests, :only => [:index] do
put :update, :on => :collection
member do
get :approve
get :reject
end
end
resources :event_logs, :only => :index
end
scope :module => 'platforms' do
resources :platforms do
resources :private_users, :except => [:show, :destroy, :update]
@ -49,20 +63,6 @@ Rosa::Application.routes.draw do
resources :product_build_lists, :only => [:index]
end
namespace :admin do
resources :users do
get :list, :on => :collection
end
resources :register_requests, :only => [:index] do
put :update, :on => :collection
member do
get :approve
get :reject
end
end
resources :event_logs, :only => :index
end
scope :module => 'users' do
resources :settings, :only => [] do
collection do
@ -81,8 +81,9 @@ Rosa::Application.routes.draw do
end
scope :module => 'groups' do
get '/groups/new' => 'profile#new' # need to force next route exclude :id => 'new'
get '/groups/:id' => redirect("/%{id}"), :as => :profile_group # override default group show route
resources :groups, :controller => 'profile' do
get '/' => 'groups/profile#show', :as => :profile, :on => :member
get :autocomplete_group_uname, :on => :collection
delete :remove_user, :on => :member
resources :members, :only => [:index] do
@ -115,56 +116,49 @@ Rosa::Application.routes.draw do
end
resources :projects, :only => [:index, :new, :create]
end
scope ':owner_name' do # Owner
constraints OwnerConstraint.new(User) do
get '/' => 'users/profile#show', :as => :user
end
constraints OwnerConstraint.new(Group, true) do
get '/' => 'groups/profile#show', :as => :group
end
scope ':project_name', :as => 'project', :module => 'projects' do
resources :wiki do
collection do
match '_history' => 'wiki#wiki_history', :as => :history, :via => :get
match '_access' => 'wiki#git', :as => :git, :via => :get
match '_revert/:sha1/:sha2' => 'wiki#revert_wiki', :as => :revert, :via => [:get, :post]
match '_compare' => 'wiki#compare_wiki', :as => :compare, :via => :post
#match '_compare/:versions' => 'wiki#compare_wiki', :versions => /.*/, :as => :compare_versions, :via => :get
match '_compare/:versions' => 'wiki#compare_wiki', :versions => /([a-f0-9\^]{6,40})(\.\.\.[a-f0-9\^]{6,40})/, :as => :compare_versions, :via => :get
post :preview
get :search
get :pages
end
member do
get :history
get :edit
match 'revert/:sha1/:sha2' => 'wiki#revert', :as => :revert_page, :via => [:get, :post]
match ':ref' => 'wiki#show', :as => :versioned, :via => :get
post :compare
#match 'compare/*versions' => 'wiki#compare', :as => :compare_versions, :via => :get
match 'compare/:versions' => 'wiki#compare', :versions => /([a-f0-9\^]{6,40})(\.\.\.[a-f0-9\^]{6,40})/, :as => :compare_versions, :via => :get
scope ':owner_name/:project_name' do # project
scope :as => 'project' do
resources :wiki do
collection do
match '_history' => 'wiki#wiki_history', :as => :history, :via => :get
match '_access' => 'wiki#git', :as => :git, :via => :get
match '_revert/:sha1/:sha2' => 'wiki#revert_wiki', :as => :revert, :via => [:get, :post]
match '_compare' => 'wiki#compare_wiki', :as => :compare, :via => :post
#match '_compare/:versions' => 'wiki#compare_wiki', :versions => /.*/, :as => :compare_versions, :via => :get
match '_compare/:versions' => 'wiki#compare_wiki', :versions => /([a-f0-9\^]{6,40})(\.\.\.[a-f0-9\^]{6,40})/, :as => :compare_versions, :via => :get
post :preview
get :search
get :pages
end
member do
get :history
get :edit
match 'revert/:sha1/:sha2' => 'wiki#revert', :as => :revert_page, :via => [:get, :post]
match ':ref' => 'wiki#show', :as => :versioned, :via => :get
post :compare
#match 'compare/*versions' => 'wiki#compare', :as => :compare_versions, :via => :get
match 'compare/:versions' => 'wiki#compare', :versions => /([a-f0-9\^]{6,40})(\.\.\.[a-f0-9\^]{6,40})/, :as => :compare_versions, :via => :get
end
end
resources :issues, :except => :edit do
resources :comments, :only => [:edit, :create, :update, :destroy]
resources :subscribes, :only => [:create, :destroy]
collection do
post :create_label
get :search_collaborators
end
end
post "/labels/:label_id" => "issues#destroy_label", :as => :issues_delete_label
post "/labels/:label_id/update" => "issues#update_label", :as => :issues_update_label
resources :build_lists, :only => [:index, :new, :create] do
collection { post :search }
end
resources :collaborators do
get :find, :on => :collection
end
end
resources :issues, :except => :edit do
resources :comments, :only => [:edit, :create, :update, :destroy]
resources :subscribes, :only => [:create, :destroy]
collection do
post :create_label
get :search_collaborators
end
end
post "/labels/:label_id" => "issues#destroy_label", :as => :issues_delete_label
post "/labels/:label_id/update" => "issues#update_label", :as => :issues_update_label
resources :build_lists, :only => [:index, :new, :create] do
collection { post :search }
end
resources :collaborators do
get :find, :on => :collection
end
end
scope ':project_name', :module => 'projects' do
# Resource
get '/edit' => 'projects#edit', :as => :edit_project
put '/' => 'projects#update'
@ -201,4 +195,13 @@ Rosa::Application.routes.draw do
get '/archive/:format/tree/:treeish' => "git/trees#archive", :defaults => {:treeish => :master}, :as => :archive, :format => /zip|tar/
end
end
scope ':uname' do # project owner profile
constraints OwnerConstraint.new(User) do
get '/' => 'users/profile#show', :as => :user
end
constraints OwnerConstraint.new(Group, true) do
get '/' => 'groups/profile#show', :as => :group
end
end
end

2
lib/ext/rails/owner_constraint.rb
View File

@ -7,6 +7,6 @@ class OwnerConstraint
end
def matches?(request)
@class_name.send(@finder, request.params[:owner_name]).present?
@class_name.send(@finder, request.params[:uname]).present?
end
end

2
spec/controllers/projects/git/git_trees_controller_spec.rb
View File

@ -12,7 +12,7 @@ describe Projects::Git::TreesController do
@project = FactoryGirl.create(:project)
@another_user = FactoryGirl.create(:user)
@params = {:project_id => @project.id, :format => 'tar'}
@params = {:owner_name => @project.owner.uname, :project_name => @project.name, :format => 'tar'}
end
context 'for guest' do

2
spec/controllers/users/profile_controller_spec.rb
View File

@ -27,7 +27,7 @@ describe Users::ProfileController do
end
it 'should be able to view profile' do
get :show, :owner_name => @other_user.uname
get :show, :uname => @other_user.uname
response.code.should eq('200')
end