card-mod-format 0.14.2 → 0.15.0

data/data/real.yml

@@ -0,0 +1,67 @@
+---
+
+
+- :name: JSON
+  :type: :cardtype
+  :codename: json
+- :name: RichText
+  :type: :cardtype
+  :codename: basic
+  :fields:
+    :description: "<p>Basic cards are for rich text, and are the default type for new cards.</p>"
+- :name: Number
+  :type: :cardtype
+  :codename: number
+  :fields:
+    :description: "<p>Can contain only numerical values.</p>"
+- :name: PlainText
+  :type: :cardtype
+  :codename: plain_text
+  :fields:
+    :description: "<p>PlainText cards are for unstyled text.</p>"
+- :name: HTML
+  :type: :cardtype
+  :codename: html
+  :fields:
+    :description: "<p>These cards allow unrestricted HTML. [[http://decko.org/wagn/HTML|more]]</p>"
+- :name: Toggle
+  :type: :cardtype
+  :codename: toggle
+  :fields:
+    :description: "<p>Toggles simply indicate yes or no. [[http://decko.org/wagn/Toggle|more]].</p>"
+- :name: Phrase
+  :type: :cardtype
+  :codename: phrase
+  :fields:
+    :description: "<p>Phrase cards are for short unstyled text.</p>"
+- :name: URI
+  :type: :cardtype
+  :codename: uri
+
+- :name: "*head"
+  :type: :setting
+  :codename: head
+  :fields:
+    :self:
+      :fields:
+        :read: Anyone
+
+- :name:
+    - :all
+    - :head
+  :content: "{{:head|core}}"
+
+- :name: "*title"
+  :type: :phrase
+  :codename: title
+  :content: My Deck
+- :name: "*credit"
+  :type: :html
+  :codename: credit
+  :content: |
+    {{+:image|core}}
+    <a href="http://decko.org">Decko v{{:version|core}}</a>
+  :fields:
+    :self:
+      :fields:
+        :read: Anyone

data/lib/card/format/html_format.rb

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# # require "card/content/diff"
-
 class Card
   class Format
     # Main Format class for formatting card views in HTML

data/lib/card/mod/format.rb

@@ -0,0 +1,4 @@
+Cardio::Railtie.config.tap do |config|
+  config.default_html_view = :titled
+  config.rss_enabled = false
+end

data/lib/card/path.rb

@@ -16,22 +16,12 @@ class Card
 
     attr_reader :opts
 
-    def action
-      @action ||= opts.delete(:action)&.to_sym
-    end
-
     def new_cardtype
-      return unless new_cardtype?
-
-      "#{action}/#{mark}#{query}"
-    end
-
-    def new_cardtype?
-      return false unless action.in? %i[new type]
-
       # "new" and "type" are not really an action and are only
       # a valid value here for this path
-      opts[:mark].present?
+      return unless action.in?(%i[new type]) && mark.present?
+
+      "#{action}/#{mark}#{query}"
     end
 
     def standard
@@ -40,7 +30,13 @@ class Card
     end
 
     def base
-      explicit_action? ? action_base : mark
+      if action.in? %i[create update delete]
+        action_base
+      elsif mark.present? && view.present?
+        "#{mark}/#{view}"
+      else
+        mark
+      end
     end
 
     def action_base
@@ -48,8 +44,16 @@ class Card
       # the card/ prefix prevents interpreting action as cardname
     end
 
-    def explicit_action?
-      action.in? %i[create update delete]
+    def action
+      @action ||= opts.delete(:action)&.to_sym
+    end
+
+    def view
+      @view ||= opts.delete :view
+    end
+
+    def no_mark?
+      @no_mark ||= opts.delete :no_mark
     end
 
     def mark
@@ -67,10 +71,6 @@ class Card
       action == :create || no_mark?
     end
 
-    def no_mark?
-      @no_mark ||= opts.delete :no_mark
-    end
-
     def extension
       extension = opts.delete :format
       extension ? ".#{extension}" : ""

data/set/all/base.rb

@@ -94,9 +94,7 @@ format do
   end
 
   view :one_line_content, compact: true do
-    with_nest_mode :compact do
-      Card::Content.smart_truncate _render_core
-    end
+    with_nest_mode(:compact) { truncate render_core }
   end
 
   view :labeled_content, unknown: :mini_unknown do
@@ -127,12 +125,4 @@ format do
     "#{card.name}: #{_render_labeled_content}"
   end
   view :closed, :labeled
-
-  # SPECIAL VIEWS
-
-  view :array, cache: :never do
-    card.item_cards(limit: 0).map do |item_card|
-      subformat(item_card)._render_core
-    end.inspect
-  end
 end

data/set/all/content.rb

