cafe_car 0.1.1 → 0.1.2

data/app/models/cafe_car/session.rb

@@ -0,0 +1,18 @@
+module CafeCar
+  class Session < ApplicationRecord
+    belongs_to :user, class_name: CafeCar.user_class_name
+
+    attribute :email, :string
+    attribute :password, :password
+    attribute :login, :boolean, default: true
+
+    validates :email, :password, presence: true, if: :login?
+
+    before_validation :authenticate, if: :login?
+
+    def authenticate
+      self.user = CafeCar.user_class.authenticate_by(email:, password:) or
+        errors.add(:base, "Could not find user with given credentials")
+    end
+  end
+end

data/app/policies/cafe_car/session_policy.rb

@@ -0,0 +1,19 @@
+module CafeCar
+  class SessionPolicy < ::ApplicationPolicy
+    def index?   = admin?
+    def create?  = true
+    def show?    = true
+    def destroy? = admin? || mine?
+    def update?  = false
+
+    def title_attribute = :user
+
+    def permitted_attributes
+      [ :email, :password ]
+    end
+
+    class Scope < Scope
+      def resolve = scope
+    end
+  end
+end

data/app/presenters/cafe_car/active_storage/attachment_presenter.rb

@@ -3,12 +3,13 @@ module CafeCar
     class AttachmentPresenter < CafeCar[:Presenter]
       option :size
 
-      # def url = object.representation(resize_to_limit: [100, 100]).processed.path
-      def url = object.url
-      def blank = options.fetch(:blank) { "(none)" }
+      # def url = object.representation(resize_to_limit: [300, 300])&.processed&.url
+      def url = object.try(:url)
+      def blank = options[:blank]
+      def logo = self
 
       def image
-        @template.image_tag url, class: ui.class(:image, size) if url
+        @template.image_tag url, **options, class: ui.class(:image, size) if url
       end
 
       def preview = image || blank

data/app/presenters/cafe_car/code_presenter.rb

@@ -0,0 +1,18 @@
+module CafeCar
+  class CodePresenter < self[:Presenter]
+    def formatter = Rouge::Formatters::HTML.new
+    def source    = object.to_s
+    def formatted = formatter.format(lexer.lex(source))
+
+    def options_lexer = options[:lang].try { Rouge::Lexer.find(_1) }
+    def guess_lexer = Rouge::Lexer.guess(source:)
+
+    def lexer
+      @lexer ||= options_lexer || guess_lexer
+    end
+
+    def to_html
+      ui.Code(formatted.html_safe, class: [ "highlight", lexer.tag ])
+    end
+  end
+end

data/app/presenters/cafe_car/date_presenter.rb

@@ -1,4 +1,5 @@
 module CafeCar
   class DatePresenter < DateTimePresenter
+    def to_html = long
   end
 end

data/app/presenters/cafe_car/date_time_presenter.rb

@@ -3,9 +3,9 @@ module CafeCar
     def distance = @template.time_ago_in_words(object)
     def words    = object.past? ? "#{distance} ago" : "in #{distance}"
     def datetime = object.iso8601
-    def title    = l(object, format: :long)
+    def long    = l(object, format: :long)
 
     def string  = words
-    def to_html = tag.time words, datetime:, title:
+    def to_html = tag.time words, datetime:, "data-tip": long
   end
 end

data/app/presenters/cafe_car/enumerable_presenter.rb

@@ -5,7 +5,7 @@ module CafeCar
 
     def to_html
       object.map  { present(_1) }
-            .then { options[:count] == object.count ? _1 : [_1, "..."] }
+            .then { options[:count] == object.count ? _1 : [ _1, "..." ] }
             .then { safe_join(_1, ", ") }
             .then { with_count _1 }
     end

data/app/presenters/cafe_car/hash_presenter.rb

@@ -1,11 +1,6 @@
 module CafeCar
-  class HashPresenter < self[:Presenter]
-    def formatter = Rouge::Formatters::HTML.new
-    def lexer     = Rouge::Lexers::JSON.new
-    def source    = JSON.pretty_generate(object)
-
-    def to_html
-      tag.code(formatter.format(lexer.lex(source)).html_safe, class: 'highlight')
-    end
+  class HashPresenter < self[:CodePresenter]
+    def lexer  = Rouge::Lexers::JSON.new
+    def source = JSON.pretty_generate(object)
   end
 end

data/app/presenters/cafe_car/presenter.rb

@@ -31,12 +31,12 @@ module CafeCar
     end
 
     def self.names(klass)
