card 1.96.8 → 1.97.0

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

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

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

@@ -0,0 +1,17 @@
+@@options = { junction_only: true }
+
+def label _name
+  'All rule cards'
+end
+
+def short_label _name
+  'all rule cards'
+end
+
+def prototype_args _anchor
+  { name: "*all+*create" }
+end
+
+def pattern_applies? card
+  card.is_rule?
+end

data/mod/core/spec/format/html_format_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Card::Format::HtmlFormat do
       expect(view(:content, card: "A+B"))
         .to have_tag(
           'div[class="card-slot content-view ALL ALL_PLUS TYPE-basic '\
-          'RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b d0-card-content"]'
+    'RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b d0-card-content"]'
         )
     end
 
@@ -27,105 +27,12 @@ RSpec.describe Card::Format::HtmlFormat do
       end
     end
 
-    context "simple page with Default Layout" do
-      subject { view(:layout, card: "A+B") }
-
-      it "renders top menu" do
-        is_expected.to have_tag "header" do
-          with_tag 'a.nav-link.internal-link[href="/"]', text: "Home"
-          with_tag 'a.nav-link.internal-link[href="/:recent"]', text: "Recent"
-          with_tag 'form.navbox-form[action="/*search"]' do
-            with_tag 'select[name="query[keyword]"]'
-          end
-        end
-      end
-
-      it "renders card header" do
-        is_expected.to have_tag "div.d0-card-header.card-header" do
-          with_tag "div.d0-card-header-title" do
-            with_tag "span.card-title", text: "A+B"
-          end
-        end
-      end
-
-      it "renders card content" do
-        is_expected.to have_tag "div.d0-card-body.d0-card-content" \
-                                ".ALL.ALL_PLUS" \
-                                ".TYPE-basic.RIGHT-b.TYPE_PLUS_RIGHT-basic-b" \
-                                ".SELF-a-b.card-body.card-text",
-                                text:  /AlphaBeta/
-      end
-
-      it "renders card credit" do
-        is_expected.to have_tag 'div[class~="SELF-Xcredit"]' do
-          with_tag "img"
-          with_tag "a", text: "Decko v#{Card::Version.release}"
+    it "joins arrays" do
+      format =
+        Card["A"].format_with do
+          view(:array) { ["A", nil, %w[B C]] }
         end
-      end
-    end
-
-    context "layout" do
-      before do
-        Card::Auth.as_bot do
-          @layout_card = Card.create name: "tmp layout", type: "Layout"
-          # warn "layout #{@layout_card.inspect}"
-        end
-        c = Card["*all+*layout"]
-        c.content = "[[tmp layout]]"
-        @main_card = Card.fetch("Joe User")
-        Card::Env[:main_name] = @main_card.name
-
-        # warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
-      end
-
-      #      it "defaults to core view when in layout mode" do
-      #        @layout_card.content = "Hi {{A}}"
-      #        Card::Auth.as_bot { @layout_card.save }
-      #
-      #        expect(@main_card.format.render!(:layout)).to match('Hi Alpha')
-      #      end
-
-      #      it "defaults to open view for main card" do
-      #        @layout_card.content='Open up {{_main}}'
-      #        Card::Auth.as_bot { @layout_card.save }
-      #
-      #        result = @main_card.format.render_layout
-      #        expect(result).to match(/Open up/)
-      #        expect(result).to match(/card-header/)
-      #        expect(result).to match(/Joe User/)
-      #      end
-
-      it "renders custom view of main" do
-        @layout_card.content = "Hey {{_main|name}}"
-        Card::Auth.as_bot { @layout_card.save }
-
-        result = @main_card.format.render_layout
-        expect(result).to match(/Hey.*div.*Joe User/)
-        expect(result).not_to match(/d0-card-header/)
-      end
-
-      it "does not recurse" do
-        @layout_card.content = "Mainly {{_main|core}}"
-        Card::Auth.as_bot { @layout_card.save }
-        rendered = @layout_card.format.render! :layout
-        expect(rendered).to have_tag "div#main" do
-          have_tag "div.code" do
-            have_tag("pre") { with_text "Mainly {{_main|core}}" }
-          end
-        end
-      end
-
-      it "handles nested _main references" do
-        Card::Auth.as_bot do
-          @layout_card.content = "{{outer space|core}}"
-          @layout_card.save!
-          Card.create name: "outer space", content: "{{_main|name}}"
-        end
-        rendered = @main_card.format.render! :layout
-        expect(rendered).to have_tag "div#main" do
-          with_text "Joe User"
-        end
-      end
+      expect(format.render_array).to eq "A\nB\nC"
     end
   end
 end

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