@@ -35,25 +35,17 @@ format do
 
   # TODO: move this into a nest once popovers are stub safe
   def label_description
-    return unless (desc = card.field :description)
+    return unless (desc = card.fetch :description)
 
     desc.format.render_core
   end
 
   def raw_one_line_content
-    cut_with_ellipsis render_raw
+    truncate strip_tags(render_raw), length: one_line_character_limit
   end
 
   def one_line_content
-    Content.smart_truncate render_core
-  end
-
-  def cut_with_ellipsis text, limit=one_line_character_limit
-    if text.size <= limit
-      text
-    else
-      "#{text[0..(limit - 3)]}..."
-    end
+    truncate strip_tags(render_core), length: one_line_character_limit
   end
 
   def one_line_character_limit

data/set/all/csv.rb

@@ -1,94 +1,42 @@
 require "csv"
 
-format :csv  do
-  def default_nest_view
-    :core
+format :csv do
+  def show view, args
+    view ||= :titled
+    super view, args
   end
 
-  def default_item_view
-    depth.zero? ? :csv_row : :name
+  def nests
+    [["_self", { view: :name }], ["_self", { view: :type }]]
   end
 
-  view :core do
-    if (item_view_options[:view] == :name_with_fields) && focal?
-      title_row("item name") + name_with_field_rows
-    else
-      super()
-    end
-  end
-
-  view :csv_row do
-    array = _render_raw.scan(/\{\{[^}]*\}\}/).map do |inc|
-      process_content(inc).strip
-    end
-
-    CSV.generate_line(array).strip
-    # strip is because search already joins with newlines
-  end
-
-  view :unknown do
-    ""
-  end
-
-  view :name_with_fields do
-    CSV.generate_line name_with_fields_row
-  end
-
-  def name_with_fields_row
-    nested_field_names.each_with_object([card.name]) do |field_name, row|
-      row << nest(field_name)
-    end
-  end
-
-  def name_with_field_rows
-    return [] unless row_card_names.present?
-
-    row_card_names.map do |item_name|
-      CSV.generate_line row_from_field_names(item_name, columns)
-    end.join
-  end
-
-  def row_card_names
-    @row_cards ||= card.item_names
+  def default_nest_view
+    :titled
   end
 
-  def columns
-    csv_structure_card.format.nested_field_names.map(&:tag)
+  def default_item_view
+    :name
   end
 
-  def csv_structure_card
-    card.rule_card(:csv_structure) || Card.fetch(row_card_names.first)
+  view :titled do
+    voo.items[:view] ||= :row
+    (render_header + render_core).map { |row| CSV.generate_line row }.join
   end
 
-  def row_from_field_names parent_name, field_names, view=:core
-    field_names.each_with_object([parent_name]) do |field, row|
-      row << nest([parent_name, field], view: view)
-    end
+  view :core do
+    item_cards.map { |item_card| nest item_card }
   end
 
-  def title_row extra_titles=nil
-    titles = column_titles extra_titles
-    return "" unless titles.present?
-
-    CSV.generate_line titles.map(&:upcase)
+  view :row do
+    nests.map { |nest_args| nest(*nest_args) }
   end
 
-  def column_titles extra_titles=nil
-    res = Array extra_titles
-    card1 = Card.fetch card.item_names(limit: 1).first
-    card1.nest_chunks.each do |chunk|
-      res << column_title(chunk.options)
-    end
-    res.compact
+  # localize
+  view :header do
+    [%w[Name Type]]
   end
 
-  def column_title opts
-    if opts[:title]
-      opts[:title]
-    elsif %w[name link].member? opts[:view]
-      opts[:view]
-    else
-      opts[:nest_name].to_name.tag
-    end
+  view :unknown do
+    ""
   end
 end

data/set/all/data.rb

@@ -7,10 +7,10 @@ def export_hash field_tags: []
     type: export_type,
     codename: codename,
     content: export_content,
-    subfields: export_subfields(field_tags) }.compact_blank
+    fields: export_fields(field_tags) }.compact_blank
 end
 
-def export_subfields marks
+def export_fields marks
   marks.each_with_object({}) do |mark, hash|
     hash[mark] = [name, mark].card&.export_content
   end.compact_blank

data/set/all/demo.rb

@@ -6,11 +6,15 @@ format :html do
   end
 
   view :view_list do
-    %i[bar box info_bar open closed titled labeled content content_panel].map do |v|
+    view_list.map do |v|
       wrap_with :p, [content_tag(:h3, v), render(v, show: :menu)]
     end.flatten.join ""
   end
 
+  def view_list
+    %i[content titled labeled bar box open closed content_panel]
+  end
+
   def demo_view
     Env.params[:demo_view] || :core
   end
