cafe_car 0.1.1 → 0.1.2

data/config/routes.rb

@@ -1,5 +1,9 @@
 CafeCar::Engine.routes.draw do
   scope module: :cafe_car, as: :cafe_car do
-    get 'components', to: "examples#index"
+    get "components", to: "examples#index"
   end
+
+  # Opt-in login/logout. Singular resource so the form posts to /session and
+  # request_authentication can redirect to new_session_path.
+  resource :session, only: %i[new create destroy], controller: "cafe_car/sessions"
 end

data/db/migrate/20251005220017_create_slugs.rb

@@ -7,7 +7,7 @@ class CreateSlugs < ActiveRecord::Migration[8.0]
       t.datetime   :created_at
     end
 
-    add_index :slugs, [:slug, :sluggable_type]
-    add_index :slugs, [:slug, :sluggable_type, :scope], unique: true
+    add_index :slugs, [ :slug, :sluggable_type ]
+    add_index :slugs, [ :slug, :sluggable_type, :scope ], unique: true
   end
 end

data/lib/cafe_car/active_record.rb

@@ -9,7 +9,7 @@ module CafeCar::ActiveRecord
       def initialize(*args)
         pre_cafe_car_initialize(*args)
 
-        raw_connection.create_function('regexp', -1) do |func, pattern, expression, case_sensitive|
+        raw_connection.create_function("regexp", -1) do |func, pattern, expression, case_sensitive|
           options     = 0
           options    |= Regexp::IGNORECASE if case_sensitive.zero?
           pattern     = Regexp.new(pattern.to_s, options)

data/lib/cafe_car/application_responder.rb

@@ -7,5 +7,11 @@ module CafeCar
 
     self.error_status    = :unprocessable_entity
     self.redirect_status = :see_other
+
+    def to_turbo_stream
+      # Put :html back in the accepted format list. respond_with removes it
+      controller.lookup_context.formats << :html
+      to_html
+    end
   end
 end

data/lib/cafe_car/attributes.rb

@@ -4,7 +4,7 @@ class CafeCar::Attributes
   def initialize(user, object, permitted_attributes)
     @user      = user
     @object    = object
-    @permitted = [*permitted_attributes]
+    @permitted = [ *permitted_attributes ]
     process_attributes!
   end
 

data/lib/cafe_car/auto_resolver.rb

@@ -16,7 +16,7 @@ module CafeCar
         TOPLEVEL_BINDING.eval <<~RUBY, __FILE__, __LINE__
           class #{mod.name}::#{name} < CafeCar[:ApplicationController]
             include CafeCar::Controller
-            recline_in_the_cafe_car
+            cafe_car
             self
           end
         RUBY

data/lib/cafe_car/component.rb

@@ -1,68 +1,133 @@
 module CafeCar
   class Component
-    include OptionHelpers
-
     concerning :Macros do
+      included do
+        class_attribute :option_defaults, default: {}
+        class_attribute :attribute_defaults, default: {}
+      end
+
+      def extract_options!(options)
+        @options = options.extract!(*option_defaults.keys).with_defaults!(option_defaults)
+      end
+
       class_methods do
+        def inherited(subclass)
+          super
+          subclass.option_defaults = option_defaults.deep_dup
+          subclass.attribute_defaults = attribute_defaults.deep_dup
+        end
+
         def component(*names, **, &)
           names.each do |name|
             define_class(name, CafeCar[:Component], **, &)
           end
         end
+
+        def flag(flag)
+          include Module.new do
+            define_method(flag) { |v| @options[flag] = v.nil? ? true : v }
+          end
+        end
+
+        def option(name, default: nil, accessor: true, reader: accessor, writer: accessor, presence: accessor, macro: accessor)
+          option_defaults[name] = default
+          define_singleton_method(name) { |v| option_defaults[name] = v } if macro
+          include Module.new {
+            define_method(name) { options[name] } if reader
+            define_method("#{name}=") { |v| options[name] = v } if writer
+            define_method("#{name}?") { options[name].present? } if presence
+          }
+        end
       end
     end
 
