mensa 0.1.17 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc582f0601ddada5b6094c998bb12055f7e4f7a76041110dcfc67e8a7599ac9f
-  data.tar.gz: 0a361238b407f120f93dde2c33c4e145a0d209f476cc2cae2d3b67efa7a7acc9
+  metadata.gz: 7393ecb783abf8a65f707744bc94c3dda05fc62b3c607eba3c3700b1ce93fa28
+  data.tar.gz: ad6f2d96a68cac83adb19d9e9cb62f9dd0de72d830306a1420b6fbc14e2f71d9
 SHA512:
-  metadata.gz: 5f87d29a037912a77a49822ecdf44f9415ab3ee14220795852375e3945346dbe17a690a2cdced51e41c493506b07c1d638decfe83963a0cf5d6dff186364c02d
-  data.tar.gz: 7849061d3b9adccb16fc139c0b5c04713c46fd23fac455afa2e93f0fe0c9abb268615a719558dbbd27460d6c20331daa3de1bf64756cfd5b8d03291759747a90
+  metadata.gz: 4935b9ade5b6a239f40bf81a051c772e469f6abf5ee3d619949940bee52e9ccd54d5c1ab6cb9113dc837e6a196977a6c8cb7bdad72438f5519a9eb5d66a9c1a5
+  data.tar.gz: 5a2edf045417c7a48b1fb1ee07291221221b89857f6c94592f9dc8297d40db1fdbe39829f4d7b86cfc8b980d36d5df236cd402bf9c4cb0e18cc7c597bd108a21

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: git@github.com:entdec/satis.git
-  revision: 05bc9102ca082061d7c6d649dfffa509283368d0
+  revision: 1ef5f70700a755f01ed49168929200b2aaec792d
   branch: main
   specs:
-    satis (2.1.62)
+    satis (2.2.1)
       browser
       diffy
       importmap-rails
@@ -17,10 +17,10 @@ GIT
 PATH
   remote: .
   specs:
-    mensa (0.1.16)
+    mensa (0.2.0)
       caxlsx_rails (~> 0)
       importmap-rails
-      pagy (>= 6)
+      pagy (>= 43)
       rails (>= 7.1)
       slim
       stimulus-rails
