From e19c7cef7b539f04ab71f90e223e457348935b87 Mon Sep 17 00:00:00 2001
From: Pedro Scocco <pedroscocco@gmail.com>
Date: Wed, 17 Jun 2015 19:55:40 -0300
Subject: [PATCH] Repository routes decoupled from Project

---
 app/assets/javascripts/repository/state.js.coffee |  4 ++--
 app/controllers/repositories_controller.rb        |  9 +++++----
 app/views/projects/show.html.erb                  |  4 ++--
 app/views/repositories/_form.html.erb             |  2 +-
 app/views/repositories/edit.html.erb              |  2 +-
 app/views/repositories/reload_processing.js.erb   |  6 +++---
 app/views/repositories/show.html.erb              |  8 ++++----
 config/routes.rb                                  | 14 ++++++++------
 features/repository/delete.feature                |  3 ++-
 features/repository/edit.feature                  |  4 ++++
 features/step_definitions/repository_steps.rb     |  8 ++++++--
 spec/controllers/repositories_controller_spec.rb  |  8 ++++----
 spec/routing/repositories_routing_spec.rb         | 48 ++++++++++++++++++++++++++----------------------
 13 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/app/assets/javascripts/repository/state.js.coffee b/app/assets/javascripts/repository/state.js.coffee
index 3ab0136..c37c50a 100644
--- a/app/assets/javascripts/repository/state.js.coffee
+++ b/app/assets/javascripts/repository/state.js.coffee
@@ -1,8 +1,8 @@
 class Repository.State
-  constructor: (@project_id, @repository_id) ->
+  constructor: (@repository_id) ->
 
   poll_state: (last_state) ->
