card 1.95.3 → 1.96.0

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

@@ -1,8 +1,8 @@
-event :rename, after: :set_name, on: :update do
+event :rename_in_trash, after: :set_name, on: :update do
   existing_card = Card.find_by_key_and_trash name.key, true
   return if !existing_card || existing_card == self
   existing_card.name = existing_card.name + "*trash"
-  existing_card.rename_without_callbacks
+  existing_card.rename_in_trash_without_callbacks
   existing_card.save!
 end
 
@@ -14,28 +14,27 @@ def suspend_name name
   Card.where(id: id).update_all(name: tmp_name, key: tmp_name)
 end
 
+event :validate_renaming, :validate, on: :update, changed: :name do
+  if db_content_is_changing?
+    errors.add :content, "cannot change content while changing name"
+  end
+  errors.add :type, "cannot change type while changing name" if type_id_is_changing?
+end
+
 event :cascade_name_changes, :finalize, on: :update, changed: :name,
                                         before: :name_change_finalized do
-  des = descendants
   @descendants = nil # reset
 
-  des.each do |de|
-    # here we specifically want NOT to invoke recursive cascades on these
-    # cards, have to go this low level to avoid callbacks.
-    Rails.logger.info "cascading name: #{de.name}"
-    newname = de.name.swap name_before_last_save, name
-    check_for_conflict de.name, newname
-    Card.expire de.name # old name
-    Card.where(id: de.id).update_all name: newname.to_s, key: newname.key
-    de.update_referers = update_referers
-    de.refresh_references_in
-    Card.expire newname
-  end
-end
+  children.each do |child|
+    Rails.logger.info "cascading name: #{child.name}"
+    newname = child.name.swap name_before_last_save, name
+    # not sure if this is still needed since we attach the children as subcards
+    # (it used to be resolved right here without adding subcards)
+    Card.expire child.name
 
-def check_for_conflict old_name, new_name
-  return unless ActManager.include?(new_name) && (old_name.key != new_name.key)
-  raise Card::Error, "conflict in act: "\
-                     "the name of '#{old_name}' is changing to '#{new_name}' "\
-                     "which is also a subcard of this act."
+    # superleft has to be the first argument. Otherwise the call of `name=` in
+    # `assign_attributes` can cause problems because `left` doesn't find the new left.
+    attach_subcard child.name, superleft: self, name: newname,
+                               update_referers: update_referers
+  end
 end

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

@@ -50,12 +50,21 @@ module ClassMethods
   end
 end
 
-def delete
-  update_attributes trash: true unless new_card?
+def delete args={}
+  add_to_trash args do |delete_args|
+    update_attributes delete_args
+  end
+end
+
+def delete! args={}
+  add_to_trash args do |delete_args|
+    update_attributes! delete_args
+  end
 end
 
-def delete!
-  update_attributes! trash: true unless new_card?
+def add_to_trash args
+  return if new_card?
+  yield args.merge trash: true
 end
 
 event :manage_trash, :prepare_to_store, on: :create do

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

@@ -139,12 +139,12 @@ RSpec.describe "act API" do
           self.content = "new content"
           changed_attributes
         end
-        test_event :integrate do
+        test_event :integrate, for: "new name" do
           expect(name_is_changing?).to be_truthy
           expect(name_before_act).to eq("A")
           expect(db_content_before_act).to eq("Alpha [[Z]]")
         end
-        test_event :integrate_with_delay do
+        test_event :integrate_with_delay, for: "new name" do
           expect(name_is_changing?).to be_truthy
           expect(name_before_act).to eq("A")
           expect(db_content_before_act).to eq("Alpha [[Z]]")
@@ -161,13 +161,13 @@ RSpec.describe "act API" do
       end
 
       with_test_events do
-        test_event :integrate, changed: :name do
+        test_event :integrate, changed: :name, for: "new name" do
           event_called :i_name
         end
         test_event :integrate, changed: :content do
           event_called :i_content
         end
