card 1.99.1 → 1.99.6

data/mod/core/set/all/states.rb

@@ -80,5 +80,5 @@ def pristine?
 end
 
 def user_changes?
-  actions.joins(:act).where("card_acts.actor_id != ?", Card::WagnBotID).exists?
+  actions.joins(:act).where("card_acts.actor_id != ?", WagnBotID).exists?
 end

data/mod/core/set/all/subcards.rb

@@ -70,8 +70,18 @@ def clear_subcards
   subcards.clear
 end
 
+# ensures subfield is present
+# does NOT override subfield content if already present
+def ensure_subfield field_name, args={}
+  if subfield_present? field_name
+    subfield field_name
+  else
+    add_subfield field_name, args
+  end
+end
+
 def subfield_present? field_name
-  (field_card = subfield(field_name)) && field_card.content.present?
+  subfield(field_name)&.content&.present?
 end
 
 def deep_clear_subcards
@@ -99,3 +109,28 @@ event :reject_empty_subcards, :prepare_to_validate do
     director.subdirectors.delete(subcard)
   end
 end
+
+# check when deleting field that left has not also been deleted
+def trashed_left?
+  l = left
+  !l || l.trash
+end
+
+# check when renaming field that it is not actually the same field
+# (eg on a renamed trunk)
+def same_field?
+  same_field_trunk? && same_field_tag?
+end
+
+private
+
+# left is same card (even if renamed)
+def same_field_trunk?
+  l = superleft || Card[left_id]
+  lkey = name.left_name&.key
+  lkey.present? && l&.name&.key == lkey
+end
+
+def same_field_tag?
+  name.right_name.key == name_before_act.to_name.right_name.key
+end

data/mod/core/set/all/tabs.rb

@@ -9,8 +9,9 @@ format :html do
     card.each_item_name_with_options(_render_raw) do |name, options|
       construct_tab tabs, name, options
     end
-    lazy_loading_tabs tabs[:paths], tabs[:active][:name],
-                      tabs[:active][:content], type: tab_type
+    tabs tabs[:paths], tabs[:active][:name], tab_type: tab_type, load: :lazy do
+      tabs[:active][:content]
+    end
   end
 
   def construct_tab tabs, name, explicit_options
@@ -45,6 +46,6 @@ format :html do
     card.item_cards.each do |item|
       tabs[item.name] = nest item, item_view_options(args)
     end
-    static_tabs tabs, tab_type
+    tabs tabs, nil, tab_type: tab_type
   end
 end

data/mod/core/set/all/type.rb

@@ -1,7 +1,7 @@
 
 module ClassMethods
   def default_type_id
-    @@default_type_id ||= Card[:all].fetch(trait: :default, skip_modules: true).type_id
+    @@default_type_id ||= Card[:all].fetch(:default, skip_modules: true).type_id
   end
 end
 

data/mod/core/set/all/update_read_rules.rb

@@ -3,7 +3,7 @@
 # the reference stuff.  we need to organize a bit!
 
 event :update_rule_cache, :finalize, when: :is_rule? do
-  self.class.clear_rule_cache
+  Card::Rule.clear_rule_cache
 end
 
 event :expire_related, :finalize do

data/mod/core/set_pattern/03_type.rb

@@ -1,3 +1,5 @@
+load "card/set/type.rb" # "load" not "require" so pattern reloads properly
+
 def label name
   %(All "#{name}" cards)
 end

data/mod/core/set_pattern/08_type_plus_right.rb

@@ -28,6 +28,5 @@ def prototype_args anchor
 end
 
 def anchor_name card
-  type_name = card.left(new: {})&.type_name || Card.default_type_id.cardname
-  "#{type_name}+#{card.name.tag}"
+  "#{left_type(card)}+#{card.name.tag}"
 end

data/mod/core/spec/chunk/{literal_spec.rb → escaped_literal_spec.rb}

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Content::Chunk::EscapedLiteral, "literal chunk tests" do
+describe Card::Content::Chunk::EscapedLiteral do
   it "handles escaped link" do
     expect(render_content('write this: \[[text]]'))
       .to eq("write this: <span>[</span>[text]]")

data/mod/core/spec/chunk/keep_escaped_literal_spec.rb

