cafe_car 0.1.1 → 0.1.2

data/lib/cafe_car/form_builder.rb

@@ -36,7 +36,7 @@ module CafeCar
     end
 
     def label(method, text = info(method).label, required: info(method).required?, **, &)
-      super(method, @template.safe_join([text, required ? "*" : ""]), required:, **, &)
+      super(method, @template.safe_join([ text, required ? "*" : "" ]), required:, **, &)
     end
 
     def submit(value = nil, **options)

data/lib/cafe_car/generators.rb

@@ -15,7 +15,7 @@ module CafeCar::Generators
     template("#{name}.rb", "app/models/#{name}.rb", ...)
   end
 
-  def class_namespace = class_path.join('/').classify
+  def class_namespace = class_path.join("/").classify
 
   def module_namespacing(&block)
     super { concat wrap_with_module(class_namespace, &block) }

data/lib/cafe_car/helpers.rb

@@ -17,20 +17,21 @@ module CafeCar
     end
 
     def ui_class(names, *args, **opts)
-      names  = [*names].map(&:to_s).map(&:camelize)
+      names  = [ *names ].map(&:camelize)
       name   = names.join("_")
-      parent = names.first
       args.flatten!
       args.compact_blank!
       opts.compact_blank!
+      opts.merge!(*args.extract!(Hash))
 
-      flags = args.extract! { _1.is_a? Symbol } | opts.extract! { _1.is_a? Symbol }.keys
-      flags.map! { [*parent, _1].join("-") }
+      flags = args.extract!(Symbol)
+      flags |= opts.extract_if! { _1.is_a? Symbol }.keys
+      flags.map! { "#{name}-#{_1}" }
 
-      [*name, *flags, *args, *opts.keys].join(" ")
+      [ *name, *flags, *args, *opts.keys ].join(" ")
     end
 
-    def body_classes = [*controller_path.split(?/), action_name, *@body_class]
+    def body_classes = [ *controller_path.split(?/), action_name, *@body_class ]
 
     def title(object)
       present(object).title.presence.tap do |title|
@@ -38,6 +39,18 @@ module CafeCar
       end
     end
 
+    def cat(*args)
+      args.flatten.each do |arg|
+        arg = capture(&arg) if arg.respond_to?(:to_proc)
+        arg = arg.to_s
+        concat(arg) if arg.present?
+      end
+    end
+
+    def cap(*)
+      capture { cat(*) }
+    end
+
     def capture(*, &)
       super do
         yield(*).then { _1.try(:html_safe?) ? _1.to_s : _1 }
@@ -46,17 +59,24 @@ module CafeCar
 
     def present(*args, **options)
       @presenters                  ||= {}
-      @presenters[[args, options]] ||= CafeCar[:Presenter].present(self, *args, **options)
+      @presenters[[ args, options ]] ||= CafeCar[:Presenter].present(self, *args, **options)
     end
     alias_method :p, :present
 
     def current_href?(*, check_parameters: false, **) = current_page?(href_for(*, **), check_parameters:)
-    def ancestor_href?(...) = URI(href_for(...)) < URI(url_for(request.params))
+    def ancestor_href?(...) = URI(href_for(...)) < URI(url_for(request.url))
 
     def href_for(*parts, namespace: self.namespace, **params)
       HrefBuilder.new(*parts, namespace:, template: self, **params).to_s
     end
 
+    def view_url(view)
+      view = view.to_s
+      params = request.params.merge(view:)
+      params.delete(:view) if params[:view] == default_view
+      url_for(params)
+    end
+
     def context(name = nil, &)
       @context ||= []
 
@@ -83,7 +103,10 @@ module CafeCar
       @links[object] ||= CafeCar[:LinkBuilder].new(self, object)
     end
 
-    def link_to(...) = context(:a) { super }
+    def link_to(...)
+      raise ArgumentError, "Links cannot be nested" if context?(:a)
+      context(:a) { super }
+    end
 
     def icon(name = nil, *, **, &)
       case name
@@ -97,7 +120,7 @@ module CafeCar
     end
 
     def breadcrumbs(*items)