-    attr_reader :flags, :options
+    def self.method_missing(name, v)
+      attribute_defaults[name] = v
+    end
 
-    delegate :tag, :render, :capture, :safe_join, :ui_class, to: :@template
+    attr_reader :flags, :options, :attributes
 
-    option :tag, default: :div
+    delegate :render, :capture, :safe_join, :ui_class, :context?, to: :@template
 
-    def initialize(template, name, *args, **options, &block)
-      @template = template
-      @names    = [*name].map(&:to_s).map(&:underscore).map(&:to_sym)
-      @flags    = args.extract! { _1.is_a? Symbol }
-      @args     = args.flatten.compact_blank
-      @children = options.extract_if! { _1 =~ /^[A-Z]\w*$/ }
-      @options  = options
-      @block    = block
-      options.transform!(:href) { @template.href_for _1 }
-      assign_options!
+    option :tag, default: :div
+    option :class, accessor: false
+    option :data, default: {}
+    option :href
+    option :tip
+
+    def initialize(template, name, *args, **attributes, &block)
+      @template   = template
+      @names      = [ *name ].map(&:underscore)
+      @flags      = args.extract! { _1.is_a? Symbol }
+      @args       = args.flatten.compact_blank
+      @attributes = attributes.with_defaults!(attribute_defaults)
+      @children   = attributes.extract_if! { _1 =~ /^[A-Z]\w*$/ }
+      @block      = block
+      extract_options!(@attributes)
     end
 
     def name     = @names.last
-    def context  = @context ||= Context.new(@template, prefix: @names)
-    def partial? = @template.partial?(partial_name)
-    def href?    = options[:href].present?
-    def tag_name = href? && !current_href? ? :a : @tag
+    def tag      = href? ? :a : super
+    def href?    = super && !context?(:a) && !current_href?
+
+    def href
+      @template.href_for(super) if href?
+    end
 
     def current_href? = options[:href]&.then { @template.current_href?(_1, check_parameters: true) }
     def ancestor_href? = options[:href]&.then { @template.ancestor_href?(_1) }
 
-    def partial_name = 'ui/' + @names.join('_')
+    def data
+      super.merge({ tip: }.compact_blank)
+    end
 
-    def class_names     = @names.map(&:to_s).map(&:camelize)
-    def class_name(...) = ui_class(class_names, *@flags, *(@tag.to_s if href?), (:current if current_href?), (:ancestor if ancestor_href?), ...)
+    def partial?     = @template.partial?(partial_name)
+    def partial_name = "ui/" + @names.join("_")
+
+    def render_partial
+      render(partial_name, options:, flags:, name => self, **options) { content }
+    end
+
+    def selector = class_names.join(?_).then { ?. + _1 }
+
+    def class_names = @names.map(&:camelize)
+
+    def class_name
+      @template.ui_class(class_names, *flags, *options[:class], options[:tag].to_s => href?,
+                                                        current: current_href?,
+                                                        ancestor: ancestor_href? && !current_href?)
+    end
+
+    def attributes
+      @attributes.merge(class: class_name, href:, data:)
+    end
 
     def children
-      @children.map {|name, content| send(name) { content } }
+      @children.map { |name, content| send(name) { content } }
+    end
+
+    def blank?
+      @block and body and content.blank? || !content.match?(/^.*?[^<\s]/) || content.gsub(/<!--.*?-->/, "").blank?
+    end
+
+    def body
+      @body ||= context { partial? ? render_partial : content }
     end
 
     def content
-      @content ||= @template.safe_join([*children, *@args, *(capture(self, &@block) if @block)])
+      @content ||= safe_join [ *children, *@args, *(capture(self, &@block) if @block) ]
     end
 
-    def wrapper(*args, **opts, &)
-      @template.content_tag(tag_name, safe_join([*args]), class: class_name(*opts.delete(:class)), **opts) do
-        capture(self, &)
-      end
+    def context(&)
+      href? ? @template.context(:a, &) : capture(&)
     end
 