@@ -0,0 +1,21 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Content::Chunk::KeepEscapedLiteral do
+  context "when parsing syntax" do
+    def apply_chunk content
+      Card::Content.new(content, Card.new, chunk_list: :references_keep_escaping).to_s
+    end
+
+    it "duplicates backslashes before nests" do
+      expect(apply_chunk('\{{A}}')).to eq('\\\\{{A}}')
+    end
+
+    it "duplicates backslacses before links" do
+      expect(apply_chunk('\[[A]]')).to eq('\\\\[[A]]')
+    end
+
+    it "doesn't duplicate random backslashes " do
+      expect(apply_chunk('\ \[A]')).to eq('\ \[A]')
+    end
+  end
+end

data/mod/core/spec/chunk/nest_spec.rb

@@ -126,6 +126,11 @@ RSpec.describe Card::Content::Chunk::Nest do
                          "Woot"
     end
 
+    it "handles triple curlies" do
+      card = Card.new content: "{{{A|name}}}"
+      expect(card.format._render_core).to eq("{A}")
+    end
+
     it "handles complex relative names" do
       bob_city = create! "bob+city", "Sparta"
       Card::Auth.as_bot do
@@ -178,8 +183,8 @@ RSpec.describe Card::Content::Chunk::Nest do
       create!("age")
       Card["*template"]
       specialtype = Card.create type_code: :cardtype, name: "SpecialType"
-      specialtype_template = specialtype.fetch(trait: :type, new: {})
-                                        .fetch(trait: :structure, new: {})
+      specialtype_template = specialtype.fetch(:type, new: {})
+                                        .fetch(:structure, new: {})
       specialtype_template.content = "{{#{Card::Name.joint}age}}"
       Card::Auth.as_bot { specialtype_template.save! }
       assert_equal "{{#{Card::Name.joint}age}}",

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

@@ -31,6 +31,7 @@ RSpec.describe Card::Set::All::Chunk do
 
     example "absolute option", as_bot: true do
       format = format_with_edit_fields [[:self, { absolute: true }]]
+
       expect(format.render_edit).to have_tag ".card-editor", with: { card_name: "*self" }
     end
 

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

@@ -177,7 +177,9 @@ RSpec.describe Card::Set::All::EventConditions do
       def add_logging_test_event allowed, for_name
         event_args = { on: :update, skip: allowed }
         event_args[:for] = for_name if for_name
-        test_event(:validate, event_args) { add_to_log "#{name} executed" }
+        test_event(:validate, event_args) do
+          add_to_log "#{name} executed"
+        end
       end
 
       def update_with_skip force, changes, skip_key
@@ -190,16 +192,16 @@ RSpec.describe Card::Set::All::EventConditions do
         end
       end
 
-      specify "skip_event condition" do
+      specify "skip condition" do
         expect_skipping({ content: "changed" }, [], "A executed", for_name: "A")
       end
 
-      specify "skip_event condition in subcard" do
+      specify "skip condition in subcard" do
         expect_skipping({ content: "changed", subcards: { "+B" => "changed +B" } },
                         [], "A+B executed", for_name: "A+B")
       end
 