@@ -31,6 +35,6 @@ format :html do
 
   def all_views
     Card::Set::Format::AbstractFormat::ViewDefinition
-      .views.slice(*self.class.ancestors).values.map(&:keys).flatten.uniq
+      .views.slice(*self.class.ancestors).values.map(&:keys).flatten.uniq.sort
   end
 end

data/set/all/error.rb

@@ -67,6 +67,6 @@ format :json do
   view :not_found, :errors
   view :bad_address do
     card.errors.add :address, super()
-    render_error
+    render_errors
   end
 end

data/set/all/html/error.rb

@@ -77,7 +77,7 @@ format :html do
   end
 
   def view_for_unknown setting_view
-    main? && ok?(:create) ? :new : super
+    main? && voo.root? && ok?(:create) ? :new : super
   end
 
   def show_all_errors?

data/set/all/html/head.rb

@@ -1,3 +1,9 @@
+basket[:head_views] =
+  %i[page_title_tag meta_tags favicon_tag
+     head_stylesheet head_remote_stylesheets
+     universal_edit_button rss_links]
+# TODO: the last two should be in mods
+
 format do
   view :page_title, unknown: true, perms: :none do
     title_parts = [Card::Rule.global_setting(:title)]
@@ -8,18 +14,10 @@ end
 
 format :html do
   view :head, unknown: true, perms: :none do
-    views_in_head.map { |viewname| render viewname }.flatten.compact.join "\n"
+    basket[:head_views].map { |viewname| render viewname }.flatten.compact.join "\n"
   end
 
-  def views_in_head
-    %i[meta_tags page_title_tag favicon_tag head_stylesheet
-       universal_edit_button rss_links]
-  end
-
-  # FIXME: tags not working with `template: :haml`
-  view :meta_tags, unknown: true, perms: :none do
-    haml :meta_tags
-  end
+  view :meta_tags, unknown: true, perms: :none, template: :haml
 
   view :page_title_tag, unknown: true, perms: :none do
     content_tag(:title) { render :page_title }
@@ -29,7 +27,7 @@ format :html do
     nest :favicon, view: :link_tag
   end
 
-  view :universal_edit_button, unknown: true, denial: :blank, perms: :update do
+  view :universal_edit_button, unknown: :blank, denial: :blank, perms: :update do
     return if card.new?
 
     tag "link", rel: "alternate", type: "application/x-wiki",
@@ -42,7 +40,11 @@ format :html do
   view :head_stylesheet, unknown: true, cache: :never, perms: :none do
     return unless (href = head_stylesheet_path)
 
-    tag "link", href: href, media: "all", rel: "stylesheet", type: "text/css"
+    tag("link", href: href, media: "all", rel: "stylesheet", type: "text/css")
+  end
+
+  view :head_remote_stylesheets, unknown: true, cache: :never, perms: :none do
+    remote_style_tags
   end
 
   def param_or_rule_card setting
@@ -74,6 +76,14 @@ format :html do
     Card.config.rss_enabled && respond_to?(:rss_link_tag)
   end
 