-    def blank?
-      content.blank? or !content.match?(/^.*?[^<\s]/) or content.gsub(/<!--.*?-->/, "").blank?
+    def wrapper(&)
+      @template.content_tag(tag, **attributes, &)
     end
 
-    def +(o)  = safe_join([self, o])
+    def ~@    = @template.concat(self)
+    def +(o)  = safe_join([ self, o ])
     def <<(o) = @template.concat(o)
 
     def html_safe? = true
@@ -70,16 +135,14 @@ module CafeCar
     def to_s = to_html
 
     def to_html
-      return "" if @block and blank?
-
-      if partial?
-        render(partial_name, options:, flags:, c: self, component: self, name => self, **options) { content }
-      else
-        wrapper(*@args, **@options) { content }
-      end
+      return "" if blank?
+      wrapper { body }
     end
 
-    def child(name, ...) = Component.new(@template, [*@names, name], ...)
+    def child(name, ...)
+      c = self.class.try { const_defined?(name) ? const_get(name) : Component }
+      c.new(@template, [ *@names, name ], ...)
+    end
 
     def method_missing(name, ...)
       if name =~ /^[A-Z]/

data/lib/cafe_car/context.rb

@@ -5,12 +5,13 @@ module CafeCar
       @prefix   = prefix
     end
 
-    def class(name, ...) = @template.ui_class([*@prefix, *name], ...)
-    def wrapper(...)     = Component.new(@template, [*@prefix], ...).wrapper(...)
+    def class(name, ...) = @template.ui_class([ *@prefix, *name ], ...)
+    # def wrapper(...)     = Component.new(@template, [*@prefix], ...).wrapper(...)
     def <<(obj)          = @template.concat(obj)
 
-    def method_missing(method, ...)
-      Component.new(@template, [*@prefix, method], ...)
+    def method_missing(name, ...)
+      c = CafeCar[:UI].const_try(name) || Component
+      c.new(@template, [ *@prefix, name ], ...)
     end
   end
 end

data/lib/cafe_car/controller/filtering.rb

@@ -2,7 +2,7 @@ module CafeCar::Controller::Filtering
   extend ActiveSupport::Concern
 
   included do
-    helper_method :parsed_params
+    helper_method :parsed_params, :dot_params, :filtered?
   end
 
   private
@@ -11,6 +11,14 @@ module CafeCar::Controller::Filtering
     scope.query(parsed_params[""])
   end
 
+  def filtered?
+    parsed_params[""].present?
+  end
+
+  def dot_params
+    request.params.slice(*request.params.keys.grep(/^\./))
+  end
+
   def parsed_params
     @parsed_params ||=
       if request.get? || request.head?

data/lib/cafe_car/controller.rb

@@ -5,21 +5,30 @@ module CafeCar
     extend ActiveSupport::Concern
 
     include Pundit::Authorization
-    include Filtering
+    include Filtering, Authentication
 
     class_methods do
       def model(model)
         define_method(:model) { @model ||= model }
       end
 
-      def recline_in_the_cafe_car(only: nil, except: nil)
+      def default_view(v = @default_view || "table")
+        @default_view = v.to_s
+      end
+
+      def cafe_car(only: nil, except: nil, model: nil)
         _only = ->(actions) do
           actions -= except if except
           actions &= only if only
           actions
         end
 
-        rescue_from ::ActiveRecord::RecordInvalid, with: :render_invalid_record
+        self.model model if model
+
+        rescue_from ::ActiveRecord::RecordInvalid,
+                    ::ActiveModel::ValidationError, with: :render_invalid_object
+
+        rescue_from ::Pundit::NotAuthorizedError, with: :render_unauthorized
 
         append_cafe_car_views
 
@@ -35,8 +44,24 @@ module CafeCar
       end
 
       def append_cafe_car_views
