card 1.98.0 → 1.99.1

data/mod/settings/set/self/guide.rb

@@ -0,0 +1,3 @@
+extend Card::Setting
+setting_opts group: :editing, position: 3, rule_type_editable: true,
+             short_help_text: "appears in the full editor view to guide users"

data/mod/settings/set/self/head.rb

@@ -1,2 +1,4 @@
 extend Card::Setting
-setting_opts group: :webpage, position: 1, rule_type_editable: false
+setting_opts group: :webpage, position: 1, rule_type_editable: false,
+             short_help_text: "head tag content",
+             help_text: "head tag content"

data/mod/settings/set/self/help.rb

@@ -1,3 +1,5 @@
 extend Card::Setting
 setting_opts group: :editing, position: 1, rule_type_editable: true,
-             help_text: "help text people will see when editing"
+             short_help_text: "help text people will see when editing",
+             help_text: "[[http://decko.org/custom_help_text|Help text]] "\
+                        "people will see when editing."

data/mod/settings/set/self/input_type.rb

@@ -0,0 +1,13 @@
+extend Card::Setting
+setting_opts group: :editing,
+             position: 3,
+             rule_type_editable: false,
+             short_help_text: "edit interface"
+
+format :html do
+  def raw_help_text
+    "Configure [[https://ace.c9.io/|ace]], "\
+    "Decko's default code editor, using these available "\
+    "[[https://github.com/ajaxorg/ace/wiki/Configuring-Ace|options]]."
+  end
+end

data/mod/settings/set/self/layout.rb

@@ -1,2 +1,4 @@
 extend Card::Setting
-setting_opts group: :webpage, position: 3, rule_type_editable: false
+setting_opts group: :webpage, position: 3, rule_type_editable: false,
+             help_text: "HTML structure of card's page "\
+                        "[[http://decko.org/layouts | more]]"

data/mod/settings/set/self/on_create.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :event, position: 1, rule_type_editable: false
+setting_opts group: :event, position: 1, rule_type_editable: false,
+             help_text: "Configure events to be executed when card is created"

data/mod/settings/set/self/on_delete.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :event, position: 3, rule_type_editable: false
+setting_opts group: :event, position: 3, rule_type_editable: false,
+             help_text: "Configure events to be executed when card is deleted"

data/mod/settings/set/self/on_update.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :event, position: 2, rule_type_editable: false
+setting_opts group: :event, position: 2, rule_type_editable: false,
+             help_text: "Configure events to be executed when card is updated"

data/mod/settings/set/self/read.rb

@@ -1,3 +1,4 @@
 extend Card::Setting
 setting_opts group: :permission, position: 2, rule_type_editable: false,
-             help_text: "who can view cards"
+             short_help_text: "who can view cards",
+             help_text: "Who can view cards in the [[set]]."

data/mod/settings/set/self/structure.rb

@@ -1,3 +1,5 @@
 extend Card::Setting
 setting_opts group: :templating, position: 2, rule_type_editable: true,
-             help_text: "control card's content / structure"
+             short_help_text: "control card's content / structure",
+             help_text: "Controls cards' content / structure. "\
+                        "[[http://decko.org/formatting|more]]"

data/mod/settings/set/self/style.rb

@@ -1,2 +1,4 @@
 extend Card::Setting
-setting_opts group: :webpage, position: 4
+setting_opts group: :webpage, position: 4,
+             help_text: "Skin (collection of stylesheets) for card's page. "\
+                        "[[http://decko.org/skins|more]]"

data/mod/settings/set/self/table_of_contents.rb

@@ -1,2 +1,5 @@
 extend Card::Setting
-setting_opts group: :other, position: 1, rule_type_editable: false
+setting_opts group: :other, position: 1, rule_type_editable: false,
+             help_text: "Autogenerate [[http://decko.org/table_of_contents|"\
+                        "table of contents]] on cards with at least this many headers "\
+                        '("0" means never).'

data/mod/settings/set/self/thanks.rb

@@ -1,3 +1,5 @@
 extend Card::Setting
 setting_opts group: :other, position: 3, rule_type_editable: false,
-             help_text: "destination after card is created"
+             short_help_text: "destination after card is created",
+             help_text: "Destination after card is created. "\
+                        "[[http://decko.org/Custom_thank_you_messages_for_forms|more]]"

