pg_rails 7.0.5 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d63547ea3619de2194b7906e2344df8fe1ff049cd3b066ba1adcb61cf1ae8102
-  data.tar.gz: 5845c9d534c94be6ddb71823271d21f3d2c28615ba5d70d5a874478799d48eeb
+  metadata.gz: 7c4644fc0bcd9abce95b7cd8ac88f7779b7d8e6096590863d11fd1bbad1f1b7b
+  data.tar.gz: df1ffd480c688adc40f24613b9d00eb57fe45940067191a942bd18e9d53e1209
 SHA512:
-  metadata.gz: b7611fd24a756c4a7c6e8573f67b48dd0e9598839065feef9ac6345e8e09e0b71087db795647524f6f8bd9734fe67c6da54d4305391306441eddcaf6b0120937
-  data.tar.gz: 204dc0788a96e724b67038d0c89e1a8cecf69a1a4fd8f8ada7d105289ed0615641eed73e8353cf85acea3be573332d05583070650740c37ed53d891c2ec30579
+  metadata.gz: c9afa947ca3962f7e81973a798664900bccdc15ab6dd500c5b8573f5177212585cf35e78194c1219b6137f6dd3198d4e23ffd982702fdc2cac3cbf8ae1f2c8df
+  data.tar.gz: 4f26bb070447c9c07829628a2d99a7a8a0ec9a7ac8298ab2f4118444316cffa775ff3254577488d2c139d637468c995bc97c5b9d4adf561f17529cfe398d89c5

data/pg_associable/lib/pg_associable/simple_form_initializer.rb

@@ -3,7 +3,7 @@ SimpleForm.setup do |config|
                                   error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label, class: 'form-label'
     b.use :hidden_input
     b.wrapper tag: 'div', class: 'position-relative' do |ba|
       ba.use :input, class: 'form-control', disabled: true, placeholder: 'Clic para seleccionar...',
@@ -20,7 +20,7 @@ SimpleForm.setup do |config|
                                          error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'form-control-label'
+    b.use :label, class: 'form-label'
     b.use :hidden_input
     b.wrapper tag: 'div', class: 'search-box position-relative' do |ba|
       ba.use :search_form, error_class: 'is-invalid'

data/pg_engine/app/controllers/pg_engine/resource_helper.rb

@@ -30,7 +30,7 @@ module PgEngine
     end
 
     def new
-      add_breadcrumb "Crear #{@clase_modelo.nombre_singular.downcase}"
+      add_breadcrumb 'Crear'
     end
 
     def edit
@@ -71,21 +71,23 @@ module PgEngine
       session[:page_size].present? ? session[:page_size].to_i : 10
     end
 
-    def pg_respond_update(object: nil)
-      object ||= instancia_modelo
+    def pg_respond_update
+      object = instancia_modelo
       respond_to do |format|
         if (@saved = object.save)
           format.html { redirect_to object.decorate.target_object }
           format.json { render json: object.decorate }
         else
+          # TODO: esto solucionaría el problema?
+          # self.instancia_modelo = instancia_modelo.decorate
           format.html { render :edit, status: :unprocessable_entity }
           format.json { render json: object.errors, status: :unprocessable_entity }
         end
       end
     end
 
-    def pg_respond_create(object: nil)
-      object ||= instancia_modelo
+    def pg_respond_create
+      object = instancia_modelo
       respond_to do |format|
         if (@saved = object.save)
           if params[:asociable]
@@ -107,6 +109,8 @@ module PgEngine
           end
           format.json { render json: object.decorate }
         else
+          # TODO: esto solucionaría el problema?
+          # self.instancia_modelo = instancia_modelo.decorate
           if params[:asociable]
             format.turbo_stream do
               render turbo_stream:

data/pg_engine/app/decorators/pg_engine/base_decorator.rb

@@ -16,18 +16,20 @@ module PgEngine
       object.as_json.tap { |o| o[:to_s] = to_s }
     end
 
-    # def method_missing(method_name, *args, &block)
-    #   valor = object.attributes[method_name.to_s]
-    #   return super unless valor.present?
-
-    #   if valor.instance_of?(Date)
-    #     dmy(valor)
-    #   # elsif valor.class == ActiveSupport::TimeWithZone
-    #   #   dmy_time(valor)
-    #   else
-    #     super
-    #   end
-    # end
+    # rubocop:disable Style/MissingRespondToMissing
+    def method_missing(method_name, *args, &)
+      valor = object.attributes[method_name.to_s]
+      return super if valor.blank?
+
+      if valor.instance_of?(Date)
+        dmy(valor)
+      elsif valor.instance_of?(ActiveSupport::TimeWithZone)
+        dmy_time(valor)
+      else
+        super
+      end
+    end
+    # rubocop:enable Style/MissingRespondToMissing
 
     def destroy_link(message = '¿Estás seguro?')
       return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).destroy?