-        append_view_path CafeCar::Engine.root.join('app/views/cafe_car')
-        append_view_path 'app/views/cafe_car'
+        append_view_path CafeCar::Engine.root.join("app/views/cafe_car")
+        append_view_path "app/views/cafe_car"
+      end
+
+      def define_callbacks_with_helpers(*names, **)
+        define_callbacks(*names, **)
+
+        names.each do |name|
+          %i[before around after].each do |kind|
+            define_singleton_method "#{kind}_#{name}" do |*args, **opts|
+              set_callback(name, kind, *args, prepend: true, **opts)
+            end
+
+            define_singleton_method "skip_#{kind}_#{name}" do |*args|
+              skip_callback(name, kind, *args)
+            end
+          end
+        end
       end
     end
 
@@ -44,11 +69,11 @@ module CafeCar
       self.responder = CafeCar[:ApplicationResponder]
       default_form_builder CafeCar[:FormBuilder]
 
-      define_callbacks :render, :update, :create, :destroy
+      define_callbacks_with_helpers :render, :update, :create, :destroy
       add_flash_types :success, :warning, :error
 
       helper_method :model, :model_name, :object, :objects
-      helper_method :action, :scope, :view
+      helper_method :action, :scope, :view, :default_view
 
       helper Helpers
       delegate :present, :href_for, :namespace, to: :helpers
@@ -92,8 +117,6 @@ module CafeCar
       flash[:success] = present(object).i18n("#{action_name}_html", scope: :flashes)
     end
 
-    def current_user = CafeCar[:Current].user
-
     def sorted(scope)
       scope.sorted(*params[:sort].presence)
     end
@@ -139,12 +162,24 @@ module CafeCar
     def model_name = model.model_name
 
     def model
-      @model ||= self.class.name.gsub(/.*::|Controller$/, '')
+      @model ||= self.class.name.gsub(/.*::|Controller$/, "")
                                 .classify
                                 .then { self.class.module_parent.const_get _1 }
     end
 
-    def render_invalid_record = render(object.persisted? ? 'edit' : 'new', status: :unprocessable_content)
+    def render_invalid_object
+      render(object.persisted? ? "edit" : "new", status: :unprocessable_content)
+    end
+
+    def render_unauthorized
+      if !sessions_available?
+        head :forbidden
+      elsif authenticated?
+        redirect_back_or_to root_path
+      else
+        request_authentication
+      end
+    end
 
     # def default_render(...) = run_callbacks(:render) { super }
 
@@ -156,12 +191,16 @@ module CafeCar
       @action ||= ActiveSupport::StringInquirer.new(action_name)
     end
 
+    def default_view = self.class.default_view
     def view
-      params.fetch(:view) { "table" }
+      params.fetch(:view) { default_view }
     end
 
     def _render_with_renderer_json(obj, options)
-      options[:only] ||= [:id] | policy(obj).displayable_attributes
+      # permitted_attributes is record-oriented, so ask a record for the column
+      # list even when serializing a collection.
+      record = obj.is_a?(CafeCar::Model) ? obj : obj.klass.new
+      options[:only] ||= [ :id ] | policy(record).displayable_attributes
 
       if obj.is_a?(CafeCar::Model)
         options[:include] ||= policy(obj).displayable_associations

data/lib/cafe_car/core_ext/array.rb

@@ -8,4 +8,17 @@ class Array
       end
     end
   end
+
+  def extract!(pattern = nil, &block)
+    block = -> { pattern === _1 } if pattern
+    return to_enum(:extract!) { size } unless block
+
+    extracted_elements = []
+
+    reject! do |element|
+      extracted_elements << element if block.(element)
+    end
+
+    extracted_elements
+  end
 end

data/lib/cafe_car/core_ext/hash.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Hash
+  # Removes and returns a hash containing the key/value pairs for which the
+  # block returns a true value given the key.
+  #
+  #   hash = {:a => 1, "b" => 2, :c => 3}
+  #   hash.extract_if! { _1.is_a? Symbol } #=> {a: 1, c: 3}
+  #   hash                                 #=> {"b" => 2 }
+  def extract_if!
+    each_with_object(self.class.new) do |(key, value), result|
+      result[key] = delete(key) if yield(key, value)
+    end
+  end
+end

