base_editing_bootstrap 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 621ce2921cb1a39524a523807983ec5e099d0646d9eb06d40a15d4f8d59d9720
-  data.tar.gz: d7695f7d33150def36bdc1bf5ec357f4c6cb0367b5143ec152fb338d779fba5d
+  metadata.gz: 6f004a238acce2ed0c9ffa8d95e4d6bb264c700ec80a215d1b6f549580300cc1
+  data.tar.gz: 5425f4a870b9d52b5f06364fdb97c4f2992561a4a3165b1959d0cdd60165259b
 SHA512:
-  metadata.gz: 3329ab7c65c74ff2e8b5e91a0f6e3d27f2599e8ad0800f02e53cdb9f70706145a879c147c5c6224d21ac602b2789c7cae531115e899a564060f2a953470b17c5
-  data.tar.gz: 56b1f76f086abb48c95e9a760af3d2cfc0f5e75bfe427119a74ebb990ef9e6d8fe1c69e559c9852eafa2db813546a0e461eb87449b8183ed4dc8639c18a324b6
+  metadata.gz: f105eb6fa77aa2ef3298449106ab2d2c13777f4889db008381755ceb3a8bb99cd5a7d70647988571288db3b23d00db38a35ffdcea21581b393e81fa6bbd0f3b1
+  data.tar.gz: 422b293959d2e6f60e8ae57d3dce6e5961c784fe505101c61e770b9c455d9be2f2f6e1209e436e464de75c557b4d19864cf5284fc978430828cdd104a45aee70

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
 - - -
+## 2.0.2 - 2026-10-15
+#### Bug Fixes
+- Aggiorna la dipendenza di ransack per supportare versioni maggiori (#31) - (014d9bd) - Marino Bonetti
+- Order by when distinct==true in ransack (#30) - (d86854a) - Marino Bonetti
+
+- - -
+
 ## 2.0.1 - 2026-09-17
 #### Bug Fixes
 - Correzione limitazione numero sub_elements in nested - (7cc9889) - Marino Bonetti

data/README.md

@@ -431,6 +431,12 @@ docker compose up
   ./bin/local_ci_matrix.sh
 ```
 
+### Testare diverse versioni Rails e Ruby
+
+```bash
+  ./bin/local_ci_matrix.sh --rails 8.1 --ruby 4.0 --keep-docker-cache
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/base_editing_bootstrap.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   # Policy
   spec.add_dependency "pundit", ["~> 2.3", ">= 2.3.1"]
   # Search
-  spec.add_dependency 'ransack', ['~> 4.0', '>= 4.0.0']
+  spec.add_dependency 'ransack', ['>= 4.0.0']
   # Pagination
   spec.add_dependency 'kaminari', ['~> 1.2', '>= 1.2.2']
   spec.add_dependency 'kaminari-i18n', '~> 0.5'

data/lib/base_editing_bootstrap/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/base_editing_bootstrap/searches/base.rb

@@ -27,13 +27,41 @@ module BaseEditingBootstrap::Searches
     # Risultato della ricerca, fa da pipeline verso ransack
     # Impostando il sort nel caso in cui non sia già stato impostato da ransack
     def results
-      ransack_query
-        .tap { |r| r.sorts = @sorts if r.sorts.empty? }
-        .result(distinct: @distinct)
+      query = ransack_query
+      query.sorts = @sorts if query.sorts.empty?
+
+      relation = query.result(distinct: @distinct)
+      relation = distinct_order_columns(relation, query.sorts) if @distinct && query.sorts.any?
+
+      relation
         .tap { |q| Rails.logger.debug { "[Ransack] params:#{params} - sql: #{q.to_sql}" } }
         .page(params[:page])
     end
 
+    # PostgreSQL richiede che le colonne usate nell'ORDER BY siano nel SELECT quando DISTINCT è attivo.
+    # Aggiungiamo solo le colonne provenienti dalle join, perché la tabella base è già coperta da `table.*`.
+    def distinct_order_columns(relation, sorts)
+      order_columns = sorts.filter_map do |sort|
+        next unless sort.valid?
+
+        attribute = sort.attr
+        next unless attribute.respond_to?(:relation) && attribute.respond_to?(:name)
+
+        table_name = attribute.relation.name
+        next if table_name.nil? || table_name == model_klass.table_name
+
+        "#{relation.connection.quote_table_name(table_name)}.#{relation.connection.quote_column_name(attribute.name)}"
+      end.uniq
+
+      return relation if order_columns.empty?
+
+      relation
+        .unscope(:select)
+        .select("#{relation.connection.quote_table_name(relation.klass.table_name)}.*", *order_columns)
+    end
+
+    private :distinct_order_columns
+
     def ransack_query
       scope
         .ransack(params[:q], auth_object: user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: base_editing_bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Marino Bonetti
@@ -53,9 +53,6 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -63,9 +60,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -457,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: 'BaseEditing: funzionalità di base per cms rails'
 test_files: []