-      return [klass.to_s.classify] if klass.is_a?(Symbol)
+      return [ klass.to_s.classify ] if klass.is_a?(Symbol)
       klass.ancestors.lazy.map(&:name).compact
     end
 
     def self.show(method, block = nil, **)
-      show_defaults[method].merge!({block:}.compact, **)
+      show_defaults[method].merge!({ block: }.compact, **)
     end
 
     def initialize(template, object, **options, &block)
@@ -61,18 +61,21 @@ module CafeCar
 
     def to_html
       return render(object:, partial:) if has_partial?
-      return preview if context?(:a)
       return blank if captured.blank? && blank
-      link_to(href) { preview } rescue preview
+      preview
     end
 
     def title(*, **, &) = show(policy.title_attribute, *, blank: show(:id), **, &)
     def logo(*, **, &) = show(policy.logo_attribute, *, **, &)
 
+    def timestamps(**, &)
+      attributes(*model.info.fields.timestamps.names, **, &)
+    end
+
     def attributes(*methods, except: nil, **options, &block)
       methods  = policy.displayable_attributes if methods.empty?
       methods  = methods.flatten.compact
-      methods -= [*except]
+      methods -= [ *except ]
       capture do
         methods.map do |method|
           attribute(method, **options, &block)
@@ -81,10 +84,17 @@ module CafeCar
     end
 
     def links = link(object)
-    def href  = href_for(object)
+
+    # The object's canonical path, or nil when it isn't independently routable
+    # (e.g. a nested resource like a line item).
+    def href
+      href_for(object)
+    rescue NoMethodError, ActionController::UrlGenerationError
+      nil
+    end
 
     def preview(**, &)
-      ui.Row :space do
+      ui.Row :space, href: do
         concat logo(size: :icon)
         concat title
       end
@@ -95,7 +105,7 @@ module CafeCar
       return "" if content.blank?
 
       ui.Field do |f|
-        concat f.Label(safe_join([human(method), *info_circle(method)], " "), tag: :strong)
+        concat f.Label(safe_join([ human(method), *info_circle(method) ], " "), tag: :strong)
         concat f.Content(content)
       end
     end
@@ -125,16 +135,16 @@ module CafeCar
     end
 
     def info_circle(method, *args, **opts, &block)
-      title = info(method).hint
-      return unless title
-      ui.InfoCircle(*args, title:, **opts, &block)
+      tip = info(method).hint
+      return unless tip
+      ui.InfoCircle(*args, tip:, **opts, &block)
     end
 
     def controls(**options, &block)
       render("controls", object:, options:, &block)
     end
 
-    def i18n_vars(names) = names.merge(*names.map { {_1.to_s.downcase.to_sym => _2.downcase} })
+    def i18n_vars(names) = names.merge(*names.map { { _1.to_s.downcase.to_sym => _2.downcase } })
 
     def i18n(action, scope: nil, **)
       vars = i18n_vars Action: t(action, default: action.to_s.humanize),

data/app/presenters/cafe_car/string_presenter.rb

