card 1.96.8 → 1.97.0

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

@@ -59,6 +59,7 @@ end
 RSpec.describe Card::Set::All::Notify do
   # typically notifications are not sent on non-web-requests
   before { described_class.force_notifications = true }
+
   after { described_class.force_notifications = false }
 
   def notification_email_for card_name, followed_set: "#{card_name}+*self"
@@ -67,7 +68,7 @@ RSpec.describe Card::Set::All::Notify do
     Card[:follower_notification_email].format.mail(
       context, { to: follower.email }, auth: follower,
                                        active_notice: { follower: follower.name,
-                                                        followed_set:  followed_set,
+                                                        followed_set: followed_set,
                                                         follow_option: "*always" }
     ).text_part.body.raw_source
   end
@@ -128,8 +129,8 @@ RSpec.describe Card::Set::All::Notify do
     end
 
     it "creates well formatted text message" do
-      path = File.expand_path "../notify_email.txt", __FILE__
-      email = notification_email_for("card with fields").gsub /\r/, ""
+      path = File.expand_path "notify_email.txt", __dir__
+      email = notification_email_for("card with fields").delete "\r"
       expect(email).to eq(File.read(path))
     end
   end

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

@@ -1,43 +1,41 @@
-
-describe "#send_change_notice" do
-  subject(:mail) do
-    follower = Card["Joe User"]
-    Card[:follower_notification_email].format.mail(
-        Card.fetch("A", look_in_trash: true),
-        { to: "joe@user.com" },
+RSpec.describe Card::Set::Right::Account do
+  describe "#send_change_notice" do
+    subject(:mail) do
+      follower = Card["Joe User"]
+      Card[:follower_notification_email].format.mail(
+        Card.fetch("A", look_in_trash: true), { to: "joe@user.com" },
         auth: follower,
-        active_notice: {
-            follower:      follower,
-            followed_set:  Card[:all],
-            follow_option: Card[:always]
-        }
-    )
-  end
+        active_notice: { follower: follower,
+                         followed_set: Card[:all],
+                         follow_option: Card[:always] }
+      )
+    end
 
-  it "works for deleted card" do
-    delete "A"
-    expect(mail.subject).to eq 'Joe User deleted "A"'
-  end
+    it "works for deleted card" do
+      delete "A"
+      expect(mail.subject).to eq 'Joe User deleted "A"'
+    end
 
-  it "sends multipart email" do
-    expect(mail.content_type).to include("multipart/alternative")
-  end
+    it "sends multipart email" do
+      expect(mail.content_type).to include("multipart/alternative")
+    end
 
-  context "denied access" do
-    it "excludes protected subcards" do
-      skip
-      Card.create(name: "A+B+*self+*read", type: "Pointer", content: "[[u1]]")
+    context "when denied access" do
+      it "excludes protected subcards" do
+        skip
+        Card.create(name: "A+B+*self+*read", type: "Pointer", content: "[[u1]]")
 
-      u2 = Card.fetch "u2+*following", new: { type: "Pointer" }
-      u2.add_item "A"
+        u2 = Card.fetch "u2+*following", new: { type: "Pointer" }
+        u2.add_item "A"
 
-      a = Card.fetch "A"
+        a = Card.fetch "A"
       a.update content: "new content",
                subcards: { "+B" => { content: "hidden content" } }
-    end
+      end
 
-    it "sends no email if changes not visible" do
-      skip
+      it "sends no email if changes not visible" do
+        skip
+      end
     end
   end
 end

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

@@ -1,17 +1,11 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Right::Following do
+RSpec.describe Card::Set::Right::Following do
   context "when admin is following" do
     def card_subject
       Card.fetch "Joe Admin", :following
     end
 
-    check_views_for_errors :core, :status, :rule_editor
-  end
-
-  specify "view core" do
-    expect_view(:core).to have_tag("div.card-slot") do
-      with_tag "div.menu-slot.nodblclick"
-    end
+    check_html_views_for_errors
   end
 end

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

@@ -58,6 +58,12 @@ class Card
       def cache
         Card::Cache[Card::Act]
       end
+
+      # used by rails time_ago
+      # timestamp is set by rails on create
+      def timestamp_attributes_for_create
+        super << "acted_at"
+      end
     end
 
     def actor
@@ -68,7 +74,8 @@ class Card
     # @return [Card]
     def card
       res = Card.fetch card_id, look_in_trash: true, skip_modules: true
-      return res unless res && res.type_id.in?([FileID, ImageID])
+      return res unless res&.type_id&.in?([FileID, ImageID])
+
       res.include_set_modules
     end
 