-        test_event :integrate_with_delay, changed: :name do
+        test_event :integrate_with_delay, changed: :name, for: "new name" do
           event_called :iwd_name
         end
         test_event :integrate_with_delay, changed: :content do

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::EventConditions, "event" do
+RSpec.describe Card::Set::All::EventConditions do
   let(:create_card) {Card.create!(name: "main card")}
   let(:create_card_with_subcards) do
     Card.create name: "main card",
@@ -51,17 +51,75 @@ describe Card::Set::All::EventConditions, "event" do
       end
     end
 
-    specify "skip event condition" do
-      with_test_events do
-        test_event :validate, on: :update, optional: true, for: "A" do
-          add_to_log "not skipped"
+    describe "trigger option" do
+      specify "trigger for whole act" do
+        with_test_events do
+          test_event :validate, on: :update, trigger: :required, for: "A" do
+            add_to_log "triggered"
+          end
+          Card["A"].update_attributes! content: "changed content"
+
+          aggregate_failures do
+            expect(@log).to be_empty
+            Card["A"].update_attributes! content: "changed content",
+                                         trigger: :test_event_0
+            expect(@log).to contain_exactly "triggered"
+          end
         end
-        Card["A"].update_attributes! content: "changed content", skip_event: :test_event_0
+      end
+    end
 
-        aggregate_failures do
-          expect(@log).to be_empty
-          Card["A"].update_attributes! content: "changed content"
-          expect(@log).to contain_exactly "not skipped"
+    describe "skip option" do
+      specify "skip_event condition" do
+        with_test_events do
+          test_event :validate, on: :update, skip: :allowed, for: "A" do
+            add_to_log "executed"
+          end
+          Card["A"].update_attributes! content: "changed content", skip: :test_event_0
+
+          aggregate_failures do
+            expect(@log).to be_empty
+            Card["A"].update_attributes! content: "changed content"
+            expect(@log).to contain_exactly "executed"
+          end
+        end
+      end
+
+      specify "skip_event condition in subcard" do
+        with_test_events do
+          test_event :validate, on: :update, skip: :allowed, for: "A+B" do
+            add_to_log "not skipped"
+          end
+          Card["A"].update_attributes! content: "changed content",
+                                       skip: :test_event_0,
+                                       subcards: { "+B" => "changed +B content" }
+
+          aggregate_failures do
+            expect(@log).to be_empty
+            Card["A"].update_attributes! content: "changed content",
+                                         subcards: { "+B" => "changed +B content" }
+            expect(@log).to contain_exactly "not skipped"
+          end
+        end
+      end
+
+      specify "skip_event_in_action condition" do
+        with_test_events do
+          test_event :validate, on: :update, skip: :allowed do
+            add_to_log "#{name} not skipped"
+          end
+          Card["A"].update_attributes! content: "changed content",
+                                       skip_in_action: :test_event_0,
+                                       subcards: { "+B" => "changed +B content" }
+
+          aggregate_failures do
+            expect(@log).to contain_exactly "A+B not skipped"
+            Card["A"].update_attributes! content: "changed content",
+                                         subcards: { "+B" => "changed +B content" }
+            expect(@log).to contain_exactly "A+B not skipped",
+                                            "A not skipped",
+                                            "A+B not skipped"
+          end
         end
       end
     end

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

@@ -34,11 +34,14 @@ RSpec.describe Card::Set::All::Export do
           a_hash_including(name: "A+B", type: "Basic", content: "AlphaBeta")
         )
       end
+
       it "stops while the depth count > 10" do
-        expect(export_pointer("pointer export card")).to include(
-          name: "pointer export card", type: "Pointer",
-          content: "[[pointer export card]]"
-        )
+        expect(export_pointer("pointer export card"))
+          .to include(
+            a_hash_including(name: "pointer export card",
+                             type: "Pointer",
+                             content: "[[pointer export card]]")
+          )
       end
     end
 

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

@@ -1,9 +1,46 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::References do
+RSpec.describe Card::Set::All::References do
   it "replaces references should work on nests inside links" do
     card = Card.create! name: "ref test", content: "[[test_card|test{{test}}]]"
     assert_equal "[[test_card|test{{best}}]]",
                  card.replace_reference_syntax("test", "best")
   end