@@ -9,9 +9,9 @@ module CafeCar
 
       case object
       when %r{^https?://.+\.(png|jpe?g|svg)$}
-        @template.image_tag object, style: 'width: 1em'
+        @template.image_tag object, style: "width: 1em"
       when %r{^https?://}
-        link_to(txt, object, target: '_blank', rel: "noopener")
+        link_to(txt, object, target: "_blank", rel: "noopener")
       else
         txt
       end

data/app/ui/cafe_car/ui/button.rb

@@ -2,7 +2,8 @@ module CafeCar
   module UI
     component :Button do
       flag :current
-      flag :primary, :danger
+      flag :primary
+      flag :danger
     end
   end
 end

data/app/ui/cafe_car/ui/card.rb

@@ -0,0 +1,18 @@
+module CafeCar
+  module UI
+    component :Card do
+      flag :slim
+      option :title
+      option :subtitle
+      option :image
+      option :actions
+      option :tabs
+
+      component :Head, :Aside, :Body, :Foot
+      component :Title,    tag: :h2
+      component :Subtitle, tag: :h3
+      component :Image,    tag: :img
+      component :Actions
+    end
+  end
+end

data/app/ui/cafe_car/ui/grid.rb

@@ -0,0 +1,30 @@
+module CafeCar
+  module UI
+    component :Grid do
+      option :columns
+      option :template
+      option :style
+
+      def attributes
+        super.merge(style:)
+      end
+
+      def style
+        style = [ *@style ]
+        style << "grid-template: #{template}" if template?
+        style << "grid-template-columns: #{columns}" if columns?
+        style.compact_blank.join("; ").presence
+      end
+
+      def columns
+        case @columns
+        in Numeric
+          "repeat(#{@columns}, 1fr)"
+        in [ a, b ]
+          "repeat(auto-fill, minmax(#{a}, #{b}))"
+        else @columns
+        end
+      end
+    end
+  end
+end

data/app/ui/cafe_car/ui/layout.rb

@@ -0,0 +1,7 @@
+module CafeCar
+  module UI
+    component :Layout do
+      component :Menu, tag: :input, type: :checkbox
+    end
+  end
+end

data/app/ui/cafe_car/ui/page.rb

@@ -2,9 +2,13 @@ module CafeCar
   module UI
     component :Page do
       flag :slim
+      option :title
+      option :actions
+      option :tabs
 
       component :Head, :Aside, :Body, :Foot
-      component :Title, :Actions
+      component :Title, tag: :h2
+      component :Actions
     end
   end
 end

data/app/views/application/_body.html.haml

@@ -1,6 +1,7 @@
 = Layout do |l|
   = l.Sidebar do
-    %h2= t(:title, scope: [:application], default: Rails.application.name.titleize)
+    - title = t(:title, scope: [:application], default: Rails.application.name.titleize)
+    %h2= link_to title, root_path
     = render "navigation"
   = l.Main { yield }
   = l.Footer     { render("footer") }

data/app/views/application/_controls.html.haml

@@ -4,6 +4,7 @@
 - destroy = options.delete(:destroy) { true }
 - links   = link(object)
 
+-# TODO: Handle resources with missing routes
 = Controls tag: :span, **options do |c|
   = c.Link links.index   if index
   = c.Link links.show    if show

data/app/views/application/_debug.html.haml

@@ -3,9 +3,16 @@
 = Card title: "Debug" do |card|
   = card.Section do
     = Field label: "Params" do
-      = Code parsed_params.pretty_inspect
+      = p parsed_params
 
     = Field label: "Query" do
-      = Code scope.to_sql
+      = p scope.to_sql, as: :code, lang: :sql
+
+    - if session = current_session
+      = Field label: "Session" do
+        = p session.as_json
+
+    = Field label: "Cookies" do
+      = p cookies.signed.as_json.to_s, as: :code
 
   = yield :debug

data/app/views/application/_errors.html.haml

@@ -1,8 +1,4 @@
-- return unless (errors = f.object.errors.full_messages.presence)
-
-= Error do
-  Correct the errors above.
-
--# %ul
--#   - errors.each do |message|
--#     %li= Error { message }
+- if errors = f.object.errors.full_messages.presence
+  = Error do
+    = to_sentence(f.object.errors.messages[:base]).presence || "Correct the errors above."
+    %p= to_sentence(errors)

data/app/views/application/_grid.html.haml

@@ -1,3 +1,3 @@
-= Grid columns: "repeat(auto-fit, minmax(250px, 1fr))" do |grid|
+= Grid do |grid|
   - present(objects).each do |object|
     = render "grid_item", object:, grid:

data/app/views/application/_grid_item.html.haml

@@ -1 +1 @@
-= Card title: object.title, image: object.logo, href: object
+= Card title: object.title, image: object.logo(href: object), actions: object.controls

data/app/views/application/_head.html.haml

@@ -7,6 +7,7 @@
 %meta{name: "turbo-refresh-method",         content: "morph"}
 %meta{name: "turbo-refresh-scroll",         content: "preserve"}
 %meta{name: "view-transition",              content: "same-origin"}
+%meta{name: "turbo-cache-control",          content: "no-preview"}
 = csrf_meta_tags
 = csp_meta_tag
 

data/app/views/application/_index.html.haml

@@ -1,4 +1,8 @@
-- page = params.fetch(:page, 1)
 = render(view).presence or render("empty")
-.center= page_entries_info objects
+
+.center
+  = page_entries_info objects
+  - if filtered?
+    matching your filters. #{link(model).index "View all"}
+
 = paginate objects

data/app/views/application/_index_actions.html.haml

@@ -1,7 +1,7 @@
 = Group do
-  = Button href: url_for(request.params.merge(view: :grid)), title: "Grid View" do
+  = Button href: view_url(:grid), tip: "Grid View" do
     = icon(:view_grid)
-  = Button href: url_for(request.params.except(:view)), title: "Table View" do
+  = Button href: view_url(:table), tip: "Table View" do
     = icon(:table_rows)
 
-= link(model).new(class: ui.Button(:primary).class_name) { icon(:plus) + _1}
+= link(model.build).new(class: ui.Button(:primary).class_name, params: dot_params) { icon(:plus) + _1}

data/app/views/application/_navigation.html.haml

@@ -1,2 +1,9 @@
 = Navigation tag: :nav do |nav|
   = render "navigation_links", nav:
+
+  - if try(:authenticated?)
+    = nav.Link(:bottom, href: try(:session_path)) { p(current_session) }
+  - elsif href = try(:new_session_path)
+    = nav.Link(:bottom, href:) do
+      = Icon t(:new_session, scope: "navigation.icon").to_sym
+      Sign In

data/app/views/application/_navigation_links.html.haml

@@ -2,4 +2,4 @@
   - if name.present?
     %h4= name.join(" ").titleize
   - routes.each do |r|
-    = r.link class: nav.Link.class_name
+    = r.link

data/app/views/application/_notes.html.haml

@@ -1,4 +1,5 @@
 - return unless object.respond_to? :notes
+- href_for(:notes) rescue return
 
 - ui(object.notes).each do |note|
   = card.Section :block do

data/app/views/application/_popup.html.haml

@@ -0,0 +1,7 @@
+= turbo_stream.append_all("body") do
+  = Modal :fixed, id: dom_id(object, :modal), class: "popup", data: {turbo_permanent: true} do |m|
+    = yield
+
+-# = turbo_stream.after_all ui.Page.Body.selector do
+-#   = ui.Page.Aside class: "popup", id: dom_id(object, :popup), data: {turbo_permanent: true} do
+-#     = yield

data/app/views/cafe_car/application/edit.html.haml

@@ -1,6 +1,6 @@
 - title = breadcrumbs(link(object).index, link(object), title("Edit #{model_name.human}"))
 
-= Page title: do |page|
+= Page :slim, title: do |page|
   = page.Body do
     = render "alerts"
     = ui.Card do |card|

data/app/views/cafe_car/application/edit.turbo_stream.haml

@@ -1,9 +1,7 @@
 - if action.edit?
-  -# = turbo_stream.navigate(request.fullpath)
-  = turbo_stream.append_all("body") do
-    = Modal :fixed, id: dom_id(object, :modal), data: {turbo_permanent: true} do |m|
-      = Card title: "Edit #{model_name.human}", actions: m.Close("✕") do |card|
-        = render "form", card:
+  = render "popup" do
+    = Card title: "Edit #{model_name.human}", actions: Close { icon(:xmark_circle_solid) } do |card|
+      = render "form", card:
 - else
   = turbo_stream.replace(dom_id(object, :edit)) do
     = render "form", card: ui.Card

data/app/views/cafe_car/application/index.html.haml

@@ -10,3 +10,6 @@
     = render "alerts"
     = body
     = render "debug" if debug?
+
+  = page.Foot do
+    = yield :foot

data/app/views/cafe_car/application/new.turbo_stream.haml

@@ -1,9 +1,8 @@
 - if action.new?
-  -# = turbo_stream.navigate(request.fullpath)
-  = turbo_stream.append_all("body") do
-    = Modal :fixed, id: dom_id(object, :modal), data: {turbo_permanent: true} do |m|
-      = Card title: "New #{model_name.human}", actions: m.Close("✕") do |card|
-        = render "form", card:
-- else # create
+  = render "popup" do
+    = Card title: "New #{model_name.human}", actions: Close { icon(:xmark_circle_solid) } do |card|
+      = render "form", card:
+
+- else # error during :create action
   = turbo_stream.replace(dom_id(object, :new)) do
     = render "form", card: ui.Card

data/app/views/cafe_car/application/show.html.haml

@@ -1,8 +1,8 @@
 - title   = breadcrumbs(link(object).index, title(object))
-- summary = ui(object).attributes :updated_at, :created_at, try: true
+- summary = ui(object).timestamps try: true
 - body    = render("show")
 
-= turbo_stream_from(object)
+= turbo_stream_from(object) if object.persisted?
 = Page :full, title: do |page|
   = page.Aside do
     = yield :left

data/app/views/cafe_car/examples/ui/_chat.html.haml

@@ -0,0 +1,3 @@
+= Chat do |c|
+  = c.Message :local, "Hello, world!"
+  = c.Message :remote, "And hello to you!"

data/app/views/cafe_car/examples/ui/_info_circle.html.haml

@@ -1 +1 @@
-= InfoCircle "Hi", title: "Hello"
+= InfoCircle "Hi", tip: "Hello"

data/app/views/cafe_car/examples/ui/_modal.html.haml

@@ -1,4 +1,4 @@
 = Modal do |m|
   = m.Body do
-    = Card title: "Card in modal", actions: m.Close("✕") do |c|
+    = Card title: "Card in modal", actions: m.Close { icon(:xmark_circle_solid) } do |c|
       = c.Section "Body"

data/app/views/passwords_mailer/reset.html.haml

@@ -0,0 +1,5 @@
+%p
+  You can reset your password on
+  #{link_to "this password reset page", edit_password_url(@user.password_reset_token)}.
+
+  This link will expire in #{distance_of_time_in_words(0, @user.password_reset_token_expires_in)}.

data/app/views/passwords_mailer/reset.text.erb

@@ -0,0 +1,4 @@
+You can reset your password on
+<%= edit_password_url(@user.password_reset_token) %>
+
+This link will expire in <%= distance_of_time_in_words(0, @user.password_reset_token_expires_in) %>.

data/app/views/ui/_card.html.haml

@@ -1,13 +1,8 @@
-- title   = options.delete(:title)
-- image   = options.delete(:image)
-- actions = options.delete(:actions)
+= card.Image href:, src: image.url if image
 
-= card.wrapper(*flags, **options) do
-  - if image
-    = card.Image style: image.url.then { "background-image: url(#{_1})" }
+= card.Head do
+  = card.Title(href:) { title }
+  = card.Subtitle { subtitle }
+  = card.Actions { actions }
 
-  = card.Head do
-    = card.Title(tag: :h2) { title }
-    = card.Actions { actions }
-
-  = yield
+= yield

data/app/views/ui/_field.html.haml

@@ -1,7 +1 @@
-- label   = options.delete(:label)
-- content = options.delete(:content)
-
-= field.wrapper(*flags, **options) do
-  = field.Label   { label }
-  = field.Content { content }
-  = yield
+= yield

data/app/views/ui/_modal_close.html.haml

@@ -1,2 +1 @@
-= close.wrapper do
-  = yield || "✕"
+= yield || "✕"

data/app/views/ui/_page.html.haml

@@ -1,13 +1,7 @@
-:ruby
-  title  ||= nil
-  actions||= nil
-  tabs   ||= nil
+= page.Head do
+  = ui.Layout.Menu
+  = page.Title { page.title }
+  = page.Tabs { tabs }
+  = page.Actions { actions }
 
-= page.wrapper *flags do
-  = page.Head do
-    = ui.Layout.Menu
-    = page.Title(title, tag: :h2)
-    = page.Tabs(*tabs)
-    = page.Actions(actions)
-
-  = yield
+= yield

data/config/brakeman.ignore

@@ -3,13 +3,13 @@
     {
       "warning_type": "Dangerous Eval",
       "warning_code": 13,
-      "fingerprint": "2ffb4292b2c37c7f06711cbbc3f7c0a7d62fd147d4743f141d26ab7be2418c76",
+      "fingerprint": "9f7c27406a84219ad1d93b07b8c1acd435ad75921861a85a647e32f3d07d1289",
       "check_name": "Evaluation",
       "message": "Dynamic string evaluated as code",
       "file": "lib/cafe_car/auto_resolver.rb",
       "line": 16,
       "link": "https://brakemanscanner.org/docs/warning_types/dangerous_eval/",
-      "code": "TOPLEVEL_BINDING.eval(\"class #{mod.name}::#{name} < CafeCar[:ApplicationController]\\n  include CafeCar::Controller\\n  recline_in_the_cafe_car\\n  self\\nend\\n\", \"lib/cafe_car/auto_resolver.rb\", 16)",
+      "code": "TOPLEVEL_BINDING.eval(\"class #{mod.name}::#{name} < CafeCar[:ApplicationController]\\n  include CafeCar::Controller\\n  cafe_car\\n  self\\nend\\n\", \"lib/cafe_car/auto_resolver.rb\", 16)",
       "render_path": null,
       "location": {
         "type": "method",
@@ -73,5 +73,5 @@
       "note": ""
     }
   ],
-  "brakeman_version": "8.0.2"
+  "brakeman_version": "8.0.4"
 }

data/config/locales/en.yml

@@ -4,11 +4,17 @@ en:
   index: List
   show: View
   destroy: Delete
+  new_session: Log In
+  auth_required: Please %{new_session} first.
 
   navigation:
     icon:
-      attachments: pin
-      blobs: multiple-pages
+      new_session: log-in
+      sessions: log-in
+      attachments: media-image-list
+      blobs: media-image-folder
+      passwords: key
+      versions: multiple-pages
 
   list_html:
     zero: "(none)"
@@ -34,6 +40,8 @@ en:
   attributes:
     to_s: Item
     id: ID
+    ip: IP
+    ip_address: IP address
     created_at: Created
     updated_at: Updated
     deleted_at: Deleted