card 1.97.0.1 → 1.98.0

data/mod/core/spec/set/all/rules_spec.rb

@@ -25,7 +25,7 @@ describe Card::Set::All::Rules do
       # defaults should work when other Sets are present
       assert Card.create(name: "*all+*add help", content: "lobotomize")
       # Card.default_rule(:add_help, fallback: :help).should == 'lobotomize'
-      add_help_rule = Card.new(type: "Basic").rule(:add_help, fallback: :help)
+      add_help_rule = Card.new(type_id: Card::BasicID).rule(:add_help, fallback: :help)
       expect(add_help_rule).to eq("lobotomize")
     end
 

data/mod/core/spec/set/all/templating_spec.rb

@@ -43,9 +43,7 @@ describe Card::Set::All::Templating do
 
     it "has type and content overridden by (new) type_plus_right set" do
       Card::Auth.as_bot do
-        Card.create! name: "Basic+birthday+*type plus right+*structure",
-                     type: "PlainText",
-                     content: "Yesterday"
+        create_plain_text "RichText+birthday+*type plus right+*structure", "Yesterday"
       end
       jb = @jb.refresh true
       expect(jb.content).to eq("Yesterday")
@@ -82,9 +80,7 @@ describe Card::Set::All::Templating do
   describe "with type structure" do
     before do
       Card::Auth.as_bot do
-        @dt = Card.create! name: "Date+*type+*structure",
-                           type: "Basic",
-                           content: "Tomorrow"
+        @dt = create_basic "Date+*type+*structure", "Tomorrow"
       end
     end
 

data/mod/core/spec/set/all/type_spec.rb

@@ -26,7 +26,7 @@ describe Card::Set::All::Type do
     end
   end
 
-  describe "card with structured type" do
+  xdescribe "card with structured type" do
     before do
       Card::Auth.as_bot do
         Card.create! name: "Topic", type: "Cardtype"
@@ -39,7 +39,7 @@ describe Card::Set::All::Type do
     it "clears cache of structured nested card after saving" do
       pending "need new mechanism to replace #reset_type_specific_fields"
       Card::Auth.as_bot do
-        expect(Card.fetch("t1+results", new: {}).type_name).to eq("Basic")
+        expect(Card.fetch("t1+results", new: {}).type_name).to eq("RichText")
 
         topic1 = Card.new type: "Topic", name: "t1"
         topic1.format._render_new

data/mod/developer/set/right/debug.rb

@@ -1,5 +1,5 @@
 def virtual?
-  true
+  new?
 end
 
 format :html do

data/mod/edit/set/all/bridge/bridge.haml

@@ -3,6 +3,6 @@
     .col-8.bridge-main
       ._overlay-container-placeholder
         = interior
-    .col-4.bridge-sidebar
+    .col-4.bridge-sidebar.nodblclick
       ._overlay-container-placeholder
         = bridge_tabs

data/mod/edit/set/all/bridge/tab_views.rb

@@ -5,11 +5,11 @@ format :html do
                    ["references out", :refers_to],
                    ["references in",  :referred_to_by]].freeze
 
-  view :engage_tab, wrap: { div: { class: "m-3 mt-4 _engage-tab" } } do
+  view :engage_tab, wrap: { div: { class: "m-3 mt-4 _engage-tab" } }, cache: :never do
     [render_follow_section, discussion_section].compact
   end
 
-  view :history_tab do
+  view :history_tab, wrap: :slot do
     class_up "d0-card-body",  "history-slot"
     voo.hide :act_legend
     acts_bridge_layout card.history_acts
@@ -19,7 +19,7 @@ format :html do
     bridge_pills bridge_pill_items(RELATED_ITEMS, "Related")
   end
 
-  view :rules_tab, tag: :unknown_ok do
+  view :rules_tab, unknown: true do
     class_up "card-slot", "flex-column"
     wrap do
       nest current_set_card, view: :bridge_rules_tab
@@ -30,7 +30,7 @@ format :html do
     bridge_pills bridge_pill_items(account_items, "Account")
   end
 
-  view :follow_section, wrap: :slot do
+  view :follow_section, wrap: :slot, cache: :never do
     follow_section
   end
 

data/mod/edit/set/all/edit_content.rb

@@ -16,11 +16,12 @@ format :html do
     end
   end
 