@@ -31,29 +31,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
+    action_text-trix (2.1.15)
+      railties
+    actioncable (8.1.1)
+      actionpack (= 8.1.1)
+      activesupport (= 8.1.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionmailbox (8.1.1)
+      actionpack (= 8.1.1)
+      activejob (= 8.1.1)
+      activerecord (= 8.1.1)
+      activestorage (= 8.1.1)
+      activesupport (= 8.1.1)
       mail (>= 2.8.0)
-    actionmailer (8.0.2)
-      actionpack (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionmailer (8.1.1)
+      actionpack (= 8.1.1)
+      actionview (= 8.1.1)
+      activejob (= 8.1.1)
+      activesupport (= 8.1.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.2)
-      actionview (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionpack (8.1.1)
+      actionview (= 8.1.1)
+      activesupport (= 8.1.1)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -61,42 +63,43 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.2)
-      actionpack (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    actiontext (8.1.1)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.1)
+      activerecord (= 8.1.1)
+      activestorage (= 8.1.1)
+      activesupport (= 8.1.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.2)
-      activesupport (= 8.0.2)
+    actionview (8.1.1)
+      activesupport (= 8.1.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.0.2)
-      activesupport (= 8.0.2)
+    activejob (8.1.1)
+      activesupport (= 8.1.1)
       globalid (>= 0.3.6)
-    activemodel (8.0.2)
-      activesupport (= 8.0.2)
-    activerecord (8.0.2)
-      activemodel (= 8.0.2)
-      activesupport (= 8.0.2)
+    activemodel (8.1.1)
+      activesupport (= 8.1.1)
+    activerecord (8.1.1)
+      activemodel (= 8.1.1)
+      activesupport (= 8.1.1)
       timeout (>= 0.4.0)
-    activestorage (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activesupport (= 8.0.2)
+    activestorage (8.1.1)
+      actionpack (= 8.1.1)
+      activejob (= 8.1.1)
+      activerecord (= 8.1.1)
+      activesupport (= 8.1.1)
       marcel (~> 1.0)
-    activesupport (8.0.2)
+    activesupport (8.1.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -105,8 +108,7 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.3.1)
     browser (6.2.0)
     builder (3.3.0)
     capybara (3.40.0)
@@ -118,37 +120,38 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    caxlsx (4.2.0)
+    caxlsx (4.4.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
-      rubyzip (>= 1.3.0, < 3)
+      rubyzip (>= 2.4, < 4)
     caxlsx_rails (0.6.4)
       actionpack (>= 3.1)
       caxlsx (>= 3.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     crass (1.0.6)
-    date (3.4.1)
+    date (3.5.0)
     diffy (3.4.4)
     drb (2.2.3)
-    erb (5.0.1)
+    erb (5.1.3)
     erubi (1.13.1)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
     htmlentities (4.3.4)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    importmap-rails (2.1.0)
+    importmap-rails (2.2.2)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    io-console (0.8.0)
-    irb (1.15.2)
+    io-console (0.8.1)
+    irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    json (2.15.2)
     jsonb_accessor (1.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
@@ -157,17 +160,18 @@ GEM
     loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
-    matrix (0.4.2)
+    marcel (1.1.0)
+    matrix (0.4.3)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.8)
+    minitest (5.26.0)
+    net-imap (0.5.12)
       date
       net-protocol
     net-pop (0.1.2)
@@ -176,26 +180,34 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
+    nio4r (2.7.5)
+    nokogiri (1.18.10-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-musl)
+    nokogiri (1.18.10-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm-linux-gnu)
+    nokogiri (1.18.10-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm-linux-musl)
+    nokogiri (1.18.10-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-musl)
+    nokogiri (1.18.10-x86_64-linux-musl)
       racc (~> 1.4)
-    pagy (9.3.4)
-    pg (1.5.9)
-    pp (0.6.2)
+    pagy (43.0.0)
+      json
+      yaml
+    pg (1.6.2)
+    pg (1.6.2-aarch64-linux)
+    pg (1.6.2-aarch64-linux-musl)
+    pg (1.6.2-arm64-darwin)
+    pg (1.6.2-x86_64-darwin)
+    pg (1.6.2-x86_64-linux)
+    pg (1.6.2-x86_64-linux-musl)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
     pry (0.15.2)
@@ -205,10 +217,10 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.0)
+    puma (7.1.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.4)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -216,20 +228,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (8.0.2)
-      actioncable (= 8.0.2)
-      actionmailbox (= 8.0.2)
-      actionmailer (= 8.0.2)
-      actionpack (= 8.0.2)
-      actiontext (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activemodel (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    rails (8.1.1)
+      actioncable (= 8.1.1)
+      actionmailbox (= 8.1.1)
+      actionmailer (= 8.1.1)
+      actionpack (= 8.1.1)
+      actiontext (= 8.1.1)
+      actionview (= 8.1.1)
+      activejob (= 8.1.1)
+      activemodel (= 8.1.1)
+      activerecord (= 8.1.1)
+      activestorage (= 8.1.1)
+      activesupport (= 8.1.1)
       bundler (>= 1.15.0)
-      railties (= 8.0.2)
+      railties (= 8.1.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -237,29 +249,31 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
+    railties (8.1.1)
+      actionpack (= 8.1.1)
+      activesupport (= 8.1.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
-    rake (13.3.0)
-    rdoc (6.14.0)
+    rake (13.3.1)
+    rdoc (6.15.1)
       erb
       psych (>= 4.0.0)
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+      tsort
+    regexp_parser (2.11.3)
+    reline (0.6.2)
       io-console (~> 0.5)
-    rexml (3.4.1)
-    rubyzip (2.4.1)
+    rexml (3.4.4)
+    rubyzip (3.2.2)
     securerandom (0.4.1)
-    selenium-webdriver (4.33.0)
+    selenium-webdriver (4.38.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
     slim (5.2.1)
       temple (~> 0.10.0)
@@ -283,23 +297,23 @@ GEM
     tailwindcss-ruby (3.4.17-arm64-darwin)
     tailwindcss-ruby (3.4.17-x86_64-darwin)
     tailwindcss-ruby (3.4.17-x86_64-linux)
-    temple (0.10.3)
+    temple (0.10.4)
     textacular (5.7.0)
       activerecord (>= 5.0)
-    thor (1.3.2)
-    tilt (2.6.0)
-    timeout (0.4.3)
-    turbo-rails (2.0.16)
+    thor (1.4.0)
+    tilt (2.6.1)
+    timeout (0.4.4)
+    tsort (0.2.0)
+    turbo-rails (2.0.20)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.3)
+    uri (1.1.1)
     useragent (0.16.11)
-    view_component (3.23.2)
-      activesupport (>= 5.2.0, < 8.1)
+    view_component (4.1.0)
+      activesupport (>= 7.1.0, < 8.2)
       concurrent-ruby (~> 1)
-      method_source (~> 1.0)
     websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
@@ -307,6 +321,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    yaml (0.4.0)
     zeitwerk (2.7.3)
 
 PLATFORMS

data/README.md

@@ -76,18 +76,16 @@ You can show your tables on the page using the following:
 
 #### Views
 
-Initial support for views is there, but pretty rudementary:
+Initial support for views is there, but pretty rudimentary:
 `Mensa::TableView.create(table: "users", name: "Guests", data: {filters: {role: "guest"}})`
 
 ### Fast
 
 Mensa selects only the data it needs, based on the columns. Sometimes it needs additional columns to do it's work, but you don't want them displayed.
-This can be done by adding `internal true` to the column definition.
+This can be done by adding `internal true` to the column definition, or shorter: use `internal` instead
 
 ```ruby
-column :born_on do
-  internal true # Needed for age below
-end
+internal :born_on 
 column :age do
   attribute "EXTRACT(YEAR FROM AGE(born_on))::int"
 end

data/app/components/mensa/view/component.html.slim

@@ -10,8 +10,8 @@
     tbody
       = render(Mensa::TableRow::Component.with_collection(table.rows, table: table))
 
-  - if table.pagy_details&.pages > 1 || table.pagy_details.count == 0
+  - if table.pagy_details&.last > 1 || table.pagy_details.count == 0
     .paging
-      == pagy_info(table.pagy_details)
-      - if table.pagy_details&.pages > 1
-        == pagy_nav(table.pagy_details, anchor_string: 'data-turbo-frame="_self"')
+      == table.pagy_details.info_tag
+      - if table.pagy_details&.last > 1
+        == table.pagy_details.series_nav(anchor_string: 'data-turbo-frame="_self"')

data/app/controllers/mensa/tables_controller.rb

@@ -18,6 +18,7 @@ module Mensa
       config = config.merge(params.permit(:format, :query, :id, :page, :table_view_id, :turbo_frame_id, order: {}, filters: {}).to_h)
 
       @table = Mensa.for_name(params[:id], config)
+      @table.request = request
       @table.table_view = @view
       @table.original_view_context = helpers
 

data/app/helpers/mensa/tables_helper.rb

@@ -1,5 +1,4 @@
 module Mensa
   module TablesHelper
-    include Pagy::Frontend
   end
 end

data/app/tables/mensa/base.rb

@@ -1,14 +1,14 @@
 module Mensa
   class Base
-    include Pagy::Backend
+    include Pagy::Method
     include ConfigReaders
     include Scope
 
     attr_writer :original_view_context
-    attr_accessor :component, :name, :table_view
+    attr_accessor :component, :name, :table_view, :request
     attr_reader :config, :params
 
-    config_reader :model
+    config_reader :model, proc: true
     config_reader :link
     config_reader :supports_views?
     config_reader :supports_custom_views?

data/app/tables/mensa/config/table_dsl.rb

@@ -48,8 +48,9 @@ module Mensa::Config
   class TableDsl
     include DslLogic
 
-    option :model, default: -> { self.class.name.demodulize.to_s.classify.constantize rescue raise "No model found for #{self.class.name}" }
+    option :model, default: -> { self.class.name.demodulize.to_s.classify.gsub("Table","").singularize.constantize rescue raise "No model found for #{self.class.name}" }
     option :column, dsl_hash: Mensa::Config::ColumnDsl
+    option :internal, dsl_hash: Mensa::Config::ColumnDsl, default: {internal: true}
     option :link
 
     option :exportable, default: true

data/app/tables/mensa/config_readers.rb

@@ -3,11 +3,13 @@ module Mensa
     extend ActiveSupport::Concern
 
     class_methods do
-      def config_reader(name)
+      # Having proc here should not necessary, but not having it gave me issues with row links
+      def config_reader(name, proc: false)
         define_method name do
-          config[name.to_s.gsub("?", "").to_sym]
+          value = config[name.to_s.gsub("?", "").to_sym]
+          proc == true && value.is_a?(Proc) ? instance_exec(&value) : value
         end
       end
     end
   end
-end
+end

data/app/tables/mensa/scope.rb

@@ -72,7 +72,7 @@ module Mensa
     def pagy_object
       return if @pagy_details && @records
 
-      @pagy_details, @records = selected_scope.is_a?(Array) ? pagy_array(ordered_scope, anchor_string: 'data-turbo-frame="_self"') : pagy(selected_scope, anchor_string: 'data-turbo-frame="_self"')
+      @pagy_details, @records = selected_scope.is_a?(Array) ? pagy(:offset, ordered_scope, anchor_string: 'data-turbo-frame="_self"') : pagy(:offset, selected_scope, anchor_string: 'data-turbo-frame="_self"')
     end
 
     # Though this works, perhaps moving this in column(s) is nicer

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.1.17"
+  VERSION = "0.2.1"
 end

data/mensa.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'caxlsx_rails', '~> 0'
   spec.add_dependency "rails", ">= 7.1"
-  spec.add_dependency 'pagy', '>=6'
+  spec.add_dependency 'pagy', '>=43'
   spec.add_dependency 'textacular', '>=5'
 
   spec.add_dependency 'slim'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.2.1
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-03 00:00:00.000000000 Z
+date: 2025-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '43'
 - !ruby/object:Gem::Dependency
   name: textacular
   requirement: !ruby/object:Gem::Requirement