-      specify "skip_event_in_action condition" do
+      specify "skip_in_action condition" do
         expect_skipping({ content: "changed", subcards: { "+B" => "changed +B" } },
                         ["A+B executed"],
                         ["A executed", "A+B executed", "A+B executed"],

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

@@ -8,6 +8,12 @@ RSpec.describe Card::Set::All::FetchHelper do
     Card.send :retrieve_existing, "A".to_name, opts
   end
 
+  describe "#controller fetch" do
+    it "removes underscores from new card names" do
+      expect(Card.controller_fetch(mark: "no_un_der_score").name).to eq("no un der score")
+    end
+  end
+
   describe "retrieve_existing" do
     it "looks for non-cached card in database" do
       expect_db_retrieval_with(:key, "a", nil) { retrieve }

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

@@ -152,7 +152,7 @@ RSpec.describe Card::Set::All::Fetch do
 
     describe "preferences" do
       before do
-        Card::Auth.current_id = Card::WagnBotID
+        Card::Auth.signin Card::WagnBotID
       end
 
       it "prefers db cards to pattern virtual cards" do

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

@@ -98,9 +98,9 @@ RSpec.describe Card::Set::All::Permissions do
 
     it "write user permissions" do
       Card::Auth.as_bot do
-        @u1.fetch(trait: :roles, new: {}).items = [@r1, @r2]
-        @u2.fetch(trait: :roles, new: {}).items = [@r1, @r3]
-        @u3.fetch(trait: :roles, new: {}).items = [@r1, @r2, @r3]
+        @u1.fetch(:roles, new: {}).items = [@r1, @r2]
+        @u2.fetch(:roles, new: {}).items = [@r1, @r3]
+        @u3.fetch(:roles, new: {}).items = [@r1, @r2, @r3]
 
         (1..3).map do |num|
           Card.create name: "c#{num}+*self+*update", type: "Pointer",
@@ -121,8 +121,8 @@ RSpec.describe Card::Set::All::Permissions do
 
     it "read group permissions" do
       Card::Auth.as_bot do
-        @u1.fetch(trait: :roles).items = [@r1, @r2]
-        @u2.fetch(trait: :roles).items = [@r1, @r3]
+        @u1.fetch(:roles).items = [@r1, @r2]
+        @u2.fetch(:roles).items = [@r1, @r3]
 
         (1..3).each do |num|
           Card.create name: "c#{num}+*self+*read", type: "Pointer",
@@ -146,7 +146,7 @@ RSpec.describe Card::Set::All::Permissions do
                       content: "[[r#{num}]]"
         end
 
-        @u3.fetch(trait: :roles, new: {}).items = [@r1]
+        @u3.fetch(:roles, new: {}).items = [@r1]
       end
 
       #          u1 u2 u3
@@ -166,9 +166,9 @@ RSpec.describe Card::Set::All::Permissions do
 
     it "read user permissions" do
       Card::Auth.as_bot do
-        @u1.fetch(trait: :roles, new: {}).items = [@r1, @r2]
-        @u2.fetch(trait: :roles, new: {}).items = [@r1, @r3]
-        @u3.fetch(trait: :roles, new: {}).items = [@r1, @r2, @r3]
+        @u1.fetch(:roles, new: {}).items = [@r1, @r2]
+        @u2.fetch(:roles, new: {}).items = [@r1, @r3]
+        @u3.fetch(:roles, new: {}).items = [@r1, @r2, @r3]
 
         (1..3).each do |num|
           Card.create name: "c#{num}+*self+*read", type: "Pointer",
@@ -235,8 +235,7 @@ RSpec.describe Card::Set::All::Permissions do
     end
 
     it "role wql" do
-      # warn "u1 roles #{Card[ @u1.id ].fetch(trait:
-      # :roles).item_names.inspect}"
+      # warn "u1 roles #{Card[ @u1.id ].fetch(roles).item_names.inspect}"
 
       # set up cards of type TestType, 2 with nil reader, 1 with role1 reader
       Card::Auth.as_bot do
@@ -252,7 +251,7 @@ RSpec.describe Card::Set::All::Permissions do
         )
       end
       # for Card::Auth.as to be effective, you can't have a logged in user