data/pg_engine/lib/pg_engine/core_ext.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 # require 'activesupport/time'
-module ActiveSupport
-  class TimeWithZone
-    def to_s(format = :default)
-      if format == :db
-        utc.to_s(format)
-      elsif formatter = ::Time::DATE_FORMATS[format] # rubocop:disable Lint/AssignmentInCondition
-        formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
-      else
-        # "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby Time#to_s format
-        time.strftime('%d/%m/%Y %H:%M')
-      end
-    end
-  end
-end
+# module ActiveSupport
+#   class TimeWithZone
+#     def to_s(format = :default)
+#       if format == :db
+#         utc.to_s(format)
+#       elsif formatter = ::Time::DATE_FORMATS[format]
+#         formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
+#       else
+#         # "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby Time#to_s format
+#         time.strftime('%d/%m/%Y %H:%M')
+#       end
+#     end
+#   end
+# end

data/pg_engine/lib/pg_engine/route_helpers.rb

@@ -1,7 +1,7 @@
 module PgEngine
   module RouteHelpers
-    def pg_resource(key)
-      resources(key) do
+    def pg_resource(key, options = {})
+      resources(key, options) do
         collection do
           get :abrir_modal
           post :buscar

data/pg_engine/lib/tasks/auto_anotar_modelos.rake

@@ -27,7 +27,7 @@ if Rails.env.development?
       'require'                     => '',
       'exclude_tests'               => 'true',
       'exclude_fixtures'            => 'true',
-      'exclude_factories'           => 'true',
+      'exclude_factories'           => 'false',
       'exclude_serializers'         => 'true',
       'exclude_scaffolds'           => 'true',
       'exclude_controllers'         => 'true',
@@ -35,7 +35,7 @@ if Rails.env.development?
       'exclude_sti_subclasses'      => 'false',
       'ignore_model_sub_dir'        => 'false',
       'ignore_columns'              => nil,
-      'ignore_routes'               => nil,
+      'ignore_routes'               => 'rails|active_admin',
       'ignore_unknown_models'       => 'false',
       # 'hide_limit_column_types'     => '<%= AnnotateModels::NO_LIMIT_COL_TYPES.join(",") %>',
       # 'hide_default_column_types'   => '<%= AnnotateModels::NO_DEFAULT_COL_TYPES.join(",") %>',

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.5'
+  VERSION = '7.0.6'
 end

data/pg_scaffold/lib/generators/pg_slim/templates/show.html.slim

@@ -17,7 +17,7 @@ table.table.table-borderless.table-sm.w-auto.mb-0.m-3
 <%- end -%>
   tr
     th = t('attributes.created_at')
-    td = dmy_time @<%= singular_name %>.created_at
+    td = @<%= singular_name %>.created_at
 <%- if options[:trackeo_de_usuarios] -%>
   tr
     th = t('attributes.actualizado_por')
@@ -25,14 +25,14 @@ table.table.table-borderless.table-sm.w-auto.mb-0.m-3
 <%- end -%>
   tr
     th = t('attributes.updated_at')
-    td = dmy_time @<%= singular_name %>.updated_at
+    td = @<%= singular_name %>.updated_at
 <%- if options[:paranoia] -%>
   tr
     th = t('attributes.deleted_at')
-    td = dmy_time @<%= singular_name %>.deleted_at
+    td = @<%= singular_name %>.deleted_at
 <%- end -%>
 <%- if options[:discard] -%>
   tr
     th = t('attributes.discarded_at')
-    td = dmy_time @<%= singular_name %>.discarded_at
+    td = @<%= singular_name %>.discarded_at
 <%- end -%>

data/pg_scaffold/lib/pg_scaffold/monkey_patches/mejoras_de_atributos.rb

@@ -12,9 +12,9 @@ module Rails
 
         def parse_type_and_options(type)
           case type
-          when /(string|text|binary|integer)\{(\d+)\}/
+          when /(string|text|binary|integer|decimal)\{(\d+)\}/
             [Regexp.last_match(1), { limit: Regexp.last_match(2).to_i }]
-          when /(string|text|binary|float|integer|date|datetime)\{(.+)\}/
+          when /(string|text|binary|float|integer|date|datetime|boolean|json|decimal)\{(.+)\}/
             type = Regexp.last_match(1)
             provided_options = Regexp.last_match(2).split(/[,.-]/)
             options = provided_options.to_h { |opt| [opt.to_sym, true] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.0.6
 platform: ruby
 authors:
 - Martín Rosso