@@ -76,6 +83,7 @@ class Card
     # @return [Array]
     def actions cached=true
       return ar_actions unless cached
+
       self.class.cache.fetch("#{id}-actions") { ar_actions.find_all.to_a }
     end
 
@@ -120,11 +128,5 @@ class Card
     def assign_actor
       self.actor_id ||= Auth.current_id
     end
-
-    # used by rails time_ago
-    # timestamp is set by rails on create
-    def self.timestamp_attributes_for_create
-      super << "acted_at"
-    end
   end
 end

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

@@ -26,6 +26,7 @@ class Card
 
       def render
         return "" unless @act_card
+
         act_accordion
       end
 
@@ -56,9 +57,10 @@ class Card
 
       def summary
         %i[create update delete draft].map do |type|
-          next unless count_types[type] > 0
-          "#{@format.action_icon type} #{count_types[type]}"
-        end.compact.join " | "
+          next unless count_types[type].positive?
+
+          "#{@format.action_icon type}<small> #{count_types[type]}</small>"
+        end.compact.join "<small class='text-muted'> | </small>"
       end
 
       def act_links
@@ -80,7 +82,7 @@ class Card
       end
 
       def approved_actions
-        @approved_actions ||= actions #.select { |a| a.card && a.card.ok?(:read) }
+        @approved_actions ||= actions # .select { |a| a.card && a.card.ok?(:read) }
         # FIXME: should not need to test for presence of card here.
       end
 
@@ -101,6 +103,7 @@ class Card
 
       def edited_ago
         return "" unless @act.acted_at
+
         "#{time_ago_in_words(@act.acted_at)} ago"
       end
 
@@ -171,9 +174,9 @@ class Card
       #   not current, not deletion
       def rollback_link
         return unless card.ok? :update
-        wrap_with :div, class: "act-link collapse #{collapse_id} float-right" do
-          revert_link
 
+        wrap_with :div, class: "act-link collapse #{collapse_id} float-right" do
+          content_tag(:small, revert_link)
 
           # link_to "Save as current",
           #         class: "slotter", remote: true,
@@ -186,10 +189,11 @@ class Card
 
       def revert_link
         revert_actions_link "revert to this", revert_to: :this,
-                            slot_selector: ".card-slot.history-view"
+                                              slot_selector: ".card-slot.history-view"
       end
 
-      def revert_actions_link link_text, revert_to: :this, slot_selector: nil, html_args: {}
+      def revert_actions_link link_text,
+                              revert_to: :this, slot_selector: nil, html_args: {}
         @format.revert_actions_link @act, link_text,
                                     revert_to: revert_to,
                                     slot_selector: slot_selector,