+
+  describe "#referers" do
+    it "returns all cards that refer to card" do
+      expect(Card["Blue"].referers.map(&:name))
+        .to contain_exactly(
+          "blue includer 1", "blue includer 2", "blue linker 1", "blue linker 2"
+        )
+    end
+  end
+
+  describe "#nesters" do
+    it "returns all cards that nest card" do
+      expect(Card["Blue"].nesters.map(&:name))
+        .to contain_exactly("blue includer 1", "blue includer 2")
+    end
+  end
+
+  describe "#referee" do
+    it "returns all cards that card nests" do
+      expect(Card["Y"].referees.map(&:name)).to contain_exactly("A", "A+B", "B", "T")
+    end
+
+    it "returns all cards that card links to and their ancestors" do
+      # NOTE: B is not directly referred to; the reference is implied by the link to A+B
+      expect(Card["X"].referees.map(&:name)).to contain_exactly("A", "A+B", "B", "T")
+    end
+  end
+
+  describe "#nestee" do
+    it "returns all cards that card nests" do
+      expect(Card["Y"].nestees.map(&:name)).to contain_exactly("A", "A+B", "B", "T")
+    end
+
+    it "returns all cards that card links to" do
+      expect(Card["X"].nestees.map(&:name)).to eq([])
+    end
+  end
 end

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

@@ -131,37 +131,43 @@ RSpec.describe Card::Set::All::Rename do
     example "renaming card with self link should nothang" do
       pre_content = Card["self_aware"].content
       update "self aware", name: "buttah", update_referers: true
-      expect_content_of("Buttah").to eq pre_content
+      expect_card("Buttah").to have_content(pre_content)
     end
 
     it "renames card without updating references" do
       pre_content = Card["self_aware"].content
       update "self aware", name: "Newt", update_referers: false
-      expect_content_of("Newt").to eq pre_content
+      expect_card("Newt").to have_content(pre_content)
     end
   end
 
   context "references" do
     it "updates nests" do
       update "Blue", name: "Red", update_referers: true
-      expect_content_of("blue includer 1").to eq "{{Red}}"
-      expect_content_of("blue includer 2").to eq "{{Red|closed;other:stuff}}"
+      expect_card("blue includer 1").to have_content("{{Red}}")
+      expect_card("blue includer 2").to have_content("{{Red|closed;other:stuff}}")
     end
 
-    it "tupdates nests when renaming to plus" do
+    it "updates nests when renaming to plus" do
       update "Blue", name: "blue includer 1+color", update_referers: true
-      expect_content_of("blue includer 1").to eq "{{blue includer 1+color}}"
+      expect_card("blue includer 1").to have_content("{{blue includer 1+color}}")
     end
 
     it "reference updates on case variants" do
       update "Blue", name: "Red", update_referers: true
-      expect_content_of("blue linker 1").to eq "[[Red]]"
-      expect_content_of("blue linker 2").to eq "[[Red]]"
+      expect_card("blue linker 1").to have_content("[[Red]]")
+      expect_card("blue linker 2").to have_content("[[Red]]")
+    end
+
+    it "handles link to and nest of same card" do
+      update "blue linker 1", content: "[[Blue]] is {{Blue|name}}"
+      update "Blue", name: "Red", update_referers: true
+      expect_card("blue linker 1").to have_content("[[Red]] is {{Red|name}}")
     end
 
     example "reference updates plus to simple" do
       assert_rename Card["A+B"], "schmuck"
-      expect_content_of("X").to eq "[[A]] [[schmuck]] [[T]]"
+      expect_card("X").to have_content("[[A]] [[schmuck]] [[T]]")
     end
 
     it "substitutes name part" do

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Right::Followers do
+RSpec.describe Card::Set::Right::Followers do
   describe "#content" do
     it "returns a pointer list of followers" do
       card = Card.fetch "All Eyes on me"

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

@@ -1,15 +1,11 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Following do
-  extend Card::SpecHelper::ViewHelper::ViewDescriber
-
   context "when admin is following" do