@@ -1,4 +1,4 @@
-describe Card::Set::All::Codename do
+RSpec.describe Card::Set::All::Codename do
   describe "codename" do
     let(:card) { Card["a"] }
 

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::Collection do
+RSpec.describe Card::Set::All::Collection do
   describe "#item_names" do
     subject do
       item_names_args = @context ? { context: @context } : {}
@@ -86,10 +86,14 @@ describe Card::Set::All::Collection do
 
     it "loads only the first tab pane" do
       tabs = render_card :tabs, content: "[[A]]\n[[B]]\n[[C]]", type: "pointer"
-      assert_view_select tabs, "div[role=tabpanel]" do
-        assert_select "div.tab-pane#tempo_rary-a  .card-slot#A"
-        assert_select 'li > a.load[data-toggle=tab][href="#tempo_rary-b"]'
-        assert_select "div.tab-pane#tempo_rary-b", ""
+      expect(tabs).to have_tag :div, with: { role: "tabpanel" } do
+        with_tag "div.tab-pane#tempo_rary-a" do
+          with_tag "div.card-slot#a-content-view"
+        end
+        with_tag :li do
+          with_tag "a.load", with: { "data-toggle": "tab", href: "#tempo_rary-b" }
+        end
+        with_tag "div.tab-pane#tempo_rary-b"
       end
     end
 

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

@@ -51,6 +51,97 @@ RSpec.describe Card::Set::All::EventConditions do
       end
     end
 
+    context "when changing type" do
+      def update_type
+        Card::Auth.as_bot do
+          Card["Sample Pointer"].update! type: "Search"
+        end
+      end
+
+      it "does NOT run update events from sets that no longer apply after change" do
+        with_test_events do
+          test_event :validate, on: :update, set: Card::Set::Type::Pointer do
+            add_to_log "NO to run"
+          end
+          update_type
+          expect(@log).to be_empty
+        end
+      end
+
+      it "does run update events from old sets when `changing` value present" do
+        with_test_events do
+          test_event :validate,
+                     on: :update, set: Card::Set::Type::Pointer, changing: :type do
+            add_to_log "YES to run"
+          end
+          update_type
+          expect(@log).to contain_exactly("YES to run")
+        end
+      end
+
+      it "does run update events from sets that apply after change" do
+        with_test_events do
+          test_event :validate, on: :update, set: Card::Set::Type::SearchType do
+            add_to_log "YES to run"
+          end
+          update_type
+          expect(@log).to contain_exactly("YES to run")
+        end
+      end
+
+      # following does not yet work, because old card has both old sets and new sets
+      # when conditions are tested.
+      xit "does NOT run update events from new sets when `changing` value present" do
+        with_test_events do
+          test_event :validate,
+                     on: :update, set: Card::Set::Type::SearchType, changing: :type do
+            add_to_log "NO to run"
+          end
+          update_type
+          expect(@log).to be_empty
+        end
+      end
+    end
+
+    context "when changing name" do
+      def update_name
+        Card::Auth.as_bot do
+          Card["Cardtype B+*type+*create"].update! name: "B+*update"
+        end
+      end
+
+      it "does NOT run update events from sets that no longer apply after change" do
+        with_test_events do
+          test_event :validate, on: :update, set: Card::Set::Right::Create do
+            add_to_log "NO to run"
+          end
+          update_name
+          expect(@log).to be_empty
+        end
+      end
+
+      it "does run update events from old sets when `changing` value present" do
+        with_test_events do
+          test_event :validate,
+                     on: :update, set: Card::Set::Right::Create, changing: :name do
+            add_to_log "YES to run"
+          end
+          update_name
+          expect(@log).to contain_exactly("YES to run")
+        end
+      end
+
+      it "does run update events from sets that apply after change" do
+        with_test_events do
+          test_event :validate, on: :update, set: Card::Set::Right::Update do
+            add_to_log "YES to run"
+          end
+          update_name
+          expect(@log).to contain_exactly("YES to run")
+        end
+      end
+    end
+
     describe "trigger option" do
       specify "trigger for whole act" do
         with_test_events do

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::Pattern do
+RSpec.describe Card::Set::All::Pattern do
   describe :set_names do
     it "returns self, type, all for simple cards" do
       Card::Auth.as_bot do
