pg_rails 7.1.6 → 7.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ea11adc017949414ed89c42127ce6867418dcd461219fb56289a2832a938a6
-  data.tar.gz: 30ab308185ff7e68acebf1611161f55fa5d783bc95536db27a2026091637d69a
+  metadata.gz: 191011edebc40d5f12ef69b1dc820b578051ceaa04f44b8cc2d484d34eb702b9
+  data.tar.gz: 8d31123f512ab1e8e75ccd779911a9d91ccc704efce6d8ee00c8108f444734e9
 SHA512:
-  metadata.gz: 61685a1f498123e153ae0a635805566b69dbf177ad079da95e53221b81c05af957cdc9d8d0de63004d48d74801cf493a7062f303c227f9cdffa08a5834442941
-  data.tar.gz: 6c80c211396d351891a1c4071672bae515a629d933a128cd3e9f3b5fae4d948e624b9577645cee199bd10e4d6aa55b1aafa1278e4011dc7d1e7a87a60efede3e
+  metadata.gz: 930662b242df39cd0b10e125a7132c176f3d264f355eb7cb0e750e1998304c54858b14c99cdda286ce94f01503b1ccfed4a3b81a192c40e560b1803a8e14bcd7
+  data.tar.gz: 9097148fea5b072ddacf4f8aaf84b5c8ddb6cd71cc9f61e5e27cab061aeee0b0f5d395f14c82cc9990dd2fd0bfd1a3ec80aadcbf552dbe064079616a1adb1e8b

data/pg_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -73,6 +73,11 @@ input[type=datetime-local], input[type=datetime] {
   padding: 0em 0.3em;
 }
 