-      ui.Row safe_join(items, icon(:nav_arrow_right, :dim))
+      ui.Row safe_join(items.compact_blank, icon(:nav_arrow_right, :dim))
     end
 
     def filter_form_for(objects, **options, &block)
@@ -119,6 +142,10 @@ module CafeCar
     def debug?   = params.key?(:debug)
     def console? = params.key?(:console)
 
+    def comment(text)
+      "<!-- #{text} -->".html_safe
+    end
+
     def partial?(path)
       prefixes = path.include?(?/) ? [] : lookup_context.prefixes
       lookup_context.any?(path, prefixes, true)

data/lib/cafe_car/href_builder.rb

@@ -11,11 +11,21 @@ module CafeCar
     end
 
     def to_s
-      case [*@parts]
-      in [String]
-        [*@parts, *@params.to_query.presence].join(??)
+      case [ *@parts ]
+      in [ String ]
+        [ *@parts, *@params.to_query.presence ].join(??)
+      in []
+        @template.url_for(@params)
       else
-        @template.url_for([*collapsed_namespace, *@parts, @params])
+        namespace = collapsed_namespace
+        parts     = @parts.map { singular_resource(_1) }
+        begin
+          @template.url_for([ *namespace, *parts, @params ])
+        rescue NoMethodError
+          raise if namespace.empty?
+          namespace.pop
+          retry
+        end
       end
     end
 
@@ -41,13 +51,29 @@ module CafeCar
 
     private
 
+    # Records route polymorphically via the plural `route_key`. For a singular
+    # resource (`resource :session`) that helper doesn't exist, so fall back to
+    # the singular route key. Leaves non-records (symbols, strings) untouched.
+    def singular_resource(part)
+      name = model_name_for(part) or return part
+      return part if @template.respond_to?("#{name.route_key}_path")
+
+      @template.respond_to?("#{name.singular_route_key}_path") ?
+        name.singular_route_key.to_sym : part
+    end
+
+    def model_name_for(part)
+      klass = part.is_a?(Module) ? part : part.class
+      klass.model_name if klass.respond_to?(:model_name)
+    end
+
     def expand_part(part)
       normalize case part
-                when Symbol, String, Hash, Array then part
-                when ActiveModel::Naming then part.model_name.collection
-                when Class then part.name.underscore
-                else expand_part(part.class)
-                end
+      when Symbol, String, Hash, Array then part
+      when ActiveModel::Naming then part.model_name.collection
+      when Class then part.name.underscore
+      else expand_part(part.class)
+      end
     end
 
     def normalize(part)

data/lib/cafe_car/input_builder.rb

@@ -18,7 +18,7 @@ module CafeCar
     end
 
     def placeholder
-      I18n.t(method, scope: [:helpers, :placeholder, object_name], raise: true).presence
+      I18n.t(method, scope: [ :helpers, :placeholder, object_name ], raise: true).presence
     rescue I18n::MissingTranslationData => _
     end
   end

data/lib/cafe_car/link_builder.rb

@@ -15,37 +15,40 @@ module CafeCar
     def can?(action)  = policy.public_send("#{action}?")
     def cant?(action) = !can?(action) && disabled(action, :policy)
 
-    def i18n(*, scope: nil, **) = p.i18n(*, scope: [:controls, *scope], **)
+    def i18n(*, scope: nil, **) = p.i18n(*, scope: [ :controls, *scope ], **)
 
     def confirm(key)             = i18n(key, scope: :confirm)