@@ -33,15 +33,22 @@ describe Card::Set::All::Pattern do
       end
     end
 
-    it "returns set names for compound star cards" do
-      Card::Auth.as_bot do
-        expect(Card.new(name: "Iliad+*to").set_names).to eq(
-          [
-            "Book+*to+*type plus right", "*to+*right", "*rstar",
-            "Pointer+*type", "*all plus", "*all"
-          ]
-        )
-      end
+    it "returns set names for compound star cards", as_bot: true do
+      expect(Card.new(name: "Iliad+*to").set_names).to eq(
+        [
+          "Book+*to+*type plus right", "*to+*right", "*rstar",
+          "Pointer+*type", "*all plus", "*all"
+        ]
+      )
+    end
+
+    it "returns set names for rule cards", as_bot: true do
+      expect(Card.new(name: "*all+*create").set_names).to eq(
+        [
+          "*rule", "Set+*create+*type plus right", "*create+*right", "*rstar",
+          "Pointer+*type", "*all plus", "*all"
+        ]
+      )
     end
 
     # right place for this?  really need more prototype tests...

data/mod/developer/spec/set/right/debug_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Right::Debug do
+RSpec.describe Card::Set::Right::Debug do
   context "core view" do
     it "has a table" do
       Card::Auth.as_bot do

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

@@ -0,0 +1,61 @@
+format :html do
+  BRIDGE_TABS = { account_tab: "Account",
+                  engage_tab: "Engage",
+                  history_tab: "History",
+                  related_tab: "Related",
+                  rules_tab: "Rules" }.freeze
+
+  wrapper :bridge do
+    class_up "modal-dialog", "no-gaps"
+    voo.hide! :modal_footer
+    wrap_with_modal size: :full, title: bridge_breadcrumbs do
+      haml :bridge
+    end
+  end
+
+  def bridge_tabs
+    lazy_loading_tabs visible_bridge_tabs, bridge_tab, _render(bridge_tab)
+  end
+
+  def bridge_tab
+    @bridge_tab ||= bridge_param :tab
+  end
+
+  def bridge_param key
+    params.dig(:bridge, key)&.to_sym || try("default_bridge_#{key}")
+  end
+
+  def bridge_breadcrumbs
+    <<-HTML.strip_heredoc
+    <nav aria-label="breadcrumb">
+      <ol class="breadcrumb _bridge-breadcrumb">
+        <li class="breadcrumb-item">#{card.name}</li>
+        <li class="breadcrumb-item active">Edit</li>
+      </ol>
+    </nav>
+    HTML
+  end
+
+  def bridge_link_opts opts={}
+    opts[:"data-slot-selector"] = bridge_slot_selector
+    opts[:remote] = true
+    add_class opts, "slotter"
+    opts.bury :path, :layout, :overlay
+    opts[:path][:view] ||= :content
+    opts
+  end
+
+  def bridge_slot_selector
+    ".bridge-main > .card-slot, "\
+    ".bridge-main > .overlay-container > .card-slot._bottomlay-slot"
+  end
+
+  def default_bridge_tab
+    show_account_tab? ? :account_tab : :engage_tab
+  end
+
+  def breadcrumb_data title, html_class=nil
+    html_class ||= title.underscore
+    { "data-breadcrumb": title, "data-breadcrumb-class": html_class }
+  end
+end

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