+  def remote_style_tags
+    return unless (asset_card = Card[:style_mods])
+
+    asset_card.item_cards.map do |mod_style_card|
+      nest mod_style_card, view: :remote_include_tags
+    end.select(&:present?)
+  end
+
   def head_stylesheet_path
     debug_or_machine_path(
       :style,

data/set/all/html/header.rb

@@ -3,59 +3,29 @@ TOGGLE_MAP = { close: %w[open open], open: %w[close closed] }.freeze
 
 format :html do
   view :header, perms: :none do
-    main_header
+    header_wrap [render_header_title, render_menu]
   end
 
-  def main_header
-    header_wrap _render_header_title
-  end
-
-  def header_wrap content=nil
-    haml :header_wrap, content: (block_given? ? yield : output(content))
+  def header_wrap header_parts
+    wrap_with :div, class: classy("d0-card-header") do
+      output Array.wrap(header_parts)
+    end
   end
 
   view :header_title, perms: :none do
-    header_title_elements
+    wrap_with (voo.header || default_header), class: classy("d0-card-header-title") do
+      render_title
+    end
   end
 
-  def header_title_elements
-    voo.hide :title_toggle if show_view?(:icon_toggle, :hide)
-    title_view = show_view?(:title_toggle, :hide) ? :title_toggle : :title
-    [_render_icon_toggle(optional: :hide), _render(title_view)]
+  def default_header
+    main? ? :h1 : :h2
   end
 
   def show_draft_link?
     card.drafts.present? && @slot_view == :edit
   end
 
-  view :title_toggle, perms: :none do
-    content_toggle(_render_title(hide: :title_link))
-  end
-
-  view :icon_toggle, perms: :none do
-    direction = @toggle_mode == :close ? :expand : :collapse_down
-    content_toggle icon_tag(direction)
-  end
-
-  view :toggle, :icon_toggle  # deprecated; use icon_toggle
-
-  def content_toggle text=""
-    return if text.nil?
-
-    verb, adjective = toggle_verb_adjective
-    link_to_view adjective, text, title: "#{verb} #{card.name}",   # LOCALIZE
-                                  class: "toggle-#{adjective} toggler nodblclick"
-  end
-
-  def toggle_view
-    toggle_verb_adjective.last
-  end
-
-  def toggle_verb_adjective
-    TOGGLE_MAP[@toggle_mode || :open] ||
-      raise(Card::Error, "invalid toggle mode: #{@toggle_mode}")
-  end
-
   def structure_editable?
     card.structure && card.template.ok?(:update)
   end

data/set/all/html/header_wrap.haml

@@ -1,4 +1,3 @@
-%div{ class: [classy("d0-card-header")], href: path(view: toggle_view) }
-  = _render_menu
-  %div{ class: classy("d0-card-header-title") }
-    = content
+= render_menu
+%div{ class: classy("d0-card-header-title") }
+  = title

data/set/all/html/labeled.haml

@@ -1,4 +1,4 @@
-.label.col-4.text-right
+.label.col-4.text-end
   = label
 .labeled-content.col-8
   = content

data/set/all/html/menu.rb

@@ -1,11 +1,12 @@
 format :html do
   view :menu, denial: :blank, unknown: true do
-    return "" if card.unknown?
-
+    return "" unless card.known?
+    # would be preferable to do this with unknown: :blank, but that fails with view
+    # caching on, because voo always thinks it's the root.
     wrap_with :div, class: "card-menu #{menu_link_classes}" do
       [render_help_link,
        menu_link,
-       (voo.show?(:bridge_link) ? bridge_link(false) : nil)]
+       (voo.show?(:bridge_link) ? bridge_link(in_modal: false) : nil)]
     end
   end
 
@@ -35,6 +36,11 @@ format :html do
     edit_link edit_link_view
   end
 
+  view :edit_button do
+    view = voo.edit == :inline ? :edit_inline : :edit
+    link_to_view view, "Edit", class: "btn btn-sm btn-outline-primary me-2"
+  end
+
   def edit_link_view
     :edit
   end
@@ -47,13 +53,13 @@ format :html do
     bridge_link
   end
 
-  def bridge_link in_modal=true
+  def bridge_link text: "", in_modal: true
     opts = { class: "bridge-link" }
     if in_modal
       # add_class opts, "close"
       opts["data-slotter-mode"] = "modal-replace"
     end
-    link_to_view :bridge, material_icon(:more_horiz), opts
+    link_to_view :bridge, "#{bridge_icon} #{text}", opts
   end
 
   # no caching because help_text view doesn't cache, and we can't have a
@@ -70,7 +76,7 @@ format :html do
 
   def help_popover_opts text=nil, title=nil
     text ||= render_help_text
-    opts = { "data-placement": :left, class: "help-link" }
+    opts = { "data-bs-placement": :left, class: "help-link" }
     popover_opts text, title, opts
   end
 
@@ -88,8 +94,18 @@ format :html do
     end.join Card::Name.joint
   end
 
-  def full_page_link
-    link_to_card full_page_card, full_page_icon, class: classy("full-page-link")
+  def full_page_link text: ""
+    link_to_card full_page_card, "#{full_page_icon} #{text}",
+                 class: classy("full-page-link")
+  end
+
+  def modal_page_link text: ""
+    modal_link "#{modal_icon} #{text}",
+               path: { mark: card }, size: modal_page_size, class: "_modal-page-link"
+  end
+
+  def modal_page_size
+    :xl
   end
 
   def full_page_card
@@ -97,12 +113,12 @@ format :html do
   end
 
   def edit_in_bridge_link opts={}
-    edit_link :bridge, opts
+    edit_link :bridge, *opts
   end
 
-  def edit_link view=:edit, opts={}
-    link_to_view view, opts.delete(:link_text) || menu_icon,
-                 edit_link_opts(modal: (opts[:modal] || :lg))
+  def edit_link view=:edit, link_text: nil, text: "", modal: nil
+    link_to_view view, link_text || "#{menu_icon} #{text}",
+                 edit_link_opts(modal: (modal || :lg))
   end
 
   # @param modal [Symbol] modal size
@@ -126,4 +142,12 @@ format :html do
   def full_page_icon
     icon_tag :open_in_new
   end
+
+  def modal_icon
+    fa_icon :expand
+  end
+
+  def bridge_icon
+    fa_icon :box
+  end
 end