-    let(:following) { Card.fetch "Joe Admin", :following }
-
-    describe_views :core, :status, :rule_editor do
-      it "doesn't have errors" do
-        expect(following.format.render(view)).to lack_errors
-      end
+    def card_subject
+      Card.fetch "Joe Admin", :following
     end
+
+    check_views_for_errors :core, :status, :rule_editor
   end
 end

data/mod/follow/spec/set/type/notification_template_spec.rb

@@ -1,4 +1,4 @@
-describe Card::Set::Type::NotificationTemplate do
+RSpec.describe Card::Set::Type::NotificationTemplate do
   include ActionController::TestCase::Behavior
   before do
     @routes = Decko::Engine.routes

data/mod/history/set/all/act_view.rb

@@ -73,7 +73,7 @@ format :html do
   end
 
   def current_act_seq acts
-    @act_seq = @act_seq ? (@act_seq += 1) : act_list_starting_seq(acts)
+    @act_seq = @act_seq ? (@act_seq -= 1) : act_list_starting_seq(acts)
   end
 
   def clean_acts acts
@@ -87,7 +87,7 @@ format :html do
   end
 
   def act_list_starting_seq acts
-    acts.size - (acts_page_from_params - 1) * acts_per_page + 1
+    acts.size - (acts_page_from_params - 1) * acts_per_page
   end
 
   def acts_per_page

data/mod/item/set/all/bar.haml

@@ -0,0 +1,12 @@
+.bar.border.left-stripe.d-flex.justify-content-between.p-0.double-border-fix-bottom.with-fancy-border
+  - if voo.show? :bar_left
+    %div{class: classy("bar-left")}
+      = render :bar_left
+  - if voo.show? :bar_middle
+    %div{class: classy("bar-middle")}
+      = render :bar_middle
+  - if voo.show? :bar_right
+    %div{class: classy("bar-right")}
+      = render :bar_right
+      = render :bar_page_link
+      = render :bar_expand_link

data/mod/item/set/all/bar.rb

@@ -0,0 +1,77 @@
+include_set Abstract::BsBadge
+
+format :html do
+  view :thin_bar do
+    render_bar hide: :bar_middle
+  end
+
+  view :bar do
+    wrap { haml :bar }
+  end
+
+  view :expanded_bar do
+    wrap { haml :expanded_bar }
+  end
+
+  view :expanded_edit_bar, perms: :none do
+    _render_expanded_bar!
+  end
+
+  before :bar do
+    shared = "align-items-center"
+    class_up "bar-left", "p-2 font-weight-bold d-flex grow-2 #{shared}"
+    class_up "bar-middle", "col-3 d-none d-md-flex p-3 border-left #{shared}"
+    class_up "bar-right",
+             "p-3 border-left d-flex justify-content-end text-align-right #{shared}"
+  end
+
+  view :bar_left do
+    class_up "card-title", "mb-0"
+    render :title
+  end
+
+  view :bar_right do
+    render :edit_button, optional: :hide
+  end
+
+  view :bar_middle do
+    labeled_badge stat_number, stat_label
+  end
+
+  view :bar_bottom do
+    if nest_mode == :edit
+      render :edit
+    else
+      render :core
+    end
+  end
+
+  def stat_number
+    card.content.lines.count
+  end
+
+  def stat_label
+    stat_number == 1 ? "line" : "lines"
+  end
+
+  view :bar_page_link do
+    link_to_card card, icon_tag(:open_in_new), class: "text-muted"
+  end
+
+  def toggle_class
+    "slotter btn btn-sm btn-outline-secondary p-0 border-0 rounded-0"
+  end
+
+  view :bar_expand_link do
+    link_to_view :expanded_bar, icon_tag(:play_arrow), class: toggle_class
+  end
+
+  view :bar_collapse_link do
+    link_to_view :bar, icon_tag(:arrow_drop_down, class: "md-24"), class: toggle_class
+  end
+
+  view :edit_button do
+    link_to_view :edit, "Edit",
+                 class: "btn btn-sm btn-outline-primary slotter mr-2"
+  end
+end