+.list-group-item {
+  --bs-list-group-item-padding-y: 0px;
+  --bs-list-group-item-padding-x: 0.3rem;
+}
+
 // FILTROS
 .filter {
   display: inline-block;

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -6,6 +6,7 @@ module PgEngine
       clazz.helper_method :atributos_para_mostrar
       clazz.helper_method :current_page_size
       clazz.helper_method :show_filters?
+      clazz.helper_method :available_page_sizes
     end
 
     # Public endpoints
@@ -18,11 +19,7 @@ module PgEngine
     end
 
     def index
-      @collection = filtros_y_policy atributos_para_buscar
-
-      shared_context = Ransack::Adapters::ActiveRecord::Context.new(@collection)
-      @q = @clase_modelo.ransack(params[:q], context: shared_context)
-      @collection = shared_context.evaluate(@q)
+      @collection = filtros_y_policy(atributos_para_buscar, default_sort)
 
       pg_respond_index
     end
@@ -57,6 +54,14 @@ module PgEngine
 
     protected
 
+    def default_sort
+      nil
+    end
+
+    def available_page_sizes
+      [10, 20, 30, 50, 100].push(current_page_size).uniq.sort
+    end
+
     def show_filters?
       cur_route = pg_current_route
       idtf = cur_route[:controller] + '#' + cur_route[:action] + '#open-filters'
@@ -72,15 +77,18 @@ module PgEngine
 
     def current_page_size
       if params[:page_size].present?
-        session[:page_size] = params[:page_size]
-        params[:page_size].to_i
-      else
-        default_page_size
+        session[page_size_session_key] = params[:page_size].to_i
       end
+
+      session[page_size_session_key].presence || default_page_size
+    end
+
+    def page_size_session_key
+      "#{controller_name}/#{action_name}/page_size"
     end
 
     def default_page_size
-      session[:page_size].present? ? session[:page_size].to_i : 10
+      10
     end
 
     def pg_respond_update
@@ -286,13 +294,20 @@ module PgEngine
       @clase_modelo ||= self.class.name.singularize.gsub('Controller', '').constantize
     end
 
-    def filtros_y_policy(campos)
+    def filtros_y_policy(campos, dflt_sort = nil)
       @filtros = PgEngine::FiltrosBuilder.new(
         self, clase_modelo, campos
       )
       scope = policy_scope(clase_modelo)
 
-      @filtros.filtrar(scope)
+      scope = @filtros.filtrar(scope)
+
+      shared_context = Ransack::Adapters::ActiveRecord::Context.new(scope)
+      @q = @clase_modelo.ransack(params[:q], context: shared_context)
+
+      @q.sorts = dflt_sort if @q.sorts.empty? && dflt_sort.present?
+
+      shared_context.evaluate(@q)
     end
 
     def default_scope_for_current_model

data/pg_engine/app/helpers/pg_engine/index_helper.rb

@@ -8,12 +8,12 @@ module PgEngine
         sort_field = input.last
       else
         campo = sort_field = input
+        sort_field = sort_field.to_s.sub(/_f\z/, '')
+        sort_field = sort_field.to_s.sub(/_text\z/, '')
       end
 
       campo = campo.to_s.sub(/_f\z/, '')
       campo = campo.to_s.sub(/_text\z/, '')
-      sort_field = sort_field.to_s.sub(/_f\z/, '')
-      sort_field = sort_field.to_s.sub(/_text\z/, '')
 
       clase = options[:clase] || @clase_modelo
       key = [controller_name, action_name, 'listado_header', campo].join('.')
@@ -21,7 +21,11 @@ module PgEngine
       human_name = clase.human_attribute_name(key, default: dflt)
 
       if options[:ordenable]
-        sort_link(@q, sort_field, human_name, default_order: default_order(campo))
+        if sort_field.is_a? Array
+          sort_link(@q, sort_field.first, sort_field, human_name, default_order: default_order(campo))
+        else
+          sort_link(@q, sort_field, human_name, default_order: default_order(campo))
+        end
       else
         human_name
       end

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -58,8 +58,15 @@ div
                   = object.edit_link(text: '', klass: 'btn-light')
                   = object.destroy_link
 
-    .ps-3.justify-content-center
+    .d-flex.justify-content-center
       = paginate(@collection)
+    .d-flex.align-items-center.justify-content-center.opacity-50
+      label.me-2 Filas por página:
+      ul.list-group.list-group-horizontal
+        - available_page_sizes.each do |page_size|
+          = link_to page_size,
+            namespaced_path(@clase_modelo, page_size:),
+            class: "list-group-item #{'active' if current_page_size == page_size}"
   - elsif @records_filtered
     - i18n_key = "#{controller_key}.#{action_name}.index.empty_but_filtered"
     p.m-3

data/pg_engine/spec/system/page_sizes_spec.rb

@@ -0,0 +1,26 @@
+# Initially generated with PgRails::SystemSpecGenerator
+# https://github.com/martin-rosso/pg_rails
+
+require 'rails_helper'
+
+# By default uses selenium_chrome_headless_iphone driver
+# run with DRIVER environment variable to override, eg:
+#
+# DRIVER=selenium rspec
+describe 'Page sizes' do
+  let(:logged_user) { create :user, :developer }
+
+  before do
+    login_as logged_user
+    create_list :cosa, 8
+  end
+
+  describe 'some case' do
+    it do
+      visit '/admin/cosas?page_size=2'
+      expect(page).to have_css('.page-item', count: 6)
+      visit '/admin/cosas?page_size=5'
+      expect(page).to have_css('.page-item', count: 4)
+    end
+  end
+end

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_rails/system_spec/USAGE

@@ -0,0 +1,5 @@
+Description:
+    Generates a system spec
+
+Example:
+    rails generate pg_rails:system_spec "Some feature"

data/pg_scaffold/lib/generators/pg_rails/system_spec/system_spec_generator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module PgRails
+  class SystemSpecGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('templates', __dir__)
+
+    def copy_application_policy
+      template 'system_spec.rb', "spec/system/#{file_name}.rb"
+    end
+
+    private
+
+    def file_name
+      "#{name.downcase.gsub(' ', '_')}_spec"
+    end
+  end
+end

data/pg_scaffold/lib/generators/pg_rails/system_spec/templates/system_spec.rb

@@ -0,0 +1,28 @@
+# Initially generated with PgRails::SystemSpecGenerator
+# https://github.com/martin-rosso/pg_rails
+
+require 'rails_helper'
+
+# By default uses selenium_chrome_headless_iphone driver
+# run with DRIVER environment variable to override, eg:
+#
+# DRIVER=selenium rspec
+describe '<%= name %>' do
+  subject(:visitar) do
+    visit 'some url'
+  end
+
+  let(:logged_user) { create :user }
+
+  before do
+    login_as logged_user
+  end
+
+  describe 'some case' do
+    it do
+      visitar
+
+      expect(page).to have_text 'some text'
+    end
+  end
+end

data/pg_scaffold/spec/generators_spec.rb

@@ -3,13 +3,15 @@ require 'rails_helper'
 require 'generators/pg_rspec/scaffold/scaffold_generator'
 require 'generators/pg_decorator/pg_decorator_generator'
 require 'generators/pg_active_record/model/model_generator'
+require 'generators/pg_rails/system_spec/system_spec_generator'
 
 TEST_ENV_NUMBER = ENV.fetch('TEST_ENV_NUMBER', '')
 DESTINATION_PATH = File.expand_path("./../../tmp/generator_testing#{TEST_ENV_NUMBER}", __dir__)
 
 describe 'Generators', type: :generator do
+  destination DESTINATION_PATH
+
   describe 'PgDecoratorGenerator' do
-    destination DESTINATION_PATH
     tests PgDecoratorGenerator
 
     before { prepare_destination }
@@ -24,7 +26,6 @@ describe 'Generators', type: :generator do
   end
 
   describe 'ScaffoldGenerator' do
-    destination DESTINATION_PATH
     tests PgRspec::Generators::ScaffoldGenerator
 
     before { prepare_destination }
@@ -40,7 +41,6 @@ describe 'Generators', type: :generator do
   end
 
   describe PgActiveRecord::ModelGenerator do
-    destination DESTINATION_PATH
     tests described_class
 
     before { prepare_destination }
@@ -53,4 +53,19 @@ describe 'Generators', type: :generator do
       end
     end
   end
+
+  describe PgRails::SystemSpecGenerator do
+    tests described_class
+
+    before { prepare_destination }
+
+    it do
+      run_generator(['Filtros en listados'])
+
+      my_assert_file 'spec/system/filtros_en_listados_spec.rb' do |content|
+        expect(content).to match(/rails_helper/)
+        expect(content).to include 'describe \'Filtros en listados\' do'
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.6
+  version: 7.1.8
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -791,6 +791,7 @@ files:
 - pg_engine/spec/system/destroy_spec.rb
 - pg_engine/spec/system/login_spec.rb
 - pg_engine/spec/system/noticed_spec.rb
+- pg_engine/spec/system/page_sizes_spec.rb
 - pg_engine/spec/system/send_mail_spec.rb
 - pg_engine/spec/system/signup_spec.rb
 - pg_engine/spec/system/tooltips_spec.rb
@@ -890,6 +891,9 @@ files:
 - pg_scaffold/lib/generators/pg_rails/instalar/USAGE
 - pg_scaffold/lib/generators/pg_rails/instalar/instalar_generator.rb
 - pg_scaffold/lib/generators/pg_rails/instalar/templates/pg_rails.rb
+- pg_scaffold/lib/generators/pg_rails/system_spec/USAGE
+- pg_scaffold/lib/generators/pg_rails/system_spec/system_spec_generator.rb
+- pg_scaffold/lib/generators/pg_rails/system_spec/templates/system_spec.rb
 - pg_scaffold/lib/generators/pg_resource_route/pg_resource_route_generator.rb
 - pg_scaffold/lib/generators/pg_rspec/model/model_generator.rb
 - pg_scaffold/lib/generators/pg_rspec/model/templates/model_spec.rb