@@ -0,0 +1,6 @@
+.bridge.container-fluid
+  .row
+    .col-8.bridge-main
+      = interior
+    .col-4.bridge-sidebar
+      = bridge_tabs

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

@@ -0,0 +1,37 @@
+format :html do
+  def follow_section
+    return unless show_follow?
+
+    wrap_with :div, class: "mb-3" do
+      [follow_button_group, followers_bridge_link, follow_overview_button]
+    end
+  end
+
+  def follow_button_group
+    wrap_with :div, class: "btn-group btn-group-sm follow-btn-group" do
+      [follow_button, follow_advanced]
+    end
+  end
+
+  def follow_overview_button
+    link_to_card [Auth.current, :follow], "all followed cards",
+                 bridge_link_opts(class: "btn btn-sm btn-secondary",
+                                  "data-cy": "follow-overview")
+  end
+
+  def follow_advanced
+    opts = bridge_link_opts(class: "btn btn-sm btn-primary",
+                            path: { view: :overlay_rule },
+                            "data-cy": "follow-advanced")
+    opts[:path].delete :layout
+    link_to_card card.follow_rule_card(Auth.current.name, new: {}),
+                 icon_tag("more_horiz"), opts
+  end
+
+  def followers_bridge_link
+    cnt = card.followers_count
+    link_to_card card.name.field(:followers), "#{cnt} follower#{'s' unless cnt == 1}",
+                 bridge_link_opts(class: "btn btn-sm ml-2 btn-secondary slotter",
+                                  remote: true, "data-cy": "followers")
+  end
+end

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

@@ -0,0 +1,75 @@
+format :html do
+  RELATED_ITEMS = [["children",       :children],
+                   # ["mates",          "bed",          "*mates"],
+                   # FIXME: optimize and restore
+                   ["references out", :refers_to],
+                   ["references in",  :referred_to_by]].freeze
+
+  view :engage_tab, wrap: { div: { class: "m-3 mt-4 _engage-tab" } } do
+    [render_follow_section, discussion_section].compact
+  end
+
+  view :history_tab do
+    class_up "d0-card-body",  "history-slot"
+    voo.hide :act_legend
+    acts_bridge_layout card.history_acts
+  end
+
+  view :related_tab do
+    bridge_pills bridge_pill_items(RELATED_ITEMS, "Related")
+  end
+
+  view :rules_tab, tag: :unknown_ok do
+    class_up "card-slot", "flex-column"
+    wrap do
+      nest current_set_card, view: :bridge_rules_tab
+    end
+  end
+
+  view :account_tab do
+    bridge_pills bridge_pill_items(account_items, "Account")
+  end
+
+  view :follow_section, wrap: :slot do
+    follow_section
+  end
+
+  def discussion_section
+    return unless show_discussion?
+
+    field_nest(:discussion, view: :titled, title: "Discussion", show: :comment_box,
+                            hide: [:menu])
+  end
+
+  def account_items
+    %i[account roles created edited follow].map do |item|
+      if item == :account
+        [tr(:details), item, { view: :edit, hide: %i[edit_name_row edit_type_row] }]
+      else
+        [tr(item), item]
+      end
+    end
+  end
+
+  def bridge_pills items
+    list_tag class: "nav nav-pills _auto-single-select bridge-pills flex-column",
+             items: { class: "nav-item" } do
+      items
+    end
+  end
+
+  def bridge_pill_items data, breadcrumb
+    data.map do |text, field, extra_opts|
+      opts = bridge_link_opts.merge("data-toggle": "pill")
+      opts.merge! breadcrumb_data(breadcrumb)
+      if extra_opts
+        classes = extra_opts.delete :class
+        add_class opts, classes if classes
+        opts.deep_merge! extra_opts
+      end
+      opts["data-cy"] = "#{text.to_name.key}-pill"
+      add_class opts, "nav-link"
+      link_to_card [card, field], text,  opts
+    end
+  end
+end