data/lib/cafe_car/core_ext/module.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Module
+  # Shorthand for `const_set(name.camelize, Class.new(parent) { ... })`.
+  # Useful when defining classes in macros.
+  def define_class(name, *, **macros, &)
+    name = name.to_s.camelize
+    raise NameError, "class exists: #{name}" if const_defined?(name, false)
+    klass = Class.new(*) do
+      macros.each { |key, value| send(key, *value) }
+      class_eval(&) if block_given?
+    end
+    const_set name, klass
+  end
+end

data/lib/cafe_car/core_ext.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "cnc/core_ext"
-
 Dir.glob(File.expand_path("core_ext/*.rb", __dir__)).sort.each do |path|
   require path
 end

data/lib/cafe_car/current.rb

@@ -1,6 +1,9 @@
 module CafeCar
   class Current < ActiveSupport::CurrentAttributes
+    delegate :user, to: :session, allow_nil: true
+
     attribute :request_id, :user_agent, :ip_address
-    attribute :user
+    attribute :session
+    # attribute :user
   end
 end

data/lib/cafe_car/engine.rb

@@ -6,6 +6,8 @@ require "propshaft"
 require "pundit"
 require "importmap-rails"
 require "turbo-rails"
+require "potter"
+require "potter/type"
 
 module CafeCar
   class Engine < ::Rails::Engine
@@ -72,13 +74,18 @@ module CafeCar
       end
     end
 
+    initializer "cafe_car.responders" do
+      require "responders"
+      config.responders.flash_keys = [ :success, :error ]
+    end
+
     initializer "cafe_car.field_with_errors" do
       ActionView::Base.field_error_proc = proc { _1.html_safe }
     end
 
     initializer "cafe_car.console" do |app|
       app.console do
-        TOPLEVEL_BINDING.eval('self').instance_exec do
+        TOPLEVEL_BINDING.eval("self").instance_exec do
           def logger = Rails.logger
 
           if defined?(FactoryBot)
@@ -86,7 +93,7 @@ module CafeCar
             logger.info "FactoryBot methods enabled."
           end
 
-          logger.info 'SQL logs enabled.'
+          logger.info "SQL logs enabled."
 
           ApplicationController.allow_forgery_protection = false
           logger.info "CSRF disabled to enable app.post calls."

data/lib/cafe_car/field_builder.rb

@@ -29,7 +29,7 @@ module CafeCar
 
     private
 
-    def add_class(*args, opts) = {class: @template.ui_class([:field, *args], *opts.delete(:class)), **opts}
+    def add_class(*args, opts) = { class: @template.ui_class([ :field, *args ], *opts.delete(:class)), **opts }
 
     def send_to_form_with_text(method, text = @options.delete(method), **, &)
       return if text == false

data/lib/cafe_car/field_info.rb

@@ -13,8 +13,9 @@ module CafeCar
 
     def info(method) = model.info.field(method)
 
-    def id?          = method =~ /_ids?$/
-    def constant?    = method.in? %i[id created_at updated_at]
+    def id?        = method =~ /_ids?$/
+    def constant?  = method.in? %i[id created_at updated_at]
+    def timestamp? = type.in? %i[date datetime time]
 
     def association?
       return if @method.nil?
@@ -30,11 +31,11 @@ module CafeCar
     def collection   = reflection.klass.all
     def reflection
       return if @method.nil?
-      model.reflect_on_association(@method) || reflections_by_attribute[@method]
+      model.try(:reflect_on_association, @method) || reflections_by_attribute[@method]
     end
 
     def abrogated_keys
-      [*reflection&.foreign_type&.to_sym]
+      [ *reflection&.foreign_type&.to_sym ]
     end
 
     def displayable = reflection&.name&.then { info(_1) } || self
@@ -61,7 +62,7 @@ module CafeCar
       model.nested_attributes_options.key?(key) && :nested
     end
 
