Mejora rutas y rubocop

.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-minitest
   - rubocop-rails
 
@@ -63,5 +63,6 @@ Metrics/ParameterLists:
 
 AllCops:
   NewCops: enable
+  SuggestExtensions: false
 
 

app/controllers/sivel2_gen/fil23_gen/graficar_plotly_controller.rb

@@ -13,15 +13,15 @@ def actos_individuales
         @rutadircsv = Rails.root.join(
           "public#{Rails.configuration.relative_url_root}" +
           "assets/csv",
-        ).to_s.to_s
+        ).to_s
         unless Dir.exist?(@rutadircsv)
           Dir.mkdir(@rutadircsv)
         end
 
         @rutacsv = Rails.root.join(
           "public#{Rails.configuration.relative_url_root}" +
           "assets/csv/actos_individuales.csv",
-        ).to_s.to_s
+        ).to_s
 
         tarc = Tempfile.new(["actos_individuales", ".csv"], "/var/www/tmp/")
         rutatmp = tarc.path

config/routes.rb

@@ -3,68 +3,6 @@
 Sivel2Gen::Engine.routes.draw do
   get "/acercade", to: "hogar#acercade"
 
-  get "/buscarrepetidos", to: "buscarrepetidos#reportar", as: :buscarrepetidos
-  post "/buscarrepetidos", to: "buscarrepetidos#reportar", 
-    as: :envia_buscarrepetidos
-  get "/victimas/nuevo", to: "victimas#nuevo"
-
-  get "/casos/busca", to: "casos#busca"
-  get "/casos/cuenta", to: "casos#cuenta"
-  get "/casos/datos-osm", to: "casos#presenta_datos_mapaosm"
-  get "/casos/errores_importacion", to: "casos#errores_importacion",
-    as: :casos_errores_importacion
-  get "/casos/importarrelatos", to: "casos#importarrelatos"
-  get "/casos/:id/fichaimp", to: "casos#fichaimp",
-    as: :caso_fichaimp
-  get "/casos/:id/fichapdf", to: "casos#fichapdf",
-    as: :caso_fichapdf
-  get "/casos/lista", to: "casos#lista"
-  get "/casos/mapaosm", to: "casos#mapaosm", as: :casos_mapaosm
-  get "/casos/refresca", to: "casos#refresca", as: :casos_refresca
-  get "/admin/categorias/filtratviolencia", to: "admin/categorias#filtra_por_tviolencia"
-  get "/combatientes/nuevo", to: "combatientes#nuevo"
-
-  get "/conteos/genvic", to: "conteos#genvic", as: :conteos_genvic
-  get "/conteos/personas", to: "conteos#personas", as: :conteos_personas
-  post "/conteos/personas", to: "conteos#personas", as: :post_conteos_personas
-  get "/conteos/victimizaciones", to: "conteos#victimizaciones",
-    as: :conteos_victimizaciones
-
-  get "/fichacasovertical", to: "hogar#fichacasovertical"
-
-  get "/graficar/actos_individuales", to: "fil23_gen/graficar_plotly#actos_individuales",
-    :as => "graficar_actos_individuales"
-
-  get "/graficar/victimizaciones_individuales", to: "graficar_victimizaciones_individuales#graficar",
-    :as => "graficar_victimizaciones_individuales"
-
-  post "/graficar/victimizaciones_individuales", to: "graficar_victimizaciones_individuales#graficar",
-    :as => "enviar_graficar_victimizaciones_individuales"
-
-  get "/hogar", to: "hogar#index"
-
-  get "/admin/presponsables/nuevo", to: "admin/presponsables#nuevo"
-
-  get "/admin/presponsables/arbol", to: "admin/presponsables#arbol",
-    as: :arbol_presponsables
-
-  get "/mapadep/victimizaciones", to: "mapadep#victimizaciones",
-    as: :mapadepvic
-
-  get "/mapamun/victimizaciones", to: "mapamun#victimizaciones",
-    as: :mapamunvic
-
-  get "/personas/remplazarfamiliar", to: "/msip/personas#remplazarfamiliar"
-
-  get "/tablasbasicas", to: "hogar#tablasbasicas"
-
-  get "/ubicaciones/nuevo", to: "ubicaciones#nuevo"
-
-  get "/validarcasos", to: "validarcasos#validar", as: :validarcasos
-  post "/validarcasos", to: "validarcasos#validar", as: :envia_validarcasos
-
-  get "/victimascolectivas/nuevo", to: "victimascolectivas#nuevo"
-
   resources :actos, only: [], param: :index do
     member do
       delete "(:id)", to: "actos#destroy", as: "eliminar"
@@ -79,20 +17,24 @@
     end
   end
 
+  get "/admin/categorias/filtratviolencia", to: "admin/categorias#filtra_por_tviolencia"
+
+  get "/admin/presponsables/nuevo", to: "admin/presponsables#nuevo"
+  get "/admin/presponsables/arbol",
+    to: "admin/presponsables#arbol",
+    as: :arbol_presponsables
+
   resources :anexo_casos, only: [], param: :index do
     member do
       delete "(:id)", to: "anexo_casos#destroy", as: "eliminar"
       post "/", to: "anexo_casos#create", as: "crear"
     end
   end
 
-  resources :casos, path_names: { new: "nuevo", edit: "edita" } do
-    collection { post :importa }
-    member do
-      patch :guardar_y_editar
-      patch :resolver_solicitud
-    end
-  end
+  get "/buscarrepetidos", to: "buscarrepetidos#reportar", as: :buscarrepetidos
+  post "/buscarrepetidos",
+    to: "buscarrepetidos#reportar",
+    as: :envia_buscarrepetidos
 
   resources :caso_etiqueta, only: [], param: :index do
     member do
@@ -136,34 +78,106 @@
     end
   end
 
+  resources :casos, path_names: { new: "nuevo", edit: "edita" } do
+    collection { post :importa }
+    member do
+      patch :guardar_y_editar
+      patch :resolver_solicitud
+    end
+  end
+
+  get "/casos/busca", to: "casos#busca"
+  get "/casos/cuenta", to: "casos#cuenta"
+  get "/casos/datos-osm", to: "casos#presenta_datos_mapaosm"
+  get "/casos/errores_importacion",
+    to: "casos#errores_importacion",
+    as: :casos_errores_importacion
+  get "/casos/importarrelatos", to: "casos#importarrelatos"
+  get "/casos/:id/fichaimp",
+    to: "casos#fichaimp",
+    as: :caso_fichaimp
+  get "/casos/:id/fichapdf",
+    to: "casos#fichapdf",
+    as: :caso_fichapdf
+  get "/casos/lista", to: "casos#lista"
+  get "/casos/mapaosm", to: "casos#mapaosm", as: :casos_mapaosm
+  get "/casos/refresca", to: "casos#refresca", as: :casos_refresca
+
   resources :combatiente, only: [], param: :index do
     member do
       delete "(:id)", to: "combatientes#destroy", as: "eliminar"
       post "/", to: "combatientes#create", as: "crear"
     end
   end
 
+  get "/combatientes/nuevo", to: "combatientes#nuevo"
+
+  get "/conteos/genvic", to: "conteos#genvic", as: :conteos_genvic
+  get "/conteos/personas", to: "conteos#personas", as: :conteos_personas
+  post "/conteos/personas", to: "conteos#personas", as: :post_conteos_personas
+  get "/conteos/victimizaciones",
+    to: "conteos#victimizaciones",
+    as: :conteos_victimizaciones
+
   resources :familiar, only: [], param: :index do
     member do
       delete "(:id)", to: "familiares#eliminar_familiar", as: "eliminar"
       post "/", to: "familiares#crear_familiar", as: "crear"
     end
   end
 
+  get "/fichacasovertical", to: "hogar#fichacasovertical"
+
+  get "/graficar/actos_individuales",
+    to: "fil23_gen/graficar_plotly#actos_individuales",
+    as: "graficar_actos_individuales"
+
+  get "/graficar/victimizaciones_individuales",
+    to: "graficar_victimizaciones_individuales#graficar",
+    as: "graficar_victimizaciones_individuales"
+
+  post "/graficar/victimizaciones_individuales",
+    to: "graficar_victimizaciones_individuales#graficar",
+    as: "enviar_graficar_victimizaciones_individuales"
+
+  get "/hogar", to: "hogar#index"
+
+  get "/mapadep/victimizaciones",
+    to: "mapadep#victimizaciones",
+    as: :mapadepvic
+
+  get "/mapamun/victimizaciones",
+    to: "mapamun#victimizaciones",
+    as: :mapamunvic
+
+  get "/personas/remplazarfamiliar", to: "/msip/personas#remplazarfamiliar"
+
+  get "/tablasbasicas", to: "hogar#tablasbasicas"
+
+  get "/ubicaciones/nuevo", to: "ubicaciones#nuevo"
+
+  get "/validarcasos", to: "validarcasos#validar", as: :validarcasos
+  post "/validarcasos", to: "validarcasos#validar", as: :envia_validarcasos
+
   resources :victimas, only: [], param: :index do
     member do
       delete "(:id)", to: "victimas#destroy", as: "eliminar"
       post "/", to: "victimas#create", as: "crear"
     end
   end
 
+  get "/victimas", to: "victimas#index", as: "victimas"
+
+  get "/victimas/nuevo", to: "victimas#nuevo"
+
   resources :victimascolectivas, only: [], param: :index do
     member do
       delete "(:id)", to: "victimascolectivas#destroy", as: "eliminar"
       post "/", to: "victimascolectivas#create", as: "crear"
     end
   end
-  get "/victimas", to: "victimas#index", as: "victimas"
+
+  get "/victimascolectivas/nuevo", to: "victimascolectivas#nuevo"
 
   namespace :admin do
     ab = Ability.new

test/controllers/sivel2_gen/casos_controller_test.rb

@@ -29,6 +29,7 @@ class CasosControllerTest < ActionDispatch::IntegrationTest
       Caso.create!(PRUEBA_CASOV)
       Sivel2Gen::Conscaso.refresca_conscaso
       get casos_path
+
       assert_response :success
       puts @response.body
 
@@ -57,7 +58,7 @@ class CasosControllerTest < ActionDispatch::IntegrationTest
       assert_select "form" do
         assert_select("input#caso_fecha[name=?]", "caso[fecha]")
         assert_select("textarea#caso_memo[name=?]", "caso[memo]")
-        #verifica_formulario
+        # verifica_formulario
       end
     end
 

test/dummy/config/environments/test.rb

@@ -13,7 +13,6 @@
   # While tests run files are not watched, reloading is not necessary.
   config.enable_reloading = false
 
-
   config.assets.css_compressor = nil
 
   # Eager loading loads your entire application. When running a single test locally,