-    $.post('/projects/' + @project_id + '/repositories/' + @repository_id + '/state',
+    $.post('/repositories/' + @repository_id + '/state',
            last_state: last_state)
 
   schedule_poll_state: (last_state) ->
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 282219f..fadcc89 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -38,7 +38,7 @@ class RepositoriesController < ApplicationController
   def update
     respond_to do |format|
       if @repository.update(repository_params)
-        format.html { redirect_to(project_repository_path(params[:project_id], @repository.id), notice: t('successfully_updated', :record => t(@repository.class))) }
+        format.html { redirect_to(repository_path(@repository.id), notice: t('successfully_updated', :record => t(@repository.class))) }
         format.json { head :no_content }
       else
         failed_action(format, 'edit')
@@ -51,7 +51,7 @@ class RepositoriesController < ApplicationController
   def destroy
     @repository.destroy
     respond_to do |format|
-      format.html { redirect_to project_path(params[:project_id]) }
+      format.html { redirect_to projects_path }
       format.json { head :no_content }
     end
   end
@@ -80,7 +80,7 @@ class RepositoriesController < ApplicationController
     @repository.process
     set_kalibro_configuration
     respond_to do |format|
-      format.html { redirect_to project_repository_path(@repository.project_id, @repository.id) }
+      format.html { redirect_to repository_path(@repository.id) }
     end
   end
 
@@ -135,7 +135,8 @@ private
   # Code extracted from create action
   def create_and_redir(format)
     if @repository.save
-      format.html { redirect_to project_repository_process_path(@repository.project_id, @repository.id), notice: t('successfully_created', :record => t(@repository.class)) }
+      current_user.repository_attributes.create(repository_id: @repository.id)
+      format.html { redirect_to repository_process_path(@repository.id), notice: t('successfully_created', :record => t(@repository.class)) }
     else
       failed_action(format, 'new')
     end
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 484bd06..094b455 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -44,11 +44,11 @@
         <td><%= repository.address %></td>
         <td>
           <% if project_owner? @project.id %>
-            <%= link_to t('edit'), edit_project_repository_path(@project, repository.id), class: 'btn btn-info' %>
+            <%= link_to t('edit'), edit_repository_path(repository.id), class: 'btn btn-info' %>
           <% end %>
         </td>
         <td>
-          <%= link_to t('show'), project_repository_path(@project, repository.id), class: 'btn btn-info' %></td>
+          <%= link_to t('show'), repository_path(repository.id), class: 'btn btn-info' %></td>
         </td>
       </tr>
     <% end %>
diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb
index 06700a7..97a2671 100644
--- a/app/views/repositories/_form.html.erb
+++ b/app/views/repositories/_form.html.erb
@@ -106,7 +106,7 @@
 </div>
 <div class="row margin-left-none" style="margin-top: 20px">
   <%= f.submit t('save'), class: 'btn btn-primary' %>
-  <%= link_to t('back'),  project_path(@project_id), class: 'btn btn-default' %>
+  <%= link_to t('back'),  projects_path, class: 'btn btn-default' %>
 </div>
 
 <script type="text/javascript">
diff --git a/app/views/repositories/edit.html.erb b/app/views/repositories/edit.html.erb
index bbe5527..577c531 100644
--- a/app/views/repositories/edit.html.erb
+++ b/app/views/repositories/edit.html.erb
@@ -2,6 +2,6 @@
   <h1><%= t_action(:edit, Repository) %></h1>
 </div>
 
-<%= form_for(@repository, :url => project_repository_update_url(@project_id, @repository.id), method: :put) do |f| %>
+<%= form_for(@repository, :url => repository_update_url(@repository.id), method: :put) do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>
diff --git a/app/views/repositories/reload_processing.js.erb b/app/views/repositories/reload_processing.js.erb
index 7fc6dc3..fc29734 100644
--- a/app/views/repositories/reload_processing.js.erb
+++ b/app/views/repositories/reload_processing.js.erb
@@ -1,12 +1,12 @@
 current_path_splited = window.location.pathname.split("/");
-if(current_path_splited[1] != "projects"){
+if(current_path_splited[1] != "repositories"){
   current_path_splited.splice(1,1); // Removes the locale
 }
 current_path = current_path_splited.join("/");
 
 // This if prevents it from updating the repository's state after the user leaves its page
-if(current_path == '<%= project_repository_path(project_id: @repository.project_id, id: @repository, locale: nil) %>'){
+if(current_path == '<%= repository_path(id: @repository, locale: nil) %>'){
   $('div#processing_information').html('<%= escape_javascript(render partial: "processing_information") %>');
-  repository = new Repository.State(<%= @repository.project_id %>, <%= @repository.id %>)
+  repository = new Repository.State(<%= @repository.id %>)
   repository.schedule_poll_state('<%= @processing.state %>')
 }
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 8f6688a..6664bfd 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -39,7 +39,7 @@
 
 <p><strong> <%= t('repository.show.date_processing') %>: </strong></p>
 
-<%= form_tag(project_repository_state_with_date_path(@repository.project_id, @repository.id), method: "post", remote: true) do %>
+<%= form_tag(repository_state_with_date_path(@repository.id), method: "post", remote: true) do %>
   <p>
     <%= label_tag :day, t("day") %>:
     <%= select_tag(:day, options_for_select(day_options), :style => "width:55px; margin-top:5px") %>
@@ -71,7 +71,7 @@
 </div>
 <script type="text/javascript">
     $(document).ready(function () {
-      (new Repository.State(<%= @repository.project_id %>, <%= @repository.id %>)).poll_state('')
+      (new Repository.State(<%= @repository.id %>)).poll_state('')
     });
 
   //Loads the accordion
@@ -89,6 +89,6 @@
 
 <%= link_to t('back'),  project_path(@repository.project_id), class: 'btn btn-default' %>
 <% if project_owner? @repository.project_id %>
-  <%= link_to t('repository.show.reprocess'), project_repository_process_path(@repository.project_id, @repository.id),  class: 'btn btn-info' %>
-  <%= link_to t('destroy'), project_repository_path(@repository.project_id, @repository.id), method: :delete, data: { confirm: t('sure_destroy', model: Repository.model_name.human) }, class: 'btn btn-danger' %>
+  <%= link_to t('repository.show.reprocess'), repository_process_path(@repository.id),  class: 'btn btn-info' %>
+  <%= link_to t('destroy'), repository_path(@repository.id), method: :delete, data: { confirm: t('sure_destroy', model: Repository.model_name.human) }, class: 'btn btn-danger' %>
 <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 2c5513c..9e14440 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,14 +4,16 @@ Rails.application.routes.draw do
     get 'users/:user_id/projects' => 'users#projects', as: :user_projects
 
     resources :projects do
-      resources :repositories, except: [:update, :index]
-      get '/repositories/:id/modules/:module_result_id' => 'repositories#show', as: :repository_module
-      post '/repositories/:id/state' => 'repositories#state', as: :repository_state
-      post '/repositories/:id/state_with_date' => 'repositories#state_with_date', as: :repository_state_with_date
-      put '/repositories/:id' => 'repositories#update', as: :repository_update
-      get '/repositories/:id/process' => 'repositories#process_repository', as: :repository_process
+      resources :repositories, only: [:new, :create]
     end
 
+    resources :repositories, except: [:update, :index]
+    get '/repositories/:id/modules/:module_result_id' => 'repositories#show', as: :repository_module
+    post '/repositories/:id/state' => 'repositories#state', as: :repository_state
+    post '/repositories/:id/state_with_date' => 'repositories#state_with_date', as: :repository_state_with_date
+    put '/repositories/:id' => 'repositories#update', as: :repository_update
+    get '/repositories/:id/process' => 'repositories#process_repository', as: :repository_process
+
     get '/repository_branches' => 'repositories#branches', as: :repository_branches
 
     resources :kalibro_configurations do
diff --git a/features/repository/delete.feature b/features/repository/delete.feature
index a2fe12a..540da57 100644
--- a/features/repository/delete.feature
+++ b/features/repository/delete.feature
@@ -10,8 +10,9 @@ Feature: Project Deletion
     And I own a sample project
     And I have a sample configuration with native metrics
     And I have a sample repository within the sample project named "QtCalculator"
+    And I own that repository
     And I start to process that repository
     And I wait up for a ready processing
     When I visit the repository show page
     And I click the Destroy link
-    Then I should see "There are no Repositories yet!"
\ No newline at end of file
+    Then I should be in the All Projects page
\ No newline at end of file
diff --git a/features/repository/edit.feature b/features/repository/edit.feature
index e25d51a..cbb4b25 100644
--- a/features/repository/edit.feature
+++ b/features/repository/edit.feature
@@ -10,6 +10,7 @@ Feature: Repository Edit
     And I own a sample project
     And I have a sample configuration with native metrics
     And I have a sample repository within the sample project named "QtCalculator"
+    And I own that repository
     And I am at repository edit page
     Then the field "Name" should be filled with "QtCalculator"
     And the field "Type" should be filled with "GIT"
@@ -32,6 +33,7 @@ Feature: Repository Edit
     And I own a sample project
     And I have a sample configuration with native metrics
     And I have a sample repository within the sample project named "QtCalculator"
+    And I own that repository
     And I am at repository edit page
     When I fill the Name field with " "
     And I fill the Address field with " "
@@ -46,7 +48,9 @@ Feature: Repository Edit
     And I own a sample project
     And I have a sample configuration with native metrics
     And I have a sample repository within the sample project named "MedSquare"
+    And I own that repository
     And I have a sample repository within the sample project named "QtCalculator"
+    And I own that repository
     And I am at repository edit page
     When I fill the Name field with "MedSquare"
     And I press the Save button
diff --git a/features/step_definitions/repository_steps.rb b/features/step_definitions/repository_steps.rb
index bd28b51..ee2ba0d 100644
--- a/features/step_definitions/repository_steps.rb
+++ b/features/step_definitions/repository_steps.rb
@@ -70,7 +70,7 @@ Given(/^I am at the New Repository page$/) do
 end
 
 Given(/^I am at repository edit page$/) do
-  visit edit_project_repository_path(project_id: @repository.project_id, id: @repository.id)
+  visit edit_repository_path(id: @repository.id)
 end
 
 Given(/^I ask for the last ready processing of the given repository$/) do
@@ -89,6 +89,10 @@ Given(/^I see a sample metric's name$/) do
   expect(page).to have_content(@metric_results.first.metric_configuration.metric.name)
 end
 
+Given(/^I own that repository$/) do
+  FactoryGirl.create(:repository_attributes, {repository_id: @repository.id, user_id: @user.id})
+end
+
 When(/^I click on the sample metric's name$/) do
   find_link(@metric_results.first.metric_configuration.metric.name).trigger('click')
 end
@@ -98,7 +102,7 @@ When(/^I set the select field "(.+)" as "(.+)"$/) do |field, text|
 end
 
 When(/^I visit the repository show page$/) do
-  visit project_repository_path(project_id: @project.id, id: @repository.id)
+  visit repository_path(id: @repository.id)
 end
 
 When(/^I click on the sample child's name$/) do
diff --git a/spec/controllers/repositories_controller_spec.rb b/spec/controllers/repositories_controller_spec.rb
index a9ee97f..0d641dd 100644
--- a/spec/controllers/repositories_controller_spec.rb
+++ b/spec/controllers/repositories_controller_spec.rb
@@ -65,7 +65,7 @@ describe RepositoriesController, :type => :controller do
           post :create, project_id: project.id, repository: repository_params
         end
 
-        it { is_expected.to redirect_to(project_repository_process_path(project_id: repository.project_id, id: repository.id)) }
+        it { is_expected.to redirect_to(repository_process_path(id: repository.id)) }
         it { is_expected.to respond_with(:redirect) }
       end
 
@@ -136,7 +136,7 @@ describe RepositoriesController, :type => :controller do
           delete :destroy, id: repository.id, project_id: project.id.to_s
         end
 
-        it { is_expected.to redirect_to(project_path(repository.project_id)) }
+        it { is_expected.to redirect_to(projects_path) }
         it { is_expected.to respond_with(:redirect) }
       end
 
@@ -226,7 +226,7 @@ describe RepositoriesController, :type => :controller do
             post :update, project_id: project.id.to_s, id: repository.id, repository: repository_params
           end
 
-          it { is_expected.to redirect_to(project_repository_path(repository.project_id, repository.id)) }
+          it { is_expected.to redirect_to(repository_path(repository.id)) }
           it { is_expected.to respond_with(:redirect) }
         end
 
@@ -345,7 +345,7 @@ describe RepositoriesController, :type => :controller do
         KalibroConfiguration.expects(:find).with(repository.id).returns(FactoryGirl.build(:kalibro_configuration, :with_id))
         get :process_repository, project_id: project.id.to_s, id: repository.id
       end
-      it { is_expected.to redirect_to(project_repository_path(repository.project_id, repository.id)) }
+      it { is_expected.to redirect_to(repository_path(repository.id)) }
   end
 
   describe 'branches' do
diff --git a/spec/routing/repositories_routing_spec.rb b/spec/routing/repositories_routing_spec.rb
index 25cf171..620a5c1 100644
--- a/spec/routing/repositories_routing_spec.rb
+++ b/spec/routing/repositories_routing_spec.rb
@@ -2,29 +2,33 @@ require "rails_helper"
 
 describe RepositoriesController, :type => :routing do
   describe "routing" do
-    it { is_expected.to route(:post, '/projects/1/repositories').
-                  to(controller: :repositories, action: :create, project_id: 1) }
-    it { is_expected.to route(:get, '/projects/1/repositories/new').
-                  to(controller: :repositories, action: :new, project_id: 1) }
-    it { is_expected.to route(:get, '/projects/1/repositories/1/edit').
-                  to(controller: :repositories, action: :edit, project_id: 1, id: 1) }
-    it { is_expected.to route(:get, '/projects/1/repositories/1').
-                  to(controller: :repositories, action: :show, project_id: 1, id: 1) }
-    it { is_expected.to route(:get, '/projects/1/repositories/1/modules/1').
-                  to(controller: :repositories, action: :show, project_id: 1, module_result_id: 1, id: 1) }
-    it { is_expected.to route(:delete, '/projects/1/repositories/1').
-                  to(controller: :repositories, action: :destroy, project_id: 1, id: 1) }
-    it { is_expected.to route(:put, '/projects/1/repositories/1').
-                  to(controller: :repositories, action: :update, project_id: 1, id: 1) }
-    it { is_expected.not_to route(:get, '/projects/1/repositories').
-                  to(controller: :repositories, action: :index, project_id: 1) }
-    it { is_expected.to route(:post, '/projects/1/repositories/1/state').
-                  to(controller: :repositories, action: :state, project_id: 1, id: 1) }
-    it { is_expected.to route(:post, '/projects/1/repositories/1/state_with_date').
-                  to(controller: :repositories, action: :state_with_date, project_id: 1, id: 1) }
-    it { is_expected.to route(:get, '/projects/1/repositories/1/process').
-                  to(controller: :repositories, action: :process_repository, project_id: 1, id: 1) }
+    it { is_expected.to route(:post, '/repositories').
+                  to(controller: :repositories, action: :create) }
+    it { is_expected.to route(:get, '/repositories/new').
+                  to(controller: :repositories, action: :new) }
+    it { is_expected.to route(:get, '/repositories/1/edit').
+                  to(controller: :repositories, action: :edit, id: 1) }
+    it { is_expected.to route(:get, '/repositories/1').
+                  to(controller: :repositories, action: :show, id: 1) }
+    it { is_expected.to route(:get, '/repositories/1/modules/1').
+                  to(controller: :repositories, action: :show, module_result_id: 1, id: 1) }
+    it { is_expected.to route(:delete, '/repositories/1').
+                  to(controller: :repositories, action: :destroy, id: 1) }
+    it { is_expected.to route(:put, '/repositories/1').
+                  to(controller: :repositories, action: :update, id: 1) }
+    it { is_expected.not_to route(:get, '/repositories').
+                  to(controller: :repositories, action: :index) }
+    it { is_expected.to route(:post, '/repositories/1/state').
+                  to(controller: :repositories, action: :state, id: 1) }
+    it { is_expected.to route(:post, '/repositories/1/state_with_date').
+                  to(controller: :repositories, action: :state_with_date, id: 1) }
+    it { is_expected.to route(:get, '/repositories/1/process').
+                  to(controller: :repositories, action: :process_repository, id: 1) }
     it { is_expected.to route(:get, '/repository_branches').
                   to(controller: :repositories, action: :branches) }
+    it { is_expected.to route(:get, '/projects/1/repositories/new').
+                  to(controller: :repositories, action: :new, project_id: 1) }
+    it { is_expected.to route(:post, '/projects/1/repositories').
+                  to(controller: :repositories, action: :create, project_id: 1) }
    end
 end
--
libgit2 0.21.2