-  view :edit, perms: :update, tags: :unknown_ok, cache: :never,
+  view :edit, perms: :update, unknown: true, cache: :never,
               wrap: { modal: { footer: "",
                                size: :edit_modal_size,
                                title: :render_title,
                                menu: :edit_modal_menu } } do
+    add_name_context
     with_nest_mode :edit do
       voo.show :help
       voo.hide :save_button
@@ -33,10 +34,6 @@ format :html do
     end
   end
 
-  view :bridge_link, tags: :unknown_ok do
-    bridge_link
-  end
-
   def edit_modal_size
     :large
   end
@@ -47,11 +44,6 @@ format :html do
     end
   end
 
-  def bridge_link
-    link_to_view :bridge, material_icon(:more_horiz),
-                 class: "text-muted close", "data-slotter-mode": "modal-replace"
-  end
-
   def edit_form_opts
     # for override
     { "data-slot-selector": "modal-origin", "data-slot-error-selector": ".card-slot" }

data/mod/edit/set/all/{edit_in_place.rb → edit_inline.rb}

@@ -1,11 +1,12 @@
 format :html do
-  view :edit_in_place, perms: :update, tags: :unknown_ok, cache: :never, wrap: :slot do
+  view :edit_inline, perms: :update, unknown: true, cache: :never, wrap: :slot do
+    voo.hide :name_formgroup, :type_formgroup
     with_nest_mode :edit do
       card_form :update, success: edit_success do
         [
           edit_view_hidden,
           _render_content_formgroup,
-          _render_edit_in_place_buttons
+          _render_edit_inline_buttons
         ]
       end
     end
@@ -19,7 +20,7 @@ format :html do
     edit_row_fixed_width "Type", link_to_card(card.type), :edit_type_form
   end
 
-  view :edit_in_place_buttons do
+  view :edit_inline_buttons do
     button_formgroup do
       wrap_with "div", class: "d-flex" do
         [standard_save_button, cancel_in_place_button, delete_button]
@@ -32,11 +33,11 @@ format :html do
     wrap do
       ["<label class='w-50px'>#{title}</label>",
        content,
-       edit_in_place_link(edit_view, align: :right)]
+       edit_inline_link(edit_view, align: :right)]
     end
   end
 
-  def edit_in_place_link view=:edit_in_place, align: :left
+  def edit_inline_link view=:edit_inline, align: :left
     align = align == :left ? "ml-2" : "ml-auto"
     link_to_view view, menu_icon, class: "#{align} edit-link", "data-cy": "edit-link"
   end

data/mod/edit/set/all/edit_type.rb

@@ -21,9 +21,8 @@ format :html do
   end
 
   def edit_type_buttons
-    cancel_path = path view: :edit
     button_formgroup do
-      [standard_cancel_button(href: cancel_path)]
+      standard_cancel_button
     end
   end
 end

data/mod/edit/set/all/editing.rb

@@ -1,7 +1,6 @@
 format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
-  view :bridge, perms: :update, tags: :unknown_ok, cache: :never,
-                bridge: true, wrap: :bridge do
+  view :bridge, perms: :update, unknown: true, cache: :never, wrap: :bridge do
     with_nest_mode :edit do
       voo.show :help
       wrap true, breadcrumb_data("Editing", "edit") do
@@ -42,11 +41,11 @@ format :html do
   end
 
   # TODO: add undo functionality
-  view :just_deleted, tag: :unknown_ok do
+  view :just_deleted, unknown: true do
     wrap { "#{render_title} deleted" }
   end
 
-  view :edit_rules, cache: :never, tags: :unknown_ok do
+  view :edit_rules, cache: :never, unknown: true do
     nest current_set_card, view: :bridge_rules_tab
   end
 

data/mod/edit/set/all/editor.rb

@@ -20,7 +20,7 @@ format :html do
     nest editor_card, view: :core
   end
 
-  view :editor do
+  view :editor, unknown: true do
     try(editor_method(editor)) ||
       editor_defined_by_card ||
       send(editor_method(default_editor))

data/mod/edit/set/all/form.rb

@@ -16,7 +16,7 @@ format :html do
     end
   end
 
-  view :edit_in_form, cache: :never, perms: :update, tags: :unknown_ok do
+  view :edit_in_form, cache: :never, perms: :update, unknown: true do
     reset_form
     @in_multi_card_editor = true
     edit_slot