data/mod/settings/set/self/update.rb

@@ -1,3 +1,4 @@
 extend Card::Setting
 setting_opts group: :permission, position: 3, rule_type_editable: false,
-             help_text: "who can update cards"
+             short_help_text: "who can update cards",
+             help_text: "Who can update cards"

data/mod/settings/set/type/setting.rb

@@ -20,6 +20,10 @@ format :data do
   end
 end
 
+def count
+  Card.search left: { type: Card::SetID }, right: id, limit: 0, return: :count
+end
+
 def set_classes_with_rules
   Card.set_patterns.reverse.map do |set_class|
     wql = { left: { type: Card::SetID },
@@ -34,17 +38,6 @@ def set_classes_with_rules
 end
 
 format :html do
-  def duplicate_check rules
-    previous_content = nil
-    rules.each do |rule|
-      current_content = rule.db_content.strip
-      duplicate = previous_content == current_content
-      changeover = previous_content && !duplicate
-      previous_content = current_content
-      yield rule, duplicate, changeover
-    end
-  end
-
   def rule_link rule, text
     link_to_card rule, text, path: { view: :modal_rule },
                              slotter: true, "data-modal-class": "modal-lg"
@@ -54,31 +47,16 @@ format :html do
     haml do
       <<-'HAML'.strip_heredoc
         = _render_rule_help
-        %table.table.setting-rules
-          %thead.thead-dark
-            %th Set
-            %th Rule
-          - card.set_classes_with_rules.each do |klass, rules|
-            %thead.thead-light
-              %tr.klass-row
-                %th{class: ['setting-klass', "anchorless-#{klass.anchorless?}"]}
-                  = klass.anchorless? ? rule_link(rules.first, klass.pattern) : klass.pattern
-                %th.rule-content-container
-                  %span.closed-content.content
-                    - if klass.anchorless?
-                      = subformat(rules.first)._render_closed_content
-            - if !klass.anchorless?
-              %tbody
-                - duplicate_check(rules) do |rule, duplicate, changeover|
-                  %tr{class: ('rule-changeover' if changeover)}
-                    %td.rule-anchor
-                      = rule_link rule, rule.name.trunk_name.trunk_name
-                    - if duplicate
-                      %td
-                    - else
-                      %td.rule-content-container
-                        %span.closed-content.content
-                          = subformat(rule)._render_closed_content
+        %h3 All #{card.name.tr "*", ""} rules that apply to
+        - card.set_classes_with_rules.each do |klass, rules|
+          %p
+            %h5
+              = klass.generic_label.downcase
+            - if klass.anchorless?
+              = nest rules.first, view: :bar, show: :full_name
+            - else
+              - rules.each do |rule|
+                = nest rule, view: :bar
       HAML
     end
   end
@@ -89,7 +67,7 @@ format :html do
     nest [:all, card.name], view: :rule_help
   end
 
-  view :closed_content do
+  view :one_line_content do
     render_rule_help
   end
 end

data/mod/settings/spec/set/right/comment_spec.rb

@@ -1,36 +1,9 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Comment do
-  context "record appender" do
-    before do
-      #      @r = Card.where(type_id: Card::RoleID).first
-      @rule = Card.new name: "A+*self+*comment",
-                       type_id: Card::PointerID,
-                       content: "[[Anyone Signed In]]"
-    end
-
-    it "has appender immediately" do
-      expect(Card["a"].ok?(:comment)).not_to be_truthy
-      Card::Auth.as_bot do
-        @rule.save!
-      end
-      expect(Card["a"].ok?(:comment)).to be_truthy
-    end
-
-    it "has appender immediately" do
-      Card::Auth.as_bot do
-        expect(Card["a"].ok?(:comment)).not_to be_truthy
-        @rule.save!
-        expect(Card["a"].ok?(:comment)).to be_truthy
-      end
-    end
-  end
-
   context "comment addition" do
     it "combines content after save" do
       Card::Auth.as_bot do
-        Card.create name: "basicname+*self+*comment",
-                    content: "[[Anyone Signed In]]"
         Card["basicname"].update! comment: " and more\n  \nsome lines\n\n"
       end
       expect(Card["basicname"].content).to match(%r{\<p\>some lines\</p\>})

data/mod/settings/spec/set/right/create_spec.rb

@@ -4,7 +4,7 @@ describe Card::Set::Right::Create do
   it "renders the perm editor" do
     Card::Auth.as_bot do
       card = Card.new name: "A+B+*self+*create"
-      assert_view_select card.format._render_editor, "div[class=perm-editor]"
+      assert_view_select card.format._render_input, "div[class=perm-editor]"
     end
   end
 end

data/mod/settings/spec/set/right/structure_spec.rb

@@ -1,21 +1,24 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Right::Structure do
-  it "closed_content is rendered as type + raw" do
+RSpec.describe Card::Set::Right::Structure do
+  it "one_line_content is rendered as type + raw" do
     template = Card.new name: "A+*right+*structure",
                         content: "[[link]] {{nest}}"
-    expect(template.format._render(:closed_content)).to eq(
-      '<a class="cardtype known-card" href="/RichText">RichText</a>' \
-      " : [[link]] {{nest}}"
-    )
+    expect(template.format._render(:one_line_content))
+      .to have_tag "div.text-muted.one-line" do
+        with_tag "a.cardtype.known-card", with: { href: "/RichText" }, text: "RichText"
+        with_text(/ \: \[\[link\]\] \{\{nest\}\}/)
+      end
   end
 
-  it "closed_content is rendered as type + raw" do
+  it "one_line_content is rendered as type + raw" do
     template = Card.new name: "A+*right+*structure", type: "Html",
                         content: "[[link]] {{nest}}"
-    expect(template.format._render(:closed_content)).to eq(
-      '<a class="cardtype known-card" href="/HTML">HTML</a> : [[link]] {{nest}}'
-    )
+    expect(template.format._render(:one_line_content))
+      .to have_tag "div.text-muted.one-line" do
+      with_tag "a.cardtype.known-card", with: { href: "/HTML" }, text: "HTML"
+      with_text(/ \: \[\[link\]\] \{\{nest\}\}/)
+    end
   end
 
   # it 'renders core as raw' do

data/mod/settings/spec/set/type/setting_spec.rb

@@ -1,13 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Setting do
-  context "core view" do
-    it "has a table" do
-      core = render_card :core, name: :help
-      assert_view_select core, "table"
-    end
-  end
-
+RSpec.describe Card::Set::Type::Setting do
   describe "rule_help view" do
     subject { Card[:read].format.render :rule_help }
 

data/mod/solid_cache/set/right/solid_cache.rb

@@ -31,10 +31,10 @@ format :html do
   view :core, cache: :never do
     return super() unless card.new_card?
     @denied_view = :core
-    _render_missing
+    _render_unknown
   end
 
-  view :missing, cache: :never do
+  view :unknown, cache: :never do
     if @card.new_card? && (l = @card.left) && l.solid_cache?
       l.update_solid_cache
       @card = Card.fetch card.name
@@ -44,5 +44,5 @@ format :html do
     end
   end
 
-  view :new, :missing
+  view :new, :unknown
 end

data/mod/standard/set/all/comment.rb

@@ -7,6 +7,7 @@ event :add_comment, :prepare_to_store, on: :save, when: :comment do
   return unless comment.present?
   self.content =
     [content, format.comment_with_signature].compact.join "\n<hr\>\n"
+  self.comment = nil
 end
 
 attr_writer :comment_author
@@ -41,7 +42,7 @@ format do
     end
   end
 
-  view :comment_box, denial: :blank, unknown: true, perms: :comment do
+  view :comment_box, denial: :blank, unknown: true, perms: :update do
     wrap_with :div, class: "comment-box nodblclick" do
       action = card.new_card? ? :create : :update
       card_form action do

data/mod/standard/set/all/error.rb

@@ -5,11 +5,11 @@ def copy_errors card
 end
 
 format do
-  view :closed_missing, perms: :none, closed: true do
+  view :compact_missing, perms: :none, compact: true do
     ""
   end
 
-  view :missing, perms: :none, cache: :never do
+  view :unknown, perms: :none, cache: :never do
     ""
   end
 

data/mod/standard/set/all/path.rb

@@ -49,13 +49,13 @@ format do
 
   def new_cardtype_path opts
     return unless valid_opts_for_new_cardtype_path? opts
-    "new/#{path_mark opts}#{path_query opts}"
+    "#{opts.delete :action}/#{path_mark opts}#{path_query opts}"
   end
 
   def valid_opts_for_new_cardtype_path? opts
-    return unless opts[:action] == :new
-    opts.delete :action
-    # "new" is not really an action and is only
+    return unless opts[: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?
   end
@@ -126,7 +126,7 @@ format do
   end
 
   def add_unknown_name_to_opts name, opts
-    return if name_specified?(opts) || name_simple?(name) || Card.known?(name)
+    return if name_specified?(opts) || name_standardish?(name) || Card.known?(name)
     opts[:card] ||= {}
     opts[:card][:name] = name
   end
@@ -135,8 +135,8 @@ format do
     opts[:card] && opts[:card][:name]
   end
 
-  # name is same as url_key, so the url_key won't lose any info
-  def name_simple? name
+  # no name info will be lost by using url_key
+  def name_standardish? name
     name.s == Card::Name.url_key_to_standard(name.url_key)
   end
 end

data/mod/standard/set/all/rich_html/content.rb

@@ -1,13 +1,3 @@
-def show_comment_box_in_related?
-  false
-end
-
-def help_rule_card
-  setting = new_card? ? [:add_help, { fallback: :help }] : :help
-  help_card = rule_card(*setting)
-  help_card if help_card&.ok?(:read)
-end
-
 format :html do
   def prepare_content_slot
     class_up "card-slot", "d0-card-content"
@@ -17,13 +7,36 @@ format :html do
   before(:content) { prepare_content_slot }
 
   view :content do
-    wrap { [_render_menu, _render_core] }
+    voo.hide :edit_button
+    wrap do
+      [_render_menu, _render_core, _render_edit_button(edit: :inline)]
+    end
+  end
+
+  before(:content_with_edit_button) do
+    prepare_content_slot
+  end
+
+  view :content_with_edit_button do
+    wrap do
+      [_render_menu, _render_core, _render_edit_button(edit: :inline)]
+    end
   end
 
   view :short_content, wrap: { div: { class: "text-muted" } } do
     short_content
   end
 
+  view :raw_one_line_content, unknown: :mini_unknown,
+                              wrap: { div: { class: "text-muted" } } do
+    raw_one_line_content
+  end
+
+  view :one_line_content, unknown: :mini_unknown,
+                          wrap: { div: { class: "text-muted" } } do
+    one_line_content
+  end
+
   before(:content_with_title) { prepare_content_slot }
 
   view :content_with_title do
@@ -45,14 +58,14 @@ format :html do
     end
   end
 
-  view :titled, commentable: true do
+  view :titled do
     @content_body = true
     wrap do
       [
         naming { render_header },
         render_flash,
         wrap_body { render_titled_content },
-        render_comment_box
+        render_comment_box(optional: :hide)
       ]
     end
   end
@@ -74,19 +87,18 @@ format :html do
                                  items: (opts[:items] || {}).merge(view: item_view))
   end
 
-  view :open, commentable: true do
+  view :open do
     toggle_logic
     @toggle_mode = :open
     @content_body = true
     frame do
-      [_render_open_content, render_comment_box]
+      [_render_open_content, render_comment_box(optional: :hide)]
     end
   end
 
   view :closed do
-    with_nest_mode :closed do
+    with_nest_mode :compact do
       toggle_logic
-      voo.hide :closed_content
       class_up "d0-card-body", "closed-content"
       @content_body = false
       @toggle_mode = :close
@@ -105,6 +117,18 @@ format :html do
     Card.fetch(set_name)
   end
 
+  def raw_one_line_content
+    cleaned = Card::Content.clean! render_raw, {}
+    cut_with_ellipsis cleaned
+  end
+
+  def one_line_content
+    # TODO: use a version of Card::Content.smart_truncate
+    #       that counts characters instead of clean!
+    cleaned = Card::Content.clean! render_core, {}
+    cut_with_ellipsis cleaned
+  end
+
   # LOCALIZE
   def short_content
     short_content_items || short_content_fields || short_content_from_core