katalyst-tables 3.4.4 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc2698abbad7fb7b3f49ead09af73c697bdef0f31371c6b2c0c69478ab0df5f
-  data.tar.gz: dea2e28dfed3ce6c39ccf61f607755915fa86e138f3ac59f55e926049c5ec34d
+  metadata.gz: f333ba93cb729a1f41be52b7e5c63dc94e96f4bef109b0c3dfc45b341ba50455
+  data.tar.gz: a7269053206d9f707a4e8d9ab27f26c86f6ee09c1b72701a2bdcae74cf2ba4cd
 SHA512:
-  metadata.gz: 6ab5ffed559436e0ed73671445d653ab603e48be03f2099ae39e8b6e4bcbe2d2b503752dd2fa722b9673dbdc9a2309e52c45841dabbf6443f83a0e5dd9c57671
-  data.tar.gz: 832a7746ba587a059810117e215c5dd2011604d92e8f1be63e8842dce1b8d15153f789a41834a0a912dc6410356abda2eaa63d0574ee8c4fb372c9456146c3a2
+  metadata.gz: 4a43742d78a0b82297ad3e09eddfae8de56b3a2a4ecb41ed44eec2b6d73ada2f29b0cec888781e0f16c35a91a71614303ab05711c243692e9b413de9a2298931
+  data.tar.gz: de6edd608168b5e78c4fbf9708565af15c7a80c3bc155b2191d2ab9c257ce5312ea0ebd61a101e08b5662b07e120190f6a46af73f7db94c6ac092b670af88d99

data/app/assets/stylesheets/katalyst/tables/typed-columns/_enum.scss

@@ -9,7 +9,11 @@
   small {
     background: var(--tag-color);
     border-radius: 0.25rem;
-    padding: 0.25rem 0.5rem;
+    padding: 0.25rem;
     font-size: small;
   }
 }
+
+table td.type-enum {
+  text-overflow: unset;
+}

data/lib/katalyst/tables/collection/type/enum.rb

@@ -26,15 +26,30 @@ module Katalyst
               keys = keys.select { |key| key.include?(attribute.value_before_type_cast.last) }
             end
 
-            keys.map { |key| example(key, describe_key(model, attribute.name, key)) }
+            keys.map { |key| example(key, describe_key(model, attribute, key)) }
           end
 
           private
 
-          def describe_key(model, name, key)
-            label = model.human_attribute_name(name).downcase
-            value = model.human_attribute_name("#{name}.#{key}").downcase
-            "#{model.model_name.human} #{label} is #{value}"
+          def cast_value(value)
+            value.to_s
+          end
+
+          def describe_key(model, attribute, key)
+            label = model.human_attribute_name(attribute.name).downcase
+            value = model.human_attribute_name("#{attribute.name}.#{key}").downcase
+
+            description = "#{model.model_name.human} #{label} is #{value}"
+            description += " (default)" if default?(attribute, key)
+            description
+          end
+
+          def default?(attribute, value)
+            if multiple?
+              attribute.original_value&.intersection(cast(value))&.any?
+            else
+              attribute.default_value.eql?(cast(value))
+            end
           end
         end
       end

data/lib/katalyst/tables/collection/type/value.rb

@@ -48,7 +48,10 @@ module Katalyst
           def examples_for(scope, attribute, limit: 10, order: :asc)
             scope, model, column = model_and_column_for(scope, attribute)
 
-            return unless model.attribute_types.has_key?(column)
+            unless model.attribute_types.has_key?(column)
+              raise(ArgumentError, "Unknown column '#{column}' for #{model}. " \
+                                   "Consider defining '#{attribute.name.parameterize.underscore}_examples'")
+            end
 
             column = model.arel_table[column]
 

data/lib/katalyst/tables/collection/type.rb

@@ -2,23 +2,6 @@
 
 require "active_model/type"
 
-require "katalyst/tables/collection/type/helpers/delegate"
-require "katalyst/tables/collection/type/helpers/extensions"
-require "katalyst/tables/collection/type/helpers/multiple"
-require "katalyst/tables/collection/type/helpers/range"
-
-require "katalyst/tables/collection/type/example"
-require "katalyst/tables/collection/type/value"
-
-require "katalyst/tables/collection/type/boolean"
-require "katalyst/tables/collection/type/date"
-require "katalyst/tables/collection/type/enum"
-require "katalyst/tables/collection/type/float"
-require "katalyst/tables/collection/type/integer"
-require "katalyst/tables/collection/type/query"
-require "katalyst/tables/collection/type/search"
-require "katalyst/tables/collection/type/string"
-
 module Katalyst
   module Tables
     module Collection
@@ -41,15 +24,6 @@ module Katalyst
             @default_value ||= Value.new
           end
         end
-
-        register(:boolean, Type::Boolean)
-        register(:date, Type::Date)
-        register(:enum, Type::Enum)
-        register(:float, Type::Float)
-        register(:integer, Type::Integer)
-        register(:string, Type::String)
-        register(:query, Type::Query)
-        register(:search, Type::Search)
       end
     end
   end

data/lib/katalyst/tables/config.rb

@@ -18,6 +18,19 @@ module Katalyst
 
       config_accessor(:date_format) { :default }
       config_accessor(:datetime_format) { :default }
+
+      config_accessor(:collection_types) do
+        {
+          boolean: "Katalyst::Tables::Collection::Type::Boolean",
+          date:    "Katalyst::Tables::Collection::Type::Date",
+          enum:    "Katalyst::Tables::Collection::Type::Enum",
+          float:   "Katalyst::Tables::Collection::Type::Float",
+          integer: "Katalyst::Tables::Collection::Type::Integer",
+          string:  "Katalyst::Tables::Collection::Type::String",
+          query:   "Katalyst::Tables::Collection::Type::Query",
+          search:  "Katalyst::Tables::Collection::Type::Search",
+        }
+      end
     end
   end
 end

data/lib/katalyst/tables/engine.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
-require "rails"
+require "katalyst/html_attributes"
+require "rails/engine"
+require "view_component"
 
 module Katalyst
   module Tables
     class Engine < ::Rails::Engine # :nodoc:
       isolate_namespace Katalyst::Tables
+      config.eager_load_namespaces << Katalyst::Tables
+      config.paths.add("lib", autoload: true)
 
       initializer "katalyst-tables.asset" do
         config.after_initialize do |app|
@@ -21,6 +25,14 @@ module Katalyst
           app.config.importmap.cache_sweepers << root.join("app/assets/builds")
         end
       end
+
+      initializer "katalyst-tables.collection-types" do |app|
+        app.reloader.to_prepare do
+          Tables.config.collection_types.each do |key, type|
+            Collection::Type.register(key, type.constantize)
+          end
+        end
+      end
     end
   end
 end

data/lib/katalyst/tables.rb

@@ -1,18 +1,12 @@
 # frozen_string_literal: true
 
 require "active_support"
-require "active_support/rails"
-require "view_component"
-require "katalyst/html_attributes"
-
-require_relative "tables/config"
-require_relative "tables/engine"
 
 module Katalyst
   module Tables
     extend ActiveSupport::Autoload
 
-    autoload :Collection
+    autoload :Config
 
     class Error < StandardError; end
 
@@ -25,3 +19,5 @@ module Katalyst
     end
   end
 end
+
+require "katalyst/tables/engine"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.6
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katalyst-html-attributes