@@ -208,7 +212,6 @@ class Card
         wrap_with :div, class: "act-link" do
           @format.link_to_view(
             :act, "#{@args[:hide_diff] ? 'Show' : 'Hide'} changes",
-            class: "slotter",
             path: { act_id: @args[:act].id, act_seq: @args[:act_seq],
                     hide_diff: !@args[:hide_diff], action_view: :expanded,
                     act_context: @args[:act_context], look_in_trash: true }

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

@@ -19,8 +19,8 @@ class Card
         end
 
         def revert_link
-          revert_actions_link "revert to previous version", revert_to: :previous,
-                              slot_selector: "#main > .card-slot"
+          revert_actions_link "revert to previous version",
+                              revert_to: :previous, slot_selector: "#main > .card-slot"
         end
 
         def actions

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

@@ -0,0 +1,53 @@
+class Card
+  class Act
+    class ActRenderer
+      # Used for the bridge
+      class BridgeActRenderer < RelativeActRenderer
+        def title
+          wrap_with(:div, left_title, class: "mr-2") +
+            wrap_with(:div, right_title, class: "ml-auto")
+        end
+
+        def left_title
+          ["##{@args[:act_seq]}", @act.actor.name, wrap_with(:small, edited_ago)].join " "
+        end
+
+        def right_title
+          summary
+        end
+
+        def render
+          return "" unless @act_card
+
+          details
+        end
+
+        def bridge_link
+          opts = @format.bridge_link_opts(
+            path: { act_id: @act.id, view: :bridge_act, act_seq: @args[:act_seq] },
+            "data-toggle": "pill"
+          )
+          add_class opts, "d-flex nav-link"
+          opts[:path].delete :layout
+          link_to_card @card, title, opts
+        end
+
+        def overlay_title
+          wrap_with :div do
+            [left_title, summary,
+             subtitle.present? ? subtitle : nil,
+             rollback_or_edit_link].compact.join " | "
+          end
+        end
+
+        def rollback_or_edit_link
+          if @act.draft?
+            autosaved_draft_link text: "continue editing"
+          elsif show_rollback_link?
+            revert_link
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,11 +14,13 @@ class Card
 
         def subtitle
           return "" unless @act.card_id != @format.card.id
+
           wrap_with :small, "act on #{absolute_title}"
         end
 
         def act_links
           return unless (content = rollback_or_edit_link)
+
           wrap_with :small, content
         end
 
@@ -37,6 +39,7 @@ class Card
 
         def current_act?
           return unless @format.card.last_act && @act
+
           @act.id == @format.card.last_act.id
         end
 

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

@@ -106,6 +106,7 @@ class Card
     # @return [Symbol]
     def action_type
       return :draft if draft
+
       TYPE_OPTIONS[read_attribute(:action_type)]
     end
 
@@ -118,6 +119,7 @@ class Card
     # @see #interpret_value #interpret_value for return values
     def value field
       return unless (change = change field)
+
       interpret_value field, change.value
     end
 
@@ -127,6 +129,7 @@ class Card
     def previous_value field
       return if action_type == :create
       return unless (previous_change = previous_change field)
+
       interpret_value field, previous_change.value
     end
 
@@ -142,8 +145,9 @@ class Card
     # @return [Change]
     def previous_change field
       return nil if action_type == :create
+
       field = interpret_field field
-      if @previous_changes && @previous_changes.key?(field)
+      if @previous_changes&.key?(field)
         @previous_changes[field]
       else
         @previous_changes ||= {}
@@ -172,7 +176,7 @@ class Card
 
     # all changed values in hash form. { field1: new_value }
     def changed_values
-      @changed_values ||= changes.each_with_object({}) do |(key,change), h|
+      @changed_values ||= changes.each_with_object({}) do |(key, change), h|
         h[key] = change.value
       end
     end
@@ -180,6 +184,7 @@ class Card
     # @return [Hash]
     def current_changes
       return {} unless card
+
       @current_changes ||=
         Card::Change::TRACKED_FIELDS.each_with_object({}) do |field, hash|
           hash[field.to_sym] = Card::Change.new field: field,
@@ -209,10 +214,10 @@ class Card
     def interpret_value field, value
       case field.to_sym
       when :type_id
-        value && value.to_i
+        value&.to_i
       when :cardtype
         type_card = value && Card.quick_fetch(value.to_i)
-        type_card && type_card.name.capitalize
+        type_card&.name&.capitalize
       else value
       end
     end

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

@@ -24,10 +24,11 @@ class Card
       end
 
       def render
+        classes = @format.classy("action-list")
         bs_layout container: true, fluid: true do
           row do
             html <<-HTML
-              <ul class="action-list w-100">
+              <ul class="#{classes} w-100">
                 <li class="#{action.action_type}">
                   #{action_panel}
                 </li>
@@ -58,8 +59,6 @@ class Card
           link_to_view(
             :related, name_changes,
             path: { slot: { items: { view: "history", nest_name: @action.card.name } } },
-            remote: true,
-            class: "slotter",
             # "data-slot-selector" => ".card-slot.history-view"
           )
         end
@@ -67,16 +66,19 @@ class Card
 
       def content_diff
         return @action.raw_view if @action.action_type == :delete
+
         @format.subformat(@action.card).render_action_summary action_id: @action.id
       end
 
       def type_diff
         return "" unless @action.new_type?
+
         @hide_diff ? @action.value(:cardtype) : @action.cardtype_diff
       end
 
       def name_changes
         return old_name unless @action.new_name?
+
         @hide_diff ? new_name : Card::Content::Diff.complete(old_name, new_name)
       end
 

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

@@ -6,6 +6,7 @@ class Card
       # @return [rendered diff]
       def name_diff opts={}
         return unless new_name?
+
         diff_object(:name, opts).complete
       end
 
@@ -19,6 +20,7 @@ class Card
       # compare action's cardtype value with previous cardtype value
       def cardtype_diff opts={}
         return unless new_type?
+
         diff_object(:cardtype, opts).complete
       end
 
@@ -32,6 +34,7 @@ class Card
       # compare action's content value with previous content value
       def content_diff diff_type=:expanded, opts=nil
         return unless new_content?
+
         dobj = content_diff_object(opts)
         diff_type == :summary ? dobj.summary : dobj.complete
       end