-      Card::Auth.current_id = nil
+      Card::Auth.signin nil
       Card::Auth.as(@u2) do
         expect(Card.search(content: "WeirdWord").map(&:name).sort).to(
           eq(%w[c2 c3])

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

@@ -49,5 +49,14 @@ RSpec.describe Card::Set::All::References do
       Card["A"].update! name: "AAA", update_referers: true
       expect(Card["X"].content).to eq("[[AAA]] [[AAA+B]] [[T]]")
     end
+
+    # FIXME: following should pass!
+    xit "handles reference loops" do
+      Card["A"].update! content: "[[A+B]] refers to me"
+      Card["A+B"].update! content: "[[A]] refers to me, too"
+      Card["A"].update! name: "AAA", update_referers: true
+      expect(Card["AAA+B"].content).to eq("[[AAA]] refers to me, too")
+      expect(Card["AAA"].content).to eq("[[AAA+B]] refers to me")
+    end
   end
 end

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

@@ -2,7 +2,7 @@
 
 describe Card::Set::All::Rules do
   before do
-    Card::Auth.current_id = Card::WagnBotID
+    Card::Auth.signin Card::WagnBotID
   end
 
   describe "setting data setup" do
@@ -68,7 +68,7 @@ describe Card::Set::All::Rules do
 
   describe "user specific rules" do
     before do
-      Card::Auth.current_id = Card.fetch("Joe User").id
+      Card::Auth.signin "Joe User"
     end
 
     it "user rule is recognized as rule" do
@@ -107,9 +107,9 @@ describe Card::Set::All::Rules do
       it "returns all user with values for the given Set and rule" do
         Card::Auth.as_bot do
           Card.create(name: "Book+*type+Joe User+*follow", content: "[[Home]]")
-          Card::Auth.current_id = Card.fetch("Joe Admin").id
+          Card::Auth.signin "Joe Admin"
           Card.create(name: "Book+*type+Joe Admin+*follow", content: "[[Home]]")
-          user_ids = Card.all_user_ids_with_rule_for(
+          user_ids = Card::Rule.all_user_ids_with_rule_for(
             Card.fetch("Book+*type"), :follow
           )
           expect(user_ids.sort).to eq(

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

@@ -4,22 +4,21 @@ end
 
 format :html do
   view :core do
-    subject = card.left
+    core_section_config(card.left).map do |item|
+      section(*item)
+    end
+  end
 
-    output [
-      ["Sets",
-       static_tabs("set modules" => set_modules_accordion(subject),
+  def core_section_config subject
+    [["Sets", tabs("set modules" => set_modules_accordion(subject),
                    "all modules" => singleton_modules_list(subject),
-                   "patterns" => set_patterns_breadcrumb(subject))],
-      ["Views",
-       static_tabs("by format" => subformat(subject)._render_views_by_format,
-                   "by name" => subformat(subject)._render_views_by_name)],
-      ["Events",
-       static_tabs(create: "<pre>#{subject.events(:create)}</pre>",
-                   update: "<pre>#{subject.events(:update)}</pre>",
-                   delete: "<pre>#{subject.events(:delete)}</pre>")],
-      ["Cache/DB Comparison", cache_comparison_table(subject)]
-    ].map { |item| section(*item) }
+                   "patterns"    => set_patterns_breadcrumb(subject))],
+     ["Views", tabs("by format" => subformat(subject)._render_views_by_format,
+                    "by name" => subformat(subject)._render_views_by_name)],
+     ["Events", tabs(create: "<pre>#{subject.events(:create)}</pre>",
+                     update: "<pre>#{subject.events(:update)}</pre>",
+                     delete: "<pre>#{subject.events(:delete)}</pre>")],
+     ["Cache/DB Comparison", cache_comparison_table(subject)]]
   end
 
   # rubocop:disable AccessorMethodName

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

@@ -1,10 +1,10 @@
 format :html do
-  BRIDGE_TABS = { account_tab: "Account",
-                  guide_tab: "Guide",
-                  engage_tab: "Engage",
-                  history_tab: "History",
-                  related_tab: "Related",
-                  rules_tab: "Rules" }.freeze
+  BRIDGE_TABS = { "Account" => :account_tab,
+                  "Guide"   => :guide_tab,
+                  "Engage"  => :engage_tab,
+                  "History" => :history_tab,
+                  "Related" => :related_tab,
+                  "Rules"   => :rules_tab }.freeze
 
   wrapper :bridge do
     class_up "modal-dialog", "no-gaps"
@@ -16,7 +16,7 @@ format :html do
 
   def bridge_tabs
     wrap do
-      lazy_loading_tabs visible_bridge_tabs, bridge_tab, _render(bridge_tab)
+      tabs(visible_bridge_tabs, bridge_tab, load: :lazy) { _render bridge_tab }
     end
   end
 
@@ -54,9 +54,7 @@ format :html do
   end
 
   def default_bridge_tab
-    (show_account_tab? && :account_tab) ||
-      (show_guide_tab? && :guide_tab) ||
-      :engage_tab
+    show_guide_tab? ? :guide_tab : :engage_tab
   end
 
   def breadcrumb_data title, html_class=nil

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

@@ -24,13 +24,6 @@ format :html do
     end
   end
 
-  view :account_tab do
-    bridge_pill_sections "Account" do
-      [["Settings", account_details_items],
-       ["Content", account_content_items]]
-    end
-  end
-
   view :follow_section, wrap: :slot, cache: :never do
     follow_section
   end

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

@@ -1,24 +1,22 @@
 format :html do
   def visible_bridge_tabs
-    BRIDGE_TABS.select do |key, _title|
-      send "show_#{key}?"
+    BRIDGE_TABS.select do |_title, view|
+      send "show_#{view}?"
     end
   end
 
   private
 
-  def show_account_tab?
-    return unless card.real?
-
-    card.account&.ok?(:update)
-  end
-
   def show_engage_tab?
     return unless card.real?
 
     show_follow? || show_discussion?
   end
 
+  def show_account_tab?
+    false
+  end
+
   def show_history_tab?
     card.real?
   end
@@ -50,6 +48,6 @@ format :html do
   def discussion_card
     return if card.new_card? || discussion_card?
 
-    card.fetch trait: :discussion, skip_modules: true, new: {}
+    card.fetch :discussion, skip_modules: true, new: {}
   end
 end