@@ -42,11 +42,41 @@ format :html do
   def type_field args={}
     typelist = Auth.createable_types
     current_type = type_field_current_value args, typelist
-    options = options_from_collection_for_select typelist, :to_s, :to_s,
-                                                 current_type
+    options = grouped_options_for_select grouped_types(current_type), current_type
     template.select_tag "card[type]", options, args
   end
 
+  GROUP = {
+    "Content" => %w[RichText PlainText Phrase Date Number Toggle Markdown File Image URI],
+    "Custom" => [],
+    "Organize" => ["Cardtype", "Search", "List", "Link list", "Pointer",
+                   "Mirror list", "Mirrored list"],
+    "Admin" => ["Layout", "Skin", "User", "Role",
+                "Notification template", "Email template", "Twitter template" ],
+    "Code" => ["HTML", "Json", "CSS", "SCSS", "JavaScript", "CoffeeScript"]
+  }.freeze
+
+  # group for each cardtype: { "RichText => "Content", "Layout" => "Admin", ... }
+  GROUP_MAP = GROUP.each_with_object({}) do |(cat, types), h|
+                types.each { |t| h[t] = cat }
+              end
+
+  def grouped_types current_type
+    groups = Hash.new { |h, k| h[k] = [] }
+    allowed = ::Set.new Auth.createable_types
+    allowed << current_type if current_type
+
+    GROUP.each_pair do |name, items|
+      items.each do |i|
+        groups[name] << i if allowed.include?(i)
+      end
+    end
+    Auth.createable_types.each do |type|
+      groups["Custom"] << type unless GROUP_MAP[type]
+    end
+    groups
+  end
+
   def type_field_current_value args, typelist
     return if args.delete :no_current_type
 

data/mod/edit/set/all/form_buttons.rb

@@ -11,7 +11,8 @@ format :html do
     submit_button opts
   end
 
-  # @param close: [:modal, :overlay]
+  # @param opts [Hash]
+  # @option close [:modal, :overlay]
   #
   def standard_save_and_close_button opts={}
     close = opts.delete(:close) || :modal

data/mod/edit/set/all/nest_editor.rb

@@ -1,6 +1,8 @@
 format :html do
   NEST_OPTIONS = %i[view title show hide wrap help variant size params].freeze
   # Card::View::Options.shark_keys - %i[nest_syntax nest_name items cache]
+  # TODO: connect to Card::View::Options
+  # (that way a mod can add an option that becomes available to nests)
 
   view :nest_editor, cache: :never, template: :haml,
                      wrap: { slot: { class: "_overlay d0-card-overlay card nodblclick" } } do

data/mod/edit/set/all/nest_editor/_options_select_row.haml

@@ -1,6 +1,6 @@
 .form-row._nest-option-row{class: [template && "_template"]}
   .col-6
-    .input-group.input-group-sm.mb-2.card-outline-primary.mr-2._filter-input.d-flex.flex-nowrap
+    .input-group.input-group-sm.mb-2.mr-2.d-flex.flex-nowrap
       .input-group-prepend{class: [!name && "d-none"]}
         %button.btn.btn-secondary.input-group-text.p-1._nest-delete-option{:type => "button"}
           %small.text-muted

data/mod/edit/set/all/nest_editor/nest_parser.rb

@@ -37,8 +37,8 @@ class NestParser
     Card::Set::All::NestEditor::NEST_OPTIONS.each_with_object([]) do |key, res|
       next unless options[key]
 
-      if key == :show || key == :hide
-        values = Card::View::Visibility.normalize_view_list(options[key])
+      if key.in? %i[show hide]
+        values = Card::View.normalize_list(options[key])
         res.concat(values.map { |val| [key, val] })
       else
         res << [key, options[key]]

data/mod/edit/set/all/nest_image.rb

@@ -3,7 +3,7 @@ format :html do
     nest card.autoname(card.name.field("image01")), view: :new_image, type: :image
   end
 
-  view :new_image, perms: :create, tags: :unknown_ok, cache: :never do
+  view :new_image, perms: :create, unknown: true, cache: :never do
     new_view_frame_and_form new_image_form_opts
   end
 

data/mod/edit/set/all/new.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :new, perms: :create, tags: :unknown_ok, cache: :never do
+  view :new, perms: :create, unknown: true, cache: :never do
     new_view_frame_and_form new_form_opts
   end
 

data/mod/follow/README.md

@@ -1,3 +1,5 @@
+# @title README: follow mod
+
 # Follow
 
 Follow sets cards, get notified when any card in the set changes.
@@ -16,8 +18,9 @@ Each rule determines cases in which the _User_ should be notified about changes
 These cards have special permission handling, granting full permission to the _User_.
 
 Special views include:
-- _follow_item_
-- _follow_status_
+
+- *follow_item*
+- *follow_status*
 
 ### Follow options
 | name | type | content |
@@ -41,8 +44,8 @@ user's preferences in `follow_item` view. Navigate to this card via the
 card submenu (`account > follow`).
 
 Special views include:
-- _follow_tab_
-- _ignore_tab_
+- *follow_tab*
+- *ignore_tab*
 
 ### Follow suggestions
 | name | type | content |

data/mod/follow/set/all/notify/base_views.rb

@@ -89,7 +89,6 @@ format do
 
   def edit_info_for field, action
     return nil unless (value = action.value field)
-
     value = action.previous_value if action.action_type == :delete
     wrap_list_item "  #{notification_action_label action} #{field}: #{value}"
   end

data/mod/follow/set/right/followers.rb

@@ -22,5 +22,5 @@ def item_names _args={}
 end
 
 def virtual?
-  !real?
+  new?
 end

data/mod/follow/set/right/following.rb

@@ -1,5 +1,5 @@
 def virtual?
-  !real?
+  new?
 end
 
 format :html do

data/mod/follow/set/self/follow_defaults.rb

@@ -44,7 +44,7 @@ def follow_option item
 end
 
 format :html do
-  view :edit, perms: :update, tags: :unknown_ok do
+  view :edit, perms: :update, unknown: true do
     frame_and_form :update, hidden: { success: "_self",
                                       card: { update_all_users: false } } do
       [

data/mod/follow/set/type_plus_right/user/follow.rb

@@ -3,7 +3,7 @@
 
 include_set Abstract::Pointer
 def virtual?
-  !real?
+  new?
 end
 
 # def content

data/mod/follow/spec/set/all/follow_spec.rb

@@ -120,7 +120,7 @@ RSpec.describe Card::Set::All::Follow do
 
     context "when not following cardtype card" do
       it "renders 'follow all' link" do
-        assert_follow_view "Basic", add_set: "Basic+*type", text: "follow"
+        assert_follow_view "RichText", add_set: "RichText+*type", text: "follow"
       end
     end
 

data/mod/follow/spec/set/all/notify_email.txt

@@ -1,6 +1,6 @@
 "card with fields" was just created by Joe User.
 
-   cardtype: Basic
+   cardtype: RichText
    content: main content {{+field 1}}  {{+field 2}}
 
 
@@ -8,11 +8,11 @@
 This update included the following changes:
 
 card with fields+field 1 created
-   cardtype: Basic
+   cardtype: RichText
    content: content of field 1
 
 card with fields+field 2 created
-   cardtype: Basic
+   cardtype: RichText
    content: content of field 2
 
 

data/mod/follow/spec/set/all/notify_spec.rb

@@ -13,7 +13,7 @@ shared_examples_for "notifications" do
 
     example "for a new card" do
       expect(list_of_changes(created))
-        .to include("content: new content", "cardtype: Basic")
+        .to include("content: new content", "cardtype: RichText")
     end
 
     example "for a updated card" do
@@ -136,6 +136,17 @@ RSpec.describe Card::Set::All::Notify do
   end
 
   describe "#notify_followers" do
+    # Normally, delayed events renew the cache, which entails clearing the local cache.
+    # That breaks these tests, because if the local cache is cleared, then the +*account
+    # card that receives the :send_change_notice method is a _different_ object than
+    # the one expecting it.
+    #
+    # An alternative approach would be to insert _only_ the account object into the
+    # cache when the delayed job is started.  This would more reliably test that the
+    # delayed job can get everything it needs with a clean cache.
+    before { Card::Cache.no_renewal = true }
+    after { Card::Cache.no_renewal = false }
+
     def expect_user user_name
       expect(Card.fetch(user_name).account)
     end