-    def polymorphic_methods = [reflection.foreign_type, reflection.foreign_key]
+    def polymorphic_methods = [ reflection.foreign_type, reflection.foreign_key ]
 
     def placeholder  = i18n(:placeholder)
     def autocomplete = i18n(:autocomplete)
@@ -78,7 +79,7 @@ module CafeCar
     def i18n_key = model_name.i18n_key
     def i18n(key, **opts)
       return if @method.nil?
-      I18n.t(@method, scope: [:helpers, key, i18n_key], raise: true, **opts)
+      I18n.t(@method, scope: [ :helpers, key, i18n_key ], raise: true, **opts)
     rescue I18n::MissingTranslationData
     end
 
@@ -95,7 +96,7 @@ module CafeCar
         # "minmax(10em, fit-content)"
         # "minmax(10em, 1fr)"
         "minmax(10em, auto)"
-        # "min-content"
+        # "minmax(min-content, auto)"
       else "min-content"
       end
     end
@@ -127,13 +128,14 @@ module CafeCar
 
     @@reflections_by_attribute = {}
     def reflections_by_attribute
+      return {} unless model.respond_to? :reflections
       @@reflections_by_attribute[model] ||=
         model.reflections.values.index_by do |r|
-          case [r.macro, r.name]
-          in [:belongs_to, *]                then r.foreign_key
-          in [:has_many, *]                  then "#{r.name.to_s.singularize}_ids"
-          in [:has_one, /^rich_text_(\w+)$/] then $1
-          in [:has_one, *]                   then r.name
+          case [ r.macro, r.name ]
+          in [ :belongs_to, * ]                then r.foreign_key
+          in [ :has_many, * ]                  then "#{r.name.to_s.singularize}_ids"
+          in [ :has_one, /^rich_text_(\w+)$/ ] then $1
+          in [ :has_one, * ]                   then r.name
           else raise NoMethodError.new("Not yet implemented :#{r.macro}")
           end
         end.with_indifferent_access

data/lib/cafe_car/fields.rb

@@ -5,10 +5,17 @@ module CafeCar
     derive :editable,    -> { Fields.new reject(&:constant?) }
     derive :listable,    -> { Fields.new editable.reject(&:digest?) }
     derive :attachments, -> { Fields.new select(&:attachment?) }
+    derive :timestamps,  -> { Fields.new select(&:timestamp?) }
 
     derive :by_name,     -> { index_by(&:name).with_indifferent_access }
     derive :names,       -> { map(&:name) }
 
+    def reverse = Fields.new(super)
+
+    def sort_with(obj)
+      Fields.new(sort_by { obj.try(_1.name) })
+    end
+
     def has?(name) = by_name.key?(name)
   end
 end

data/lib/cafe_car/filter/field_info.rb

@@ -1,6 +1,6 @@
 class CafeCar::Filter::FieldInfo < CafeCar[:FieldInfo]
   def i18n(key, **opts)
-    I18n.t(@method, scope: [:helpers, :filter, key, i18n_key], raise: true, **opts)
+    I18n.t(@method, scope: [ :helpers, :filter, key, i18n_key ], raise: true, **opts)
   rescue I18n::MissingTranslationData
   end
 

data/lib/cafe_car/filter/form_builder.rb

@@ -10,12 +10,12 @@ module CafeCar::Filter
       dotted_name method
     end
 
-    def clean(method) = method.to_s.sub(/^\W+|\W+$/, '')
+    def clean(method) = method.to_s.sub(/^\W+|\W+$/, "")
     def info(method)  = super(clean(method))
 
     def field_name(*methods, multiple: false, index: @options[:index])
       # TODO: handle multiple/index
-      ["", *methods].join(".")
+      [ "", *methods ].join(".")
     end
   end
 end

data/lib/cafe_car/filter_builder.rb

@@ -8,7 +8,7 @@ module CafeCar
     end
 
     def model      = @objects.klass
-    def to_key     = [model_name.param_key, :filters]
+    def to_key     = [ model_name.param_key, :filters ]
     def to_model   = self
     def persisted? = false
     def errors     = Hash.new([])