card 1.99.1 → 1.99.2

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/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/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/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,7 +107,7 @@ 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(
             Card.fetch("Book+*type"), :follow

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

@@ -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

@@ -7,18 +7,16 @@ format :html do
 
   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

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

@@ -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/{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)

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

@@ -35,7 +35,7 @@ end
 
 def notable_change?
   !silent_change? && current_act_card? &&
-    (Card::Auth.current_id != WagnBotID) && followable?
+    (Card::Auth.current_id != Card::WagnBotID) && followable?
 end
 
 def silent_change?

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/right/following.rb

@@ -28,7 +28,7 @@ format :html do
   end
 
   view :rule_editor, cache: :never do
-    rule_context = Card.fetch preference_name, new: { type_id: PointerID }
+    rule_context = Card.fetch preference_name, new: { type_id: Card::PointerID }
     wrap_with :div, class: "edit-rule" do
       follow_context = current_follow_rule_card || rule_context
       subformat(follow_context).rule_form :open, rule_context, :modal

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/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
 

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