-    def disabled(action, reason) = i18n(action, scope: [:disabled, reason])
+    def disabled(action, reason) = i18n(action, scope: [ :disabled, reason ])
 
     def turbo!(opts)
       opts.replace({
-        data: {turbo_stream:  true,
-               turbo_method:  opts.delete(:method),
-               turbo_confirm: opts.delete(:confirm)
+        data: {
+          turbo_stream:  true,
+          turbo_method:  opts.delete(:method),
+          turbo_confirm: opts.delete(:confirm)
         }
       }.deep_merge(opts))
     end
 
-    def link(action, target, label = i18n(action), disabled: false, hide: false, **opts, &)
+    def link(action, target, label = i18n(action), disabled: false, hide: false, params: nil, **opts, &)
+      params ||= {}
       disabled ||= cant?(action)
       return if disabled and hide
 
-      href    = href_for(*target, action:, namespace: @namespace)
-      current = current_page?(href)
+      href    = href_for(*target, action:, namespace: @namespace, **params)
+      current = current_page?(href, check_parameters: true)
+      in_link = @template.context?(:a)
       content = block_given? ? capture(label, &) : label
 
-      link_to_unless(disabled || current, content, href, **turbo!(opts)) do
+      link_to_unless(disabled || current || in_link, content, href, **turbo!(opts)) do
         @template.tag.span(content, class: "disabled", disabled: true, title: disabled.presence)
       end
     end
 
-    def show(...)         = link(:show, @object, ...)
+    def show(*, **, &)    = link(:show, @object, *, data: { turbo_stream:  nil }, **, &)
     def edit(...)         = link(:edit, @object, ...)
     def destroy(*, **, &) = link(:destroy, @object, *, method: :delete, confirm: confirm(:destroy), **, &)
-    def index(*, **, &)   = link(:index, model, *, hide: true, **, &)
+    def index(*, **, &)   = link(:index, model, *, hide: true, data: { turbo_stream:  nil }, **, &)
     def new(*, **, &)     = link(:new, model, *, hide: true, **, &)
 
     def code(path = nil)

data/lib/cafe_car/model.rb

@@ -14,8 +14,8 @@ module CafeCar::Model
     def normalize_sort_key(key)
       case key
       when /,/
-        key.split(',').map { normalize_sort_key _1 }
-      when /^-(.+)$/ then {$1 => :desc}
+        key.split(",").map { normalize_sort_key _1 }
+      when /^-(.+)$/ then { $1 => :desc }
       else key
       end
     end

data/lib/cafe_car/navigation.rb

@@ -1,7 +1,7 @@
 module CafeCar
   class Navigation
     class Route
-      delegate :tag, :ui_class, :capture, :concat, :t, to: :@template
+      delegate :tag, :ui, :ui_class, :capture, :concat, :t, to: :@template
       delegate :name, :requirements, to: :@route
 
       def initialize(route, template:)
@@ -30,17 +30,17 @@ module CafeCar
       end
 
       def link(**opts)
-        @template.link_to(content, params, **opts, class: [*opts[:class], ("current" if @template.current_page?(params))])
+        ui.Navigation().Link(href: @template.href_for([ params ]), **opts) { content }
       end
     end
 
-    delegate :ui, :ui_class, to: :@template
-
     def initialize(template, **options)
       @template = template
       @options  = options
     end
 
+    delegate :ui_class, to: :@template
+
     def router = Rails.application.routes.router
     def named_routes = Rails.application.routes.named_routes.to_h.values.map { Route.new(_1, template: @template) }
     def index_routes = named_routes.select(&:index?)
@@ -53,13 +53,13 @@ module CafeCar
 
     def recognize(obj, **)
       req = case obj
-            when String
+      when String
               path = ActionDispatch::Journey::Router::Utils.normalize_path(path)
               env  = Rack::MockRequest.env_for(path, method: :get, **)
               ActionDispatch::Request.new(env)
-            when ActionDispatch::Request then obj
-            else raise "cannot recognize this obj"
-            end
+      when ActionDispatch::Request then obj
+      else raise "cannot recognize this obj"
+      end
 
       router.recognize(req) do |route, params|
         return Route.new(route, template: @template)
@@ -69,8 +69,8 @@ module CafeCar
     def current = recognize(@template.request)
 
     def link_to(*args, **opts, &block)
-      block ||= -> { @template.tag.span(_1, class: ui_class([:navigation, :link], :current)) }
-      @template.link_to_unless_current(*args, class: ui_class([:navigation, :link]), **opts, &block)
+      block ||= -> { @template.tag.span(_1, class: ui_class([ :navigation, :link ], :current)) }
+      @template.link_to_unless_current(*args, class: ui_class([ :navigation, :link ]), **opts, &block)
     end
   end
 end

data/lib/cafe_car/option_helpers.rb

@@ -6,13 +6,15 @@ module CafeCar
       class_attribute :option_defaults, default: {}
     end
 
+    def get_options = @options
+
     def assign_options!
-      raise "@options is not a hash" unless @options
+      raise "@options is not a hash" unless get_options.is_a? Hash
       option_defaults.each { assign_option!(_1, _2) }
     end
 
     def assign_option!(k, default)
-      value = @options.delete(k) { default.respond_to?(:call) ? default.call : default.clone }
+      value = get_options.delete(k) { default.respond_to?(:call) ? default.call : default.clone }
       instance_variable_set("@#{k}", value)
     end
 
@@ -22,12 +24,16 @@ module CafeCar
         subclass.option_defaults = option_defaults.deep_dup
       end
 
-      def option(*names, default: nil, accessor: true, reader: accessor, writer: accessor, presence: accessor)
+      def option(*names, default: nil, accessor: true, reader: accessor, writer: accessor, presence: accessor, macro: accessor)
         names.each do |name|
+          if respond_to?(name) and reader
+            raise ArgumentError, "Option name #{name} conflicts with existing method"
+          end
           attr_reader name if reader
           attr_writer name if writer
           option_defaults[name] = default
           define_method("#{name}?") { instance_variable_get("@#{name}").present? } if presence
+          define_singleton_method(name) { |v| option_defaults[name] = v } if macro
         end
       end
 
@@ -39,8 +45,8 @@ module CafeCar
       end
 
       def option_accessor(name)
-        define_method(name) { @options[name] }
-        define_method("#{name}=") { @options[name] = _1 }
+        define_method(name) { get_options[name] }
+        define_method("#{name}=") { get_options[name] = _1 }
       end
     end
   end

data/lib/cafe_car/param_parser.rb

@@ -9,14 +9,14 @@ class CafeCar::ParamParser
   end
 
   def params(params)
-    params.map {|k, v| k.split('.').reverse.reduce(value(v)) { {_2 => _1} } }
+    params.map { |k, v| k.split(".").reverse.reduce(value(v)) { { _2 => _1 } } }
           .reduce({}) { _1.deep_merge(_2, &method(:merge)) }
           .with_indifferent_access
   end
 
   def merge(_, a, b)
     if a.is_a?(Array) || b.is_a?(Array)
-      [*Array.wrap(a), *Array.wrap(b)]
+      [ *Array.wrap(a), *Array.wrap(b) ]
     else
       b
     end
@@ -26,12 +26,16 @@ class CafeCar::ParamParser
     case v
     when Array      then v.map { value(_1) }
     when Hash       then params(v).tap { _1.merge!(_1.delete("")) if _1[""] }
-    when '""', "''" then ''
-    when 'nil', ''  then nil
+    when '""', "''" then ""
+    when "nil", ""  then nil
     when /[{}\[\]]/ then value(JSON.parse(v))
-    when /,/        then value(v.split(','))
+    when /,/        then value(v.split(","))
     when /^(.*?)\.\.(\.?)(.*)$/
-      Range.new(value($1), value($3), $2.present?)
+      begin
+        Range.new(value($1), value($3), $2.present?)
+      rescue ArgumentError
+        v
+      end
     when /^\$(\w+)\.(\w+)$/
       # TODO: make less scary
       $1.constantize.arel_table[$2]

data/lib/cafe_car/policy.rb

@@ -41,13 +41,13 @@ module CafeCar::Policy
 
   def displayable_associations
     model.reflections.values
-         .select {|a| !a.options[:autosave] && !a.options[:polymorphic] }
+         .select { |a| !a.options[:autosave] && !a.options[:polymorphic] }
          .reject { _1.class_name =~ /^ActiveStorage::/ }
          .map    { _1.name.to_sym }
   end
 
   def permitted_attribute_keys
-    permitted_attributes.flat_map {|a| a.try(:keys) || a }
+    permitted_attributes.flat_map { |a| a.try(:keys) || a }
   end
 
   def permitted_association?(name)

data/lib/cafe_car/query_builder.rb

@@ -32,7 +32,7 @@ module CafeCar
 
     def unscoped   = QueryBuilder.new(@scope.unscope(:where))
     def arel(key)  = @scope.arel_table[chomp(key)]
-    def chomp(key) = key.to_s.sub(/\W+$/, '')
+    def chomp(key) = key.to_s.sub(/\W+$/, "")
 
     def parse_time(value)
       Chronic.parse(value, guess: false, context: :past)
@@ -116,12 +116,12 @@ module CafeCar
       when method(:scope?)
         scope!(key, value)
       else
-        raise "can't find #{key.inspect} on #{@scope.model_name}"
+        raise MissingAttributeError, "can't find #{key.inspect} on #{@scope.model_name}"
       end
     end
 
     def attribute!(key, value)
-      case [key, value]
+      case [ key, value ]
       in _, Regexp
         @scope.where!(arel(key).matches_regexp(value.source, !value.casefold?))
       in _, Op

data/lib/cafe_car/resolver.rb

@@ -6,10 +6,14 @@ module CafeCar
     def const!(name) = self.class.const!(name)
 
     class_methods do
-      def const_scopes = [self, *module_parents]
+      def const_scopes = [ self, *module_parents ]
 
       def [](const_name) = const(const_name)
 
+      def const_try(name)
+        const_get(name) if const_defined?(name)
+      end
+
       def const(name)
         const_scopes.detect { _1.const_defined?(name) }
                     &.then { _1.const_get(name) }

data/lib/cafe_car/routing.rb

@@ -11,7 +11,7 @@ module CafeCar
         end
       end
 
-      super(*, **, concerns: [:batchable, *concerns], &)
+      super(*, **, concerns: [ :batchable, *concerns ], &)
     end
   end
 end

data/lib/cafe_car/table/builder.rb

@@ -24,7 +24,7 @@ module CafeCar::Table
     def has?(method) = model.info.fields.has?(method)
 
     def title(method = policy.title_attribute, *, **, &)
-      cell(method, *, href: true, blank: '(none)', **, &)
+      cell(method, *, href: true, blank: "(none)", **, &)
     end
 
     def logo(method = policy.logo_attribute, *, **, &)
@@ -39,7 +39,7 @@ module CafeCar::Table
 
     def remaining(except: [])
       capture do
-        (remaining_attributes - [*except]).each do |attr|
+        (remaining_attributes - [ *except ]).each do |attr|
           ui << cell(policy.info(attr).displayable.method)
         end
       end
@@ -47,5 +47,6 @@ module CafeCar::Table
 
     def html_safe? = true
     def to_s       = @to_s ||= to_html.to_s
+    def ~@         = @template.concat(to_s)
   end
 end

data/lib/cafe_car/table/head_builder.rb

@@ -10,7 +10,7 @@ module CafeCar::Table
     def cell(method, *flags, label: label(method), **, &)
       super
       @fields << model.info.field(method)
-      ui.Cell(label, *flags)
+      ui.Cell(*flags) { label }
     end
 
     def label(method)
@@ -21,6 +21,6 @@ module CafeCar::Table
 
     def controls(*, **) = cell(:controls, :controls, *, label: nil, **)
 
-    def to_html = ui.Head(:sticky, capture(self, &@block))
+    def to_html = ui.Head(:sticky) { capture(self, &@block) }
   end
 end

data/lib/cafe_car/table/label_builder.rb

@@ -42,7 +42,7 @@ module CafeCar::Table
     end
 
     def label   = @method&.then { present(@objects).human(_1) }
-    def content = @template.safe_join([label, label_sort], " ".html_safe)
+    def content = @template.safe_join([ label, label_sort ], " ".html_safe)
     def to_html = @template.link_to_unless(!sortable?, content, href)
   end
 end

data/lib/cafe_car/table/row_builder.rb

@@ -20,22 +20,20 @@ module CafeCar::Table
       super
       options[:href] = @object if options[:href] == true
       call_procs!(options, @object)
-      ui.Cell(show(method, **options.slice(:blank), &), *flags, **options)
+      ui.Cell(*flags, **options) { show(method, **options.slice(:blank), &) }
     end
 
     def timestamps(**options)
-      title = show(:created_at).string&.then { "Created: #{_1}" }
-      cell(timestamp_attribute, :shrink, title:, **options)
+      tip = show(:created_at).string&.then { "Created: #{_1}" }
+      cell(timestamp_attribute, :shrink, tip:, **options)
     end
 
     def controls(*args, **options)
-      ui.Cell(:shrink, :shy, :controls, *args, present(@object).controls(*args, **options))
+      ui.Cell(:shrink, :shy, :controls, *args) { present(@object).controls(*args, **options) }
     end
 
-    def content = capture(self, &@block)
-
     def to_html
-      ui.Row(content, @template.turbo_stream_from(@object))
+      ui.Row { safe_join [ capture(self, &@block), @template.turbo_stream_from(@object) ] }
     end
   end
 end

data/lib/cafe_car/table_builder.rb

@@ -4,9 +4,9 @@ module CafeCar
       head    = Table::HeadBuilder.new(@template, **@options, &@block).tap(&:to_s)
       columns = head.fields.map(&:width).join(" ")
       @template.ui.Table style: "grid-template-columns: #{columns}" do |table|
-        table << head
-        table << Table::BodyBuilder.new(@template, **@options, &@block)
-        table << Table::FootBuilder.new(@template, **@options, &@block)
+        ~head
+        ~Table::BodyBuilder.new(@template, **@options, &@block)
+        ~Table::FootBuilder.new(@template, **@options, &@block)
       end
     end
   end

data/lib/cafe_car/ui.rb

@@ -1,5 +1,7 @@
 module CafeCar
   module UI
+    include Resolver
+
     module_function
 
     def component(name, **, &)

data/lib/cafe_car/version.rb

@@ -1,3 +1,3 @@
 module CafeCar
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/cafe_car/visitors.rb

@@ -10,12 +10,12 @@ module CafeCar::Visitors
     end
 
     def visit_Arel_Nodes_Regexp(o, collector)
-      function("regexp", [o.right, o.left, bool(o.case_sensitive)], collector)
+      function("regexp", [ o.right, o.left, bool(o.case_sensitive) ], collector)
     end
 
     def visit_Arel_Nodes_NotRegexp(o, collector)
       collector << "NOT "
-      function("regexp", [o.right, o.left, bool(o.case_sensitive)], collector)
+      function("regexp", [ o.right, o.left, bool(o.case_sensitive) ], collector)
     end
   end
 end

data/lib/cafe_car.rb

@@ -10,4 +10,29 @@ module CafeCar
   include Resolver
   extend AutoResolver
   extend ProcHelpers
+
+  class MissingAttributeError < StandardError
+  end
+
+  class AuthenticationFailed < StandardError
+  end
+
+  def self.use_relative_model_naming? = true
+
+  # Name of the host application's user model. Hosts with a differently named
+  # user model can override this (e.g. `CafeCar.user_class_name = "Account"`).
+  mattr_accessor :user_class_name, default: "User"
+
+  # The host's user model, resolved lazily so the constant need not exist at
+  # boot. Used by CafeCar::Session for authentication.
+  def self.user_class = user_class_name.to_s.constantize
+
+  # Whether the opt-in sessions/login infrastructure is available. True only
+  # when the sessions table exists, so a CRUD-only host (no sessions migration)
+  # degrades to 403 Forbidden instead of redirecting to a nonexistent login.
+  def self.sessions_available?
+    CafeCar[:Session].table_exists?
+  rescue StandardError
+    false
+  end
 end

data/lib/generators/cafe_car/controller/templates/controller.rb.tt

@@ -1,5 +1,5 @@
 <% module_namespacing do -%>
 class <%= class_name %>Controller < <%= base_controller_name %>
-  recline_in_the_cafe_car
+  cafe_car
 end
 <% end -%>

data/lib/generators/cafe_car/install/install_generator.rb

@@ -4,7 +4,6 @@ class CafeCar::InstallGenerator < Rails::Generators::Base
   source_root File.expand_path("templates", __dir__)
 
   def install_deps
-    gem "cnc", github: "craft-concept/cnc"
     gem "bcrypt"
     gem "paper_trail"
     gem "factory_bot_rails"