card 1.96.8 → 1.97.0

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

@@ -0,0 +1,11 @@
+#! no set module
+
+class StartFollowLink < FollowLink
+  def initialize format
+    @rule_content = "*always"
+    @link_text = "follow"
+    @action = "send"
+    @css_class = ""
+    super
+  end
+end

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

@@ -0,0 +1,12 @@
+#! no set module
+
+class StopFollowLink < FollowLink
+  def initialize format
+    @rule_content = "*never"
+    @link_text = "following"
+    @hover_text = "unfollow"
+    @action = "stop sending"
+    @css_class = "btn-item-delete"
+    super
+  end
+end

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

@@ -28,6 +28,7 @@ end
 
 def notify_followers
   return unless (act = ActManager.act)
+
   act.reload
   notify_followers_of act
 end
@@ -46,6 +47,7 @@ private
 def notify_followers_of act
   act_followers(act).each_follower_with_reason do |follower, reason|
     next if !follower.account || (follower == act.actor)
+
     notify_follower follower, act, reason
   end
 end
@@ -58,6 +60,7 @@ def act_followers act
   @follower_stash ||= FollowerStash.new
   act.actions(false).each do |a|
     next if !a.card || a.card.silent_change?
+
     @follower_stash.check_card a.card
   end
   @follower_stash
@@ -69,6 +72,7 @@ end
 
 def current_act_card?
   return false unless (act_card = ActManager.act_card)
+
   act_card.id.nil? || act_card.id == id
   # FIXME: currently card_id is nil for deleted acts (at least
   # in the store phase when it's tested).  The nil test was needed

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

@@ -7,9 +7,12 @@ format do
   end
 
   view :subedits, perms: :none, cache: :never do
+    return unless notification_act
+
     wrap_subedits do
       notification_act.actions_affecting(card).map do |action|
         next if action.card_id == card.id
+
         action.card.format(format: @format).render_subedit_notice action_id: action.id
       end
     end
@@ -36,11 +39,14 @@ format do
   end
 
   view :last_action_verb, cache: :never do
+    return unless notification_act
+
     "#{notification_act.main_action.action_type}d"
   end
 
   view :unfollow_url, perms: :none, closed: true, cache: :never do
     return "" unless (rule_name = live_follow_rule_name)
+
     card_url path(mark: "#{active_notice(:follower)}+#{Card[:follow].name}",
                   action: :update,
                   card: { subcards: { rule_name => Card[:never].name } })
@@ -64,22 +70,26 @@ format do
 
   def follow_option_card
     return unless (option_name = active_notice(:follow_option))
+
     Card.fetch option_name
   end
 
   def active_notice key
     @active_notice ||= inherit :active_notice
     return unless @active_notice
+
     @active_notice[key]
   end
 
   def live_follow_rule_name
     return unless (set_card = followed_set_card) && (follower = active_notice(:follower))
+
     set_card.follow_rule_name follower
   end
 
   def edit_info_for field, action
     return nil unless (value = action.value field)
+
     value = action.previous_value if action.action_type == :delete
     wrap_list_item "  #{notification_action_label action} #{field}: #{value}"
   end
@@ -94,6 +104,7 @@ format do
   def wrap_subedits
     subedits = yield.compact.join
     return "" if subedits.blank?
+
     "\nThis update included the following changes:\n#{wrap_list subedits}"
   end
 

data/mod/follow/set/right/account.rb

@@ -1,11 +1,12 @@
 def send_change_notice act, followed_set, follow_option
   return unless changes_visible?(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,
+                       followed_set: followed_set,
                        follow_option: follow_option }
     )
   end

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

@@ -71,6 +71,10 @@ format :html do
     end
   end
 
+  def rule_form_args
+    super.merge "data-update-foreign-slot": ".card-slot.follow_section-view"
+  end
+
   private
 
   def follow_item_hidden_tags condition

data/mod/follow/set/right/follow/follow_status.haml

@@ -4,6 +4,6 @@
   - card.item_names.each do |option|
     %li.list-group-item
       = follow_item(option == "*never" ? "*always" : option)
-= link_to_view :edit_single_rule, "more options",
+= link_to_view :rule_form, "more options",
                class: "btn update-follow-link slotter",
-               "data-card_key": card.set_prototype.key
+               "data-card_key": card.set_prototype.key

data/mod/follow/set/right/followers.rb

@@ -12,6 +12,7 @@ end
 
 def content
   return "" unless left
+
   item_names.map { |item| "[[#{item}]]" }.join "\n"
 end
 

data/mod/follow/set/right/following.rb

@@ -1,4 +1,3 @@
-
 def virtual?
   !real?
 end
@@ -28,11 +27,11 @@ format :html do
     ""
   end
 
-  view :rule_editor do
+  view :rule_editor, cache: :never do
     rule_context = Card.fetch preference_name, new: { type_id: PointerID }
     wrap_with :div, class: "edit-rule" do
       follow_context = current_follow_rule_card || rule_context
-      nest follow_context, { view: :edit_rule }, rule_context: rule_context
+      subformat(follow_context).rule_form :open, rule_context, :modal
     end
   end
 

data/mod/follow/set/self/follow_defaults.rb

@@ -10,28 +10,15 @@
 # - on the *admin page, we can have a link so sharks can update all the pristine cards
 #   to use whatever the actual defaults representation is (see previous point)
 # - if you truly want to override existing follow rules, that may be monkey territory?
-# - we will delete “*follow defaults” after the above are completed
+# - we will delete "*follow defaults" after the above are completed
 
 event :update_follow_rules, :finalize, on: :save, when: :update_all_users do
-  defaults = item_names.map do |item|
-    if (set_card = Card.fetch item.to_name.left) && set_card.type_code == :set
-      option_card = Card.fetch(item.to_name.right) ||
-                    Card[item.to_name.right.to_sym]
-      option = if option_card.follow_option?
-                 option_card.name
-               else
-                 "*always"
-               end
-      [set_card, option]
-    elsif (set_card = Card.fetch sug) && set_card.type_code == :set
-      [set_card, "*always"]
-    end
-  end.compact
   Auth.as_bot do
     Card.search(type: "user").each do |user|
-      defaults.each do |set_card, option|
+      follow_defaults.each do |set_card, option|
         follow_rule = Card.fetch(set_card.follow_rule_name(user.name), new: {})
         next unless follow_rule
+
         follow_rule.drop_item "*never"
         follow_rule.drop_item "*always"
         follow_rule.add_item option
@@ -42,6 +29,20 @@ event :update_follow_rules, :finalize, on: :save, when: :update_all_users do
   Card.follow_caches_expired
 end
 
+def follow_defaults
+  item_names.map do |item|
+    if (set_card = Card.fetch item.to_name.left)&.type_code == :set
+      [set_card, follow_option(item)]
+    end
+  end.compact
+end
+
+def follow_option item
+  option_card =
+    Card.fetch(item.to_name.right) || Card[item.to_name.right.to_sym]
+  option_card.follow_option? ? option_card.name : "*always"
+end
+
 format :html do
   view :edit, perms: :update, tags: :unknown_ok do
     frame_and_form :update, hidden: { success: "_self",

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

@@ -32,6 +32,7 @@ end
 
 def all_members_followed_by? user_id=nil
   return false unless prototype.followed_by?(user_id)
+
   directly_followed_by?(user_id) || broader_set_followed_by?(user_id)
 end
 
@@ -47,5 +48,6 @@ end
 
 def directly_followed_by? user_id=nil
   return true if user_id && follow_rule?(user_id)
+
   follow_rule?
 end

data/mod/follow/set/type/user.rb

@@ -1,5 +1,6 @@
 def follow follow_name, option="*always"
   return unless (follow_rule = Card.fetch(follow_name)&.follow_rule_card(name, new: {}))
+
   follow_rule.drop_item "*never"
   follow_rule.add_item option
   follow_rule.save!

data/mod/follow/set/type_plus_right/user/follow.rb

@@ -65,6 +65,7 @@ format :html do
   # this does not look specific to following!
   view :errors, perms: :none do
     return unless card.errors.any?
+
     if card.errors.find { |attrib, _msg| attrib == :permission_denied }
       Env.save_interrupted_action(request.env["REQUEST_URI"])
       voo.title = "Problems with #{card.name}"

data/mod/follow/set/type_plus_right/user/follow/follow_editor.haml

@@ -2,4 +2,7 @@
   %ul.delete-list.list-group
     - send items_method do |rule_card, option|
       %li.list-group-item
-        = subformat(rule_card).follow_item option, show_button?
+        -if rule_card
+          = subformat(rule_card).follow_item option, show_button?
+        -else
+          no entries

data/mod/follow/set/type_plus_right/user/follow/follow_editor_helper.rb

@@ -33,13 +33,16 @@ format :html do
   # for each rule/option variant, yields with rule_card and option params
   def rules_and_options_by_set_pattern rule_opts_hash
     pattern_hash = a_set_pattern_hash rule_opts_hash
+    empty = true
     Card.set_patterns.reverse.map do |pattern|
       pattern_hash[pattern].each do |rule_card, options|
         options.each do |option|
           yield rule_card, option
+          empty = false
         end
       end
     end
+    yield nil if empty
   end
 
   def a_set_pattern_hash rule_opts_hash
@@ -79,6 +82,7 @@ format :html do
   # @return Hash # { suggested_rule1 => rule1_follow_options }
   def suggested_following_rule_options_hash
     return {} unless card.current_user?
+
     card.suggestions.each_with_object({}) do |sug, hash|
       set_card, opt = a_set_and_option_suggestion(sug) || a_set_only_suggestion(sug)
       hash[set_card.follow_rule_name(card.trunk).key] = [opt]
@@ -90,6 +94,7 @@ format :html do
   # suggestion value contains both set and follow option
   def a_set_and_option_suggestion sug
     return unless (set_card = valid_set_card(sug.to_name.left))
+
     [set_card, suggested_follow_option(sug.to_name.right)]
   end
 
@@ -105,6 +110,7 @@ format :html do
   # suggestion value contains only set (implies *always)
   def a_set_only_suggestion sug
     return unless (set_card = valid_set_card(sug))
+
     yield set_card, :always.cardname
   end
 

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

@@ -0,0 +1,27 @@
+RSpec.describe Card::Set::All::Follow::FollowLinkViews do
+  context "when not following" do
+    def format_subject _format=nil
+      Card["A"].format(:html)
+    end
+
+    specify "view :follow_link" do
+      expect_view(:follow_button).to have_tag("a") do
+        with_text "follow"
+      end
+    end
+  end
+
+  context "when already following", with_user: "John" do
+    def format_subject _format=nil
+      Card["John Following"].format(:html)
+    end
+
+    specify "view :follow_link" do
+      expect_view(:follow_button).to have_tag("a", with: {
+                                                "data-hover-text": "unfollow"
+                                              }) do
+        with_text "following"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+RSpec.describe Card::Set::All::Follow::StartFollowLink do
+  describe "bridge link" do
+    subject(:button) do
+      described_class.new(Card["A"].format).button
+    end
+
+    specify do
+      expect(button).to have_tag "a[href*='always']", "follow"
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+RSpec.describe Card::Set::All::Follow::StopFollowLink do
+  describe "bridge link" do
+    subject(:button) do
+      described_class.new(Card["A"].format).button
+    end
+
+    specify do
+      expect(button).to have_tag "a[href*='never']",
+                                 with: { "data-hover-text": "unfollow"},
+                                 text: /following/
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::Follow do
+RSpec.describe Card::Set::All::Follow do
   def follow_view card_name
     render_card :follow_link, name: card_name
   end
@@ -16,31 +16,31 @@ describe Card::Set::All::Follow do
       end
     end
 
-    subject { Card[cardname].follower_names.sort }
+    subject(:followers) { Card[cardname].follower_names.sort }
 
     context "when not followed" do
       let(:cardname) { "No One Sees Me" }
 
-      it { is_expected.to eq([]) }
+      it { expect(followers).to eq([]) }
     end
 
     context "when only field is followed" do
       let(:cardname) { "Magnifier" }
 
-      it { is_expected.to eq([]) }
+      it { expect(followers).to eq([]) }
     end
 
     context "when followed as a field" do
       let(:cardname) { "Magnifier+lens" }
 
-      it { is_expected.to eq ["Big Brother", "Narcissist"] }
+      it { expect(followers).to eq ["Big Brother", "Narcissist"] }
     end
 
     context "with many followers" do
       let(:cardname) { "Sunglasses" }
 
       it do
-        is_expected.to eq ["Big Brother", "Narcissist", "Optic fan", "Sara",
+        expect(followers).to eq ["Big Brother", "Narcissist", "Optic fan", "Sara",
                            "Sunglasses fan"]
       end
     end
@@ -49,7 +49,7 @@ describe Card::Set::All::Follow do
       let(:cardname) { "Sunglasses+tint" }
 
       it do
-        is_expected.to eq ["Big Brother", "Narcissist", "Optic fan", "Sara",
+        expect(followers).to eq ["Big Brother", "Narcissist", "Optic fan", "Sara",
                            "Sunglasses fan"]
       end
     end
@@ -57,11 +57,13 @@ describe Card::Set::All::Follow do
     context "when Google glass" do
       let(:cardname) { "Google glass" }
 
-      it { is_expected.to eq ["Big Brother", "Optic fan", "Sara"] }
+      it { expect(followers).to eq ["Big Brother", "Optic fan", "Sara"] }
     end
   end
 
-  describe "view: follow_link" do
+  # doesn't exist anymore
+  # 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
     end
@@ -130,6 +132,7 @@ describe Card::Set::All::Follow do
 
     context "when following content I created" do
       before { Card::Auth.current_id = Card["Narcissist"].id }
+
       it "renders following link" do
         assert_following_view "Sunglasses", add_set: "Sunglasses+*self",
                                             user: "Narcissist"
@@ -138,6 +141,7 @@ describe Card::Set::All::Follow do
 
     context "when following content I edited" do
       before { Card::Auth.current_id = Card["Narcissist"].id }
+
       it "renders following link" do
         assert_following_view "Magnifier+lens",
                               add_set: "Magnifier+lens+*self",