card 1.99.1 → 1.99.6

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

@@ -108,10 +108,10 @@ format :html do
   end
 
   def multi_card_edit fields_only=false
-    nested_cards = nested_cards_for_edit(fields_only)
-    return structure_link if nested_cards.empty?
+    field_configs = edit_field_configs fields_only
+    return structure_link if field_configs.empty?
 
-    nested_cards.map do |name, options|
+    field_configs.map do |name, options|
       nest name, options || {}
     end.join "\n"
   end

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

@@ -5,7 +5,7 @@ format :html do
 
   def standard_save_button opts={}
     return if voo&.hide?(:save_button)
-    add_class opts, "submit-button btn-sm mr-3"
+    add_class opts, "submit-button btn-sm mr-3 _update-history-pills"
     opts[:text] ||= "Save"
     opts["data-cy"] = "save"
     submit_button opts
@@ -38,7 +38,7 @@ format :html do
   end
 
   def new_cancel_button
-    modal_cancel_button
+    voo.show?(:cancel_button) && modal_cancel_button
   end
 
   def delete_button opts={}

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

@@ -51,6 +51,7 @@ format :html do
 
   # redirect to *previous if no :href is given
   def cancel_button args={}
+    return unless voo.show? :cancel_button
     text = args.delete(:text) || "Cancel"
     add_class args, "btn btn-#{args.delete(:situation) || 'secondary'}"
     add_class args, cancel_strategy(args[:redirect], args[:href])

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

@@ -37,7 +37,7 @@ format :html do
     end
   end
 
-  def new_view_frame_and_form form_opts
+  def new_view_frame_and_form form_opts={}
     buttons = form_opts.delete(:buttons) || _render_new_buttons
     form_opts = form_opts.reverse_merge(success: new_success)
 
@@ -61,7 +61,7 @@ format :html do
           buttons
         ]
       end),
-       alert_guide]
+       (alert_guide if voo.show?(:guide))]
     end
   end
 

data/mod/edit/spec/set/all/bridge/tab_views_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Card::Set::All::Bridge::TabViews do
   check_views_for_errors :engage_tab, :history_tab, :related_tab, :rules_tab,
-                         :account_tab, :follow_section
+                         :follow_section
 
   specify "view :related_tab" do
     expect_view(:related_tab).to have_tag :ul do

data/mod/edit/spec/set/all/form_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe Card::Set::All::Form do
       no_edit_card = Card["cardtype a"]
       expect(no_edit_card.format.render_type)
         .to match(/<a[^>]* class="([^"]*)?\bcardtype\b[^"]*"/)
-        .and match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
+      # .and match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
     end
   end
 end

data/mod/edit/spec/set/all/{nest_editor → reference_editor/nest_editor}/nest_parser_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-RSpec.describe Card::Set::All::NestEditor::NestParser do
+RSpec.describe Card::Set::All::ReferenceEditor::NestEditor::NestParser do
   def parse nest
     described_class.new nest, :titled, :bar
   end

data/mod/edit/spec/set/all/{nest_editor_spec.rb → reference_editor/nest_editor_spec.rb}

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-RSpec.describe Card::Set::All::NestEditor do
+RSpec.describe Card::Set::All::ReferenceEditor::NestEditor do
   describe "view: nest_editor" do
     check_html_views_for_errors
 
@@ -50,7 +50,10 @@ RSpec.describe Card::Set::All::NestEditor do
       end
     end
 
-    example "with given field nest syntax", params: { edit_nest: "{{+hi|view: open; show: menu, toggle|view: titled}}" } do
+    example "with given field nest syntax",
+            params: {
+              tm_snippet_raw: "{{+hi|view: open; show: menu, toggle|view: titled}}"
+            } do
       expect_view(:nest_editor).to have_tag "div.nest_editor-view" do
         with_name "hi", true
         with_tag "div.options-container" do
@@ -69,7 +72,7 @@ RSpec.describe Card::Set::All::NestEditor do
     end
 
     example "with given non-field nest syntax",
-            params: { edit_nest: "{{hi|view: open; show: menu, toggle}}" } do
+            params: { tm_snippet_raw: "{{hi|view: open; show: menu, toggle}}" } do
       expect_view(:nest_editor).to have_tag "div.nest_editor-view" do
         with_name "hi", false
         with_tag "div.options-container" do

data/mod/edit/spec/set/all/{nest_image_spec.rb → reference_editor/nest_image_spec.rb}

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-RSpec.describe Card::Set::All::NestImage do
+RSpec.describe Card::Set::All::ReferenceEditor::NestImage do
   describe "view: nest_image" do
     check_html_views_for_errors
 

data/mod/email/set/abstract/test_context.rb

@@ -7,7 +7,7 @@ format :html do
   end
 
   def test_context_card
-    card.left.fetch(trait: :test_context)&.item_card
+    card.left.fetch(:test_context)&.item_card
   end
 end
 

data/mod/email/set/type/email_template/email_config.rb

@@ -21,7 +21,7 @@ def email_config context, fields={}, opts={}
 end
 
 def email_field_from_card field, auth, format_opts
-  return unless (field_card = fetch(trait: field))
+  return unless (field_card = fetch(field))
   auth ||= field_card.updater
   special_email_field_method(field, field_card, auth, format_opts) ||
     standard_email_field(field, field_card, auth, format_opts)
@@ -68,7 +68,7 @@ def email_from_field_value conf_name, conf_email, actual_email
   elsif actual_email.present?
     actual_email
   else
-    Card[Card::WagnBotID].account.email
+    Card[WagnBotID].account.email
   end
 end
 

data/mod/follow/set/all/follow/followed_by.rb

@@ -27,8 +27,7 @@ def followed_field? field_card
 end
 
 def nested_card? card
-  @nested_ids ||= includee_ids
-  @nested_ids.include? card.id
+  nestee_ids.include? card.id
 end
 
 ## the following methods all handle _explicit_ (direct) follow rules (not fields)

data/mod/follow/set/all/follow/follower_ids.rb

@@ -2,17 +2,29 @@ FOLLOWER_IDS_CACHE_KEY = "FOLLOWER_IDS".freeze
 
 card_accessor :followers
 
-event :cache_expired_for_type_change, :store,
-      on: :update, changed: %i[type_id name] do
+event :cache_expired_for_type_change, :store, on: :update, changed: %i[type_id name] do
+  act_card&.schedule_preference_expiration
   # FIXME: expire (also?) after save
   Card.follow_caches_expired
 end
 
+def schedule_preference_expiration
+  @expire_preferences_scheduled = true
+end
+
+def expire_preferences?
+  @expire_preferences_scheduled
+end
+
+event :expire_preferences_cache, :finalize, when: :expire_preferences? do
+  Card::Rule.clear_preference_cache
+end
+
 # follow cache methods on Card class
 module ClassMethods
   def follow_caches_expired
     Card.clear_follower_ids_cache
-    Card.clear_preference_cache
+    Card::Rule.clear_preference_cache
   end
 
   def follower_ids_cache
@@ -89,7 +101,7 @@ def direct_follower_ids &block
 end
 
 def setcard_from_name set_name
-  Card.fetch set_name, new: { type_id: Card::SetID }
+  Card.fetch set_name, new: { type_id: SetID }
 end
 
 def direct_follower_ids_for_set set_card, ids

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

@@ -27,7 +27,7 @@ event :notify_followers_after_delete, :integrate, on: :delete, when: :notable_ch
 end
 
 def notify_followers
-  return unless (act = ActManager.act)
+  return unless (act = Card::ActManager.act)
 
   act.reload
   notify_followers_of act
@@ -71,14 +71,10 @@ def silent_change
 end
 
 def current_act_card?
-  return false unless (act_card = ActManager.act_card)
+  return false unless act_card
 
   act_card.id.nil? || act_card.id == id
   # FIXME: currently card_id is nil for deleted acts (at least
   # in the store phase when it's tested).  The nil test was needed
   # to make this work.
 end
-
-def act_card
-  @supercard || self
-end

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

@@ -45,7 +45,7 @@ format do
   view :unfollow_url, perms: :none, compact: true, cache: :never do
     return "" unless (rule_name = live_follow_rule_name)
 
-    card_url path(mark: "#{active_notice(:follower)}+#{Card[:follow].name}",
+    card_url path(mark: "#{active_notice(:follower)}+#{:follow.cardname}",
                   action: :update,
                   card: { subcards: { rule_name => Card[:never].name } })
   end

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

@@ -1,13 +1,15 @@
 def send_change_notice act, followed_set, follow_option
-  return unless changes_visible?(act)
+  return unless email.present? && changes_visible?(act)
 
+  notify_of_act act do
+    { follower: left.name, followed_set: followed_set, follow_option: follow_option }
+  end
+end
+
+def notify_of_act act
   Auth.as(left.id) do
     Card[:follower_notification_email].deliver(
-      act.card, { to: email },
-      auth: left,
-      active_notice: { follower: left.name,
-                       followed_set: followed_set,
-                       follow_option: follow_option }
+      act.card, { to: email }, auth: left, active_notice: yield
     )
   end
 end

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

@@ -11,14 +11,11 @@ format :html do
 end
 
 def content
-  return "" unless left
-
-  item_names.map { |item| "[[#{item}]]" }.join "\n"
+  left ? item_names.to_pointer_content : ""
 end
 
 def item_names _args={}
-  return [] unless left
-  left.follow_set_card.prototype.follower_names
+  left ? left.follow_set_card.prototype.follower_names : []
 end
 
 def virtual?

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

@@ -1,3 +1,5 @@
+FOLLOW_TABS = { "Follow" => "follow_tab", "Ignore" => "ignore_tab" }.freeze
+
 # a virtual pointer to the sets that a user is following.
 # (data is stored in preferences: `[Set]+[User]+:follow`)
 
@@ -6,14 +8,10 @@ def virtual?
   new?
 end
 
-# def content
-#   item_names.map { |name| "[[#{name}]]" }
-# end
-
 # overrides pointer default
 def item_names _args={}
   if (user = left)
-    Card.preference_names user.name, "follow"
+    Card::Rule.preference_names user.name, "follow"
   else
     []
   end
@@ -38,8 +36,7 @@ format :html do
 
   # renders follow tab and ignore tab
   view :core do
-    lazy_loading_tabs({ "follow_tab" => "Follow", "ignore_tab" => "Ignore" },
-                      "follow_tab") do
+    tabs FOLLOW_TABS, "follow_tab", load: :lazy do
       render_follow_tab
     end
   end

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

@@ -65,7 +65,7 @@ RSpec.describe Card::Set::All::Follow do
   # didn't check if it can be adjusted to knew follow ui
   xdescribe "view: follow_link" do
     before do
-      Card::Auth.current_id = Card["Big Brother"].id
+      Card::Auth.signin "Big Brother"
     end
 
     def assert_following_view name, args
@@ -131,7 +131,7 @@ RSpec.describe Card::Set::All::Follow do
     end
 
     context "when following content I created" do
-      before { Card::Auth.current_id = Card["Narcissist"].id }
+      before { Card::Auth.signin "Narcissist" }
 
       it "renders following link" do
         assert_following_view "Sunglasses", add_set: "Sunglasses+*self",
@@ -140,7 +140,7 @@ RSpec.describe Card::Set::All::Follow do
     end
 
     context "when following content I edited" do
-      before { Card::Auth.current_id = Card["Narcissist"].id }
+      before { Card::Auth.signin "Narcissist" }
 
       it "renders following link" do
         assert_following_view "Magnifier+lens",

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

@@ -189,7 +189,7 @@ RSpec.describe Card::Set::All::Notify do
     end
 
     it "does not send notification to author of change" do
-      Card::Auth.current_id = Card["Big Brother"].id
+      Card::Auth.signin "Big Brother"
       expect_user("Big Brother").not_to be_notified
       update "Google glass"
     end

data/mod/follow/spec/set/right/followers_spec.rb

@@ -82,7 +82,7 @@ RSpec.describe Card::Set::Right::Followers do
 
     context "when following content I created" do
       it "contains creator" do
-        Card::Auth.current_id = Card["Big Brother"].id
+        Card::Auth.signin "Big Brother"
         card = Card.create! name: "created by Follower"
         expect(followers_of(card)).to include("Big Brother")
       end
@@ -95,7 +95,7 @@ RSpec.describe Card::Set::Right::Followers do
         end
 
         card = Card.create! name: "edited by Sara"
-        Card::Auth.current_id = Card["Sara"].id
+        Card::Auth.signin "Sara"
         card.update! content: "some content"
         expect(followers_of(card)).to include("Sara")
       end

data/mod/google_analytics/set/all/google_analytics.rb

@@ -10,7 +10,7 @@ format :html do
   end
 
   def google_analytics_key
-    @google_analytics_key ||= Card.global_setting :google_analytics_key
+    @google_analytics_key ||= Card::Rule.global_setting :google_analytics_key
   end
 
   def google_analytics_snippet_vars

data/mod/history/lib/card/act.rb

@@ -23,6 +23,8 @@ class Card
                                             class_name: "Card::Action"
     class << self
       # remove all acts that have no card. (janitorial)
+      #
+      # CAREFUL - could still have actions even if act card is gone...
       def delete_cardless
         left_join = "LEFT JOIN cards ON card_acts.card_id = cards.id"
         joins(left_join).where("cards.id IS NULL").delete_all
@@ -78,7 +80,7 @@ class Card
       # FIXME: if the following is necessary, we need to document why.
       # generally it's a very bad idea to have type-specific code here.
 
-      # return res unless res&.type_id&.in?([FileID, ImageID])
+      # return res unless res&.type_id&.in?([Card::FileID, Card::ImageID])
       # res.include_set_modules
     end
 
@@ -121,7 +123,7 @@ class Card
     def actions_affecting card
       actions.select do |action|
         (card.id == action.card_id) ||
-          card.includee_ids.include?(action.card_id)
+          card.nestee_ids.include?(action.card_id)
       end
     end
 

data/mod/history/lib/card/act/act_renderer/relative_act_renderer.rb

@@ -49,8 +49,9 @@ class Card
 
         def revert_link
           revert_actions_link "revert to this",
-                              { revert_actions: actions.map(&:id), view: :bridge },
-                              "data-slot-selector": ".bridge-view"
+                              { revert_actions: actions.map(&:id) },
+                              class: "_close-modal",
+                              "data-slotter-mode": "update-modal-origin"
         end
       end
     end

data/mod/history/lib/card/action.rb

@@ -21,8 +21,8 @@ class Card
   # * a _comment_ (where applicable)
   #
   class Action < ApplicationRecord
-    include Card::Action::Differ
-    extend Card::Action::Admin
+    include Differ
+    extend Admin
 
     belongs_to :act, foreign_key: :card_act_id, inverse_of: :ar_actions
     belongs_to :ar_card, foreign_key: :card_id, inverse_of: :actions, class_name: "Card"
@@ -86,7 +86,7 @@ class Card
       # specific types in here!
 
       # , skip_modules: true
-      # return res unless res && res.type_id.in?([FileID, ImageID])
+      # return res unless res && res.type_id.in?([Card::FileID, Card::ImageID])
       # res.include_set_modules
     end
 

data/mod/history/lib/card/action/admin.rb

@@ -8,17 +8,6 @@ class Card
         joins(left_join).where("cards.id IS NULL").delete_all
       end
 
-      # permanently delete all {Action actions} not associated with a
-      # {Change change}
-      def delete_changeless
-        joins(
-          "LEFT JOIN card_changes "\
-          "ON card_changes.card_action_id = card_actions.id"
-        ).where(
-          "card_changes.id IS NULL"
-        ).delete_all
-      end
-
       # permanently delete all {Action actions} associate with non-current
       # {Change changes}
       def delete_old