mensa 0.2.2 → 0.2.4

data/app/controllers/mensa/tables_controller.rb

@@ -2,17 +2,15 @@ module Mensa
   class TablesController < ::ApplicationController
     layout :decide_layout
 
-    def index
-      render layout: 'mensa/application'
-    end
-
     def show
-      config = if params[:table_view_id]
-                 @view = Mensa::TableView.find_by(table_name: params[:id], id: params[:table_view_id])
-                 @view&.data || {}
-               else
-                 {}
-               end
+      @table = Mensa.for_name(params[:id])
+
+      config = {}
+      if params[:table_view_id]
+        @view = Mensa::TableView.find_by(table_name: params[:id], id: params[:table_view_id])
+        @view ||= @table.system_views.find { |v| v.id == params[:table_view_id].to_sym }
+        config = @view&.config
+      end
 
       config = config.merge(params.permit!.to_h)
       config = config.merge(params.permit(:format, :query, :id, :page, :table_view_id, :turbo_frame_id, order: {}, filters: {}).to_h)
@@ -33,7 +31,7 @@ module Mensa
     end
 
     def decide_layout
-      return false if params[:turbo_frame_id]
+      false if params[:turbo_frame_id]
     end
   end
 end

data/app/javascript/mensa/controllers/index.js

@@ -18,6 +18,9 @@ application.register("mensa-search", SearchComponentController);
 import TableComponentController from 'mensa/components/table/component_controller'
 application.register("mensa-table", TableComponentController);
 
+import ViewsComponentController from 'mensa/components/views/component_controller'
+application.register("mensa-views", ViewsComponentController);
+
 // Eager load all controllers defined in the import map under controllers/**/*_controller
 // import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
 // eagerLoadControllersFrom("controllers", application)

data/app/tables/mensa/action.rb

@@ -10,6 +10,7 @@ module Mensa
   # end
   class Action
     include ConfigReaders
+
     attr_reader :name, :table, :config
 
     def initialize(name, config:, table:)
@@ -23,6 +24,5 @@ module Mensa
     config_reader :link_attributes
     config_reader :icon
     config_reader :show, call: false
-
   end
 end

data/app/tables/mensa/base.rb

@@ -54,9 +54,14 @@ module Mensa
       ordered_scope.map { |row| Mensa::Row.new(self, row) }
     end
 
+    def system_views
+      [Mensa::SystemView.new(:all, config: {name: I18n.t("mensa.views.all")}, table: self)] +
+        (config[:views] || {}).keys.map { |view_name| Mensa::SystemView.new(view_name, config: config.dig(:views, view_name), table: self) }
+    end
+
     # Returns true if the table has filters
     def filters?
-     columns.any?(&:filter?)
+      columns.any?(&:filter?)
     end
 
     def actions?
@@ -82,7 +87,9 @@ module Mensa
     end
 
     def all_views
-      [Mensa::TableView.new(name: I18n.t('.mensa.views.all'))] + TableView.where(table_name: name).where(user: [nil, Current.user])
+      views = system_views
+      views += TableView.where(table_name: name).where(user: [nil, Current.user])
+      views
     end
 
     def active_filters
@@ -103,7 +110,7 @@ module Mensa
 
     class << self
       def definition(&)
-        @definition ||= Mensa::Config::TableDsl.new(self.name, &).config
+        @definition ||= Mensa::Config::TableDsl.new(name, &).config
       end
     end
   end

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

@@ -48,9 +48,14 @@ module Mensa::Config
   class TableDsl
     include DslLogic
 
-    option :model, default: -> { self.class.name.demodulize.to_s.classify.gsub("Table","").singularize.constantize rescue raise "No model found for #{self.class.name}" }
+    option :model, default: -> {
+      begin
+        self.class.name.demodulize.to_s.classify.gsub("Table", "").singularize.constantize
+      rescue
+        raise "No model found for #{self.class.name}"
+      end
+    }
     option :column, dsl_hash: Mensa::Config::ColumnDsl
-    option :internal, dsl_hash: Mensa::Config::ColumnDsl, default: {internal: true}
     option :link
 
     option :exportable, default: true
@@ -74,5 +79,7 @@ module Mensa::Config
     option :view_columns_sorting, default: true
     option :view_condensed, default: false
     option :view_condensed_toggle, default: true
+
+    option :view, dsl_hash: Mensa::Config::ViewDsl
   end
 end

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

@@ -0,0 +1,9 @@
+module Mensa::Config
+  class ViewDsl
+    include DslLogic
+
+    option :name
+    option :description
+    option :filter, dsl_hash: Mensa::Config::FilterDsl
+  end
+end

data/app/tables/mensa/system_view.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mensa
+  # Provide additional links at the end of the row, with an icon, link and a name
+  #
+  # action :delete do
+  #   link { |contact| delete_contact_path(contact) }
+  #   link_attributes "data-turbo-method" => "delete"
+  #   icon "fa-xmark"
+  # end
+  class SystemView
+    include ConfigReaders
+
+    attr_reader :id, :config
+
+    def initialize(id, config:, table:)
+      @id = id
+      @table = table
+      @config = config
+    end
+
+    config_reader :name
+    config_reader :description
+  end
+end

data/app/views/mensa/tables/show.html.slim

@@ -1,5 +1,2 @@
-/= turbo_stream.update "filters-#{@table.table_id}" do
-  = render Mensa::Filters::Component.new(table: @table)
-
 turbo-frame id=@table.table_id target="_top"
   = render Mensa::View::Component.new(@table)

data/bin/overmind

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'overmind' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("overmind", "overmind")

data/bin/setup

@@ -31,7 +31,7 @@ FileUtils.chdir GEM_ROOT do
   system("bundle config set --local path 'vendor/bundle'")
   system("bundle check") || system!("bundle install")
 
-  system!("yarn install")
+  system!("npm install")
 end
 
 FileUtils.chdir APP_ROOT do
@@ -57,6 +57,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
+  puts "\n== Configuring tailwindcss =="
+  system! "bin/rails app:tailwindcss:config && pushd test/dummy && bin/rails tailwindcss:build && popd"
+
   puts "\n== Done, welcome to Mensa =="
-  puts "To start the application, run 'cd test/dummy; bin/rails s'"
+  puts "To start the application, run 'bin/overmind s'"
 end

data/db/migrate/20251112143558_add_description_to_table_view.rb

@@ -0,0 +1,6 @@
+class AddDescriptionToTableView < ActiveRecord::Migration[8.0]
+  def change
+    add_column :mensa_table_views, :description, :string
+    rename_column :mensa_table_views, :data, :config
+  end
+end

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/mensa.gemspec

@@ -1,25 +1,25 @@
 require_relative "lib/mensa/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = "mensa"
-  spec.version     = Mensa::VERSION
-  spec.authors     = ["Tom de Grunt"]
-  spec.email       = ["tom@degrunt.nl"]
-  spec.homepage    = "https://github.com/entdec/mensa"
-  spec.summary     = "Fast and awesome tables"
+  spec.name = "mensa"
+  spec.version = Mensa::VERSION
+  spec.authors = ["Tom de Grunt"]
+  spec.email = ["tom@degrunt.nl"]
+  spec.homepage = "https://github.com/entdec/mensa"
+  spec.summary = "Fast and awesome tables"
   spec.description = "Fast and awesome tables, with pagination, sorting, filtering and custom views."
-  spec.license     = "MIT"
+  spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the "allowed_push_host"
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
   spec.post_install_message = <<~MESSAGE
-      Mensa requires additional setup. Please run the following
-      command to install the necessary files:
+    Mensa requires additional setup. Please run the following
+    command to install the necessary files:
 
-      bin/rails mensa:install:migrations
-    MESSAGE
+    bin/rails mensa:install:migrations
+  MESSAGE
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/entdec/mensa"
@@ -29,17 +29,17 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  spec.add_dependency 'caxlsx_rails', '~> 0'
+  spec.add_dependency "caxlsx_rails", "~> 0"
   spec.add_dependency "rails", ">= 7.1"
-  spec.add_dependency 'pagy', '>=43'
-  spec.add_dependency 'textacular', '>=5'
-
-
-  spec.add_dependency 'slim'
-  spec.add_dependency 'tailwindcss-rails', "~> 3.3"
-  spec.add_dependency 'importmap-rails'
-  spec.add_dependency 'turbo-rails'
-  spec.add_dependency 'stimulus-rails'
+  spec.add_dependency "pagy", ">=43"
+  spec.add_dependency "textacular", ">=5"
+  spec.add_dependency "view_component", "~> 3.11"
+
+  spec.add_dependency "slim"
+  spec.add_dependency "tailwindcss-rails", "~> 3.3"
+  spec.add_dependency "importmap-rails"
+  spec.add_dependency "turbo-rails"
+  spec.add_dependency "stimulus-rails"
 
   spec.add_development_dependency "sqlite3", "~> 2.8"
 end