Skip to content

Commit

Permalink
correcciones de rubocop. Closes #119
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Mar 14, 2023
1 parent 50947bc commit e9265cc
Show file tree
Hide file tree
Showing 134 changed files with 2,331 additions and 1,917 deletions.
157 changes: 80 additions & 77 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,120 +1,127 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# frozen_string_literal: true

gem 'acts_as_list'
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'apexcharts',
git: 'https://github.com/styd/apexcharts.rb.git', branch: :master
gem "acts_as_list"

gem "apexcharts",
git: "https://github.com/styd/apexcharts.rb.git",
branch: :master

gem 'babel-transpiler'
gem "babel-transpiler"

gem 'bcrypt'
gem "bcrypt"

gem "best_in_place", git: "https://github.com/mmotherwell/best_in_place"

gem 'bootsnap', '>=1.1.0', require: false
gem "bootsnap", ">=1.1.0", require: false

gem 'cancancan'
gem "cancancan"

gem 'cocoon', git: 'https://github.com/vtamara/cocoon.git',
branch: 'new_id_with_ajax' # Formularios anidados (algunos con ajax)
gem "cocoon",
git: "https://github.com/vtamara/cocoon.git",
branch: "new_id_with_ajax" # Formularios anidados (algunos con ajax)

gem 'coffee-rails' # CoffeeScript para recuersos .js.coffee y vistas
gem "coffee-rails" # CoffeeScript para recuersos .js.coffee y vistas

gem 'color'
gem "color"

gem 'devise' # Autenticación y roles
gem "devise" # Autenticación y roles

gem 'devise-i18n'
gem "devise-i18n"

gem 'hotwire-rails'
gem "hotwire-rails"

gem 'jbuilder' # API JSON facil. Ver: https://github.com/rails/jbuilder
gem "jbuilder" # API JSON facil. Ver: https://github.com/rails/jbuilder

gem 'jsbundling-rails'
gem "jsbundling-rails"

gem 'kt-paperclip', # Anexos
git: 'https://github.com/kreeti/kt-paperclip.git'
gem "kt-paperclip", # Anexos
git: "https://github.com/kreeti/kt-paperclip.git"

gem 'libxml-ruby'
gem "libxml-ruby"

gem 'odf-report' # Genera ODT
gem "odf-report" # Genera ODT

gem 'nokogiri', '>=1.11.1'
gem "nokogiri", ">=1.11.1"

gem 'parslet'
gem "parslet"

gem 'pg' # Postgresql
gem "pg" # Postgresql

gem 'prawn' # Generación de PDF
gem "prawn" # Generación de PDF

gem 'prawnto_2', :require => 'prawnto'
gem "prawnto_2", require: "prawnto"

gem 'prawn-table'
gem "prawn-table"

gem 'rack'
gem "rack"

gem 'rack-cors'
gem "rack-cors"

gem 'rails', '~> 7.0'
#git: 'https://github.com/rails/rails.git', branch: '6-1-stable'
gem "rails", "~> 7.0"
# git: 'https://github.com/rails/rails.git', branch: '6-1-stable'

gem 'rails-i18n'
gem "rails-i18n"

gem 'redcarpet' # Markdown
gem "redcarpet" # Markdown

gem 'rspreadsheet' # Genera ODS
gem "rspreadsheet" # Genera ODS

gem 'rubyzip', '>= 2.0'
gem "rubyzip", ">= 2.0"

gem 'sassc-rails' # Hojas de estilo con SCSS
gem "sassc-rails" # Hojas de estilo con SCSS

gem 'simple_form' # Formularios simples
gem "simple_form" # Formularios simples

gem 'sprockets-rails'
gem "sprockets-rails"

gem 'stimulus-rails'
gem "stimulus-rails"

gem 'turbo-rails', '~> 1.0'
gem "turbo-rails", "~> 1.0"

gem 'twitter_cldr' # ICU con CLDR
gem "twitter_cldr" # ICU con CLDR

gem 'tzinfo' # Zonas horarias

gem 'will_paginate' # Listados en páginas
gem "tzinfo" # Zonas horarias

gem "will_paginate" # Listados en páginas

#####
# Motores que se sobrecargan vistas (a diferencia de las anteriores gemas,
# estas ponerse en orden de apilamiento lógico y no alfabético).

gem 'msip', # Motor generico
git: 'https://gitlab.com/pasosdeJesus/msip.git', branch: :main
#path: '../msip'

gem 'mr519_gen', # Motor de gestion de formularios y encuestas
git: 'https://gitlab.com/pasosdeJesus/mr519_gen.git', branch: :main
#path: '../mr519_gen'

gem 'heb412_gen', # Motor de nube y llenado de plantillas
git: 'https://gitlab.com/pasosdeJesus/heb412_gen.git', branch: :main
#path: '../heb412_gen'

gem 'sivel2_gen', # Motor para manejo de casos
git: 'https://gitlab.com/pasosdeJesus/sivel2_gen.git', branch: :main
#path: '../sivel2_gen'

gem 'cor1440_gen',
git: 'https://gitlab.com/pasosdeJesus/cor1440_gen.git', branch: :main
#path: '../cor1440_gen'

gem 'jos19',
git: 'https://gitlab.com/pasosdeJesus/jos19.git', branch: :main
#path: '../jos19'

group :development, :test do

gem "msip", # Motor generico
git: "https://gitlab.com/pasosdeJesus/msip.git",
branch: :main
# path: '../msip'

gem "mr519_gen", # Motor de gestion de formularios y encuestas
git: "https://gitlab.com/pasosdeJesus/mr519_gen.git",
branch: :main
# path: '../mr519_gen'

gem "heb412_gen", # Motor de nube y llenado de plantillas
git: "https://gitlab.com/pasosdeJesus/heb412_gen.git",
branch: :main
# path: '../heb412_gen'

gem "sivel2_gen", # Motor para manejo de casos
git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git",
branch: :main
# path: '../sivel2_gen'

gem "cor1440_gen",
git: "https://gitlab.com/pasosdeJesus/cor1440_gen.git",
branch: :main
# path: '../cor1440_gen'

gem "jos19",
git: "https://gitlab.com/pasosdeJesus/jos19.git",
branch: :main
# path: '../jos19'

group :development, :test do
gem "brakeman"

gem "bundler-audit"
Expand All @@ -136,14 +143,11 @@ group :development, :test do
gem "rubocop-shopify"
end


group :development do
gem 'web-console'
gem "web-console"
end


group :test do

gem "capybara"

gem "connection_pool"
Expand All @@ -161,7 +165,6 @@ group :test do
gem "spork" # Un proceso para cada prueba -- acelera
end


group :production do
gem 'unicorn' # Para despliegue
gem "unicorn" # Para despliegue
end
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

Expand Down
2 changes: 2 additions & 0 deletions app/channels/application_cable/channel.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ApplicationCable
class Channel < ActionCable::Channel::Base
end
Expand Down
2 changes: 2 additions & 0 deletions app/channels/application_cable/connection.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ApplicationCable
class Connection < ActionCable::Connection::Base
end
Expand Down
2 changes: 2 additions & 0 deletions app/channels/consumer_channel.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ConsumerChannel < ApplicationCable::Channel
def subscribed
# stream_from "some_channel"
Expand Down
21 changes: 11 additions & 10 deletions app/controllers/admin/cargosestado_controller.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

module Admin
class CargosestadoController < Msip::Admin::BasicasController
before_action :set_cargoestado,
before_action :set_cargoestado,
only: [:show, :edit, :update, :destroy]
load_and_authorize_resource class: ::Cargoestado
load_and_authorize_resource class: ::Cargoestado

def clase
def clase
"::Cargoestado"
end

Expand All @@ -14,21 +16,20 @@ def set_cargoestado

def atributos_index
[
:id,
:nombre,
:observaciones,
:fechacreacion_localizada,
:habilitado
:id,
:nombre,
:observaciones,
:fechacreacion_localizada,
:habilitado,
]
end

def genclase
'M'
"M"
end

def cargoestado_params
params.require(:cargoestado).permit(*atributos_form)
end

end
end
3 changes: 2 additions & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# frozen_string_literal: true

class ApplicationController < Msip::ApplicationController
protect_from_forgery with: :exception

# No requiere autorización
end

Loading

0 comments on commit e9265cc

Please sign in to comment.