card 1.16.12 → 1.16.13

data/mod/01_core/set/all/subcards.rb

@@ -31,7 +31,9 @@ def clear_subcards
 end
 
 def unfilled?
-  (content.empty? || content.strip.empty?) && !subcards.present?
+  (content.empty? || content.strip.empty?) &&
+    (comment.blank? || comment.strip.blank?) &&
+    !subcards.present?
 end
 
 event :reject_empty_subcards, after: :approve, on: :save do
@@ -67,4 +69,4 @@ event :store_subcards, after: :store do
   # eg. <user> creates <user+*account> creates <user+*account+*status>
   # <user> changes <user+*account+*status> in event activate_account
   Card.write_to_local_cache self
-end
+end

data/mod/01_core/set/all/trash.rb

@@ -28,7 +28,10 @@ event :validate_delete, before: :approve, on: :delete do
     errors.add :delete, "#{name} is is a system card. (#{codename})"
   end
 
-  undeletable_all_rules_tags = %w{ default style layout create read update delete }
+  undeletable_all_rules_tags =
+    %w{ default style layout create read update delete }
+  # FIXME: HACK! should be configured in the rule
+
   if junction? && (l = left) && l.codename == 'all' &&
      undeletable_all_rules_tags.member?(right.codename)
     errors.add :delete, "#{name} is an indestructible rule"

data/mod/02_basic_types/set/type/pointer.rb

@@ -1,7 +1,10 @@
 
+
 event :add_and_drop_items, before: :approve, on: :save do
-  self.add_item Env.params['add_item']   if Env.params['add_item']
-  self.drop_item Env.params['drop_item'] if Env.params['drop_item']
+  adds = Env.params['add_item']
+  drops = Env.params['drop_item']
+  Array.wrap(adds).each { |i| add_item i } if adds
+  Array.wrap(drops).each { |i| drop_item i } if drops
 end
 
 event :insert_item_event, before: :approve, on: :save, when: proc {|c| Env.params['insert_item']} do

data/mod/05_email/set/all/notify.rb

@@ -1,37 +1,30 @@
 
 class FollowerStash
   def initialize card=nil
-    @followed_affected_cards = Hash.new { |h,v| h[v]=[] }
+    @followed_affected_cards = Hash.new { |h, v| h[v] = [] }
     @visited = ::Set.new
     add_affected_card(card) if card
   end
 
   def add_affected_card card
+    return if @visited.include? card.key
     Auth.as_bot do
-      if !@visited.include? card.key
-        @visited.add card.key
-        card.all_direct_follower_ids_with_reason do |user_id, reason|
-          notify Card.fetch(user_id), of: reason
-        end
-        if card.left and !@visited.include?(card.left.name) and follow_field_rule = card.left.rule_card(:follow_fields)
-
-          follow_field_rule.item_names(context: card.left.cardname).each do |item|
-            if @visited.include? item.to_name.key
-              add_affected_card card.left
-              break
-            elsif item.to_name.key == Card[:includes].key
-              includee_set = Card.search(included_by: card.left.name).map(&:key)
-              if !@visited.intersection(includee_set).empty?
-                add_affected_card card.left
-                break
-              end
-            end
+      @visited.add card.key
+      notify_direct_followers card
+      return if !(left_card = card.left) || @visited.include?(left_card.key) ||
+                !(follow_field_rule = left_card.rule_card(:follow_fields))
+      follow_field_rule.item_names(context: left_card.cardname).each do |item|
+        if @visited.include? item.to_name.key
+          add_affected_card left_card
+          break
+        elsif item.to_name.key == Card[:includes].key
+          includee_set = Card.search(included_by: left_card.name).map(&:key)
+          if !@visited.intersection(includee_set).empty?
+            add_affected_card left_card
+            break
           end
-
         end
-
       end
-
     end
   end
 
@@ -39,73 +32,86 @@ class FollowerStash
     @followed_affected_cards.keys
   end
 
-  def each_follower_with_reason  # "follower" is a card object, "followed" a card name
+  def each_follower_with_reason
+    # "follower"(=user) is a card object, "followed"(=reasons) a card name
     @followed_affected_cards.each do |user, reasons|
-      yield(user,reasons.first)
+      yield(user, reasons.first)
     end
   end
 
   private
 
+  def notify_direct_followers card
+    card.all_direct_follower_ids_with_reason do |user_id, reason|
+      notify Card.fetch(user_id), of: reason
+    end
+  end
+
   def notify follower, because
     @followed_affected_cards[follower] << because[:of]
   end
-
 end
 
 def act_card
   @supercard || self
 end
 
-
 def followable?
   true
 end
 
+def silent_change?
+  silent_change.nil? ? !Card::Env[:controller] : silent_change
+end
+
 def notable_change?
-  !silent_change && !supercard && current_act && Card::Auth.current_id != WagnBotID && followable?
+  !silent_change? && !supercard && current_act &&
+    Card::Auth.current_id != WagnBotID && followable?
 end
 
-event :notify_followers_after_save, after: :subsequent, on: :save, when: proc{ |ca| ca.notable_change? } do
+event :notify_followers_after_save,
+      after: :subsequent, on: :save, when: proc { |ca| ca.notable_change? } do
   notify_followers
 end
 
 # in the delete case we have to calculate the follower_stash beforehand
 # but we can't pass the follower_stash through the ActiveJob queue.
-# We have to deal with the notifications in the extend phase instead of the subsequent phase
+# We have to deal with the notifications in the extend phase instead of the
+# subsequent phase
 event :stash_followers, after: :approve, on: :delete do
-  act_card.follower_stash ||=  FollowerStash.new
+  act_card.follower_stash ||= FollowerStash.new
   act_card.follower_stash.add_affected_card self
 end
-event :notify_followers_after_delete, after: :extend, on: :delete,
-    when: proc{ |ca| ca.notable_change? } do
+event :notify_followers_after_delete,
+      after: :extend, on: :delete, when: proc { |ca| ca.notable_change? } do
   notify_followers
 end
 
 def notify_followers
-  begin
-    @current_act.reload
-    @follower_stash ||= FollowerStash.new
-    @current_act.actions.each do |a|
-      @follower_stash.add_affected_card a.card if a.card
-    end
-    @follower_stash.each_follower_with_reason do |follower, reason|
-      if follower.account and follower != @current_act.actor
-        follower.account.send_change_notice @current_act, reason[:set_card].name, reason[:option]
-      end
+  @current_act.reload
+  @follower_stash ||= FollowerStash.new
+  @current_act.actions.each do |a|
+    @follower_stash.add_affected_card a.card if a.card
+  end
+  @follower_stash.each_follower_with_reason do |follower, reason|
+    if follower.account && follower != @current_act.actor
+      follower.account.send_change_notice @current_act, reason[:set_card].name,
+                                          reason[:option]
     end
-  rescue =>e  #this error handling should apply to all extend callback exceptions
-    Rails.logger.info "\nController exception: #{e.message}"
-    Card::Error.current = e
-    notable_exception_raised
   end
+# this error handling should apply to all extend callback exceptions
+rescue => e
+  Rails.logger.info "\nController exception: #{e.message}"
+  Card::Error.current = e
+  notable_exception_raised
 end
 
 format do
   view :list_of_changes, denial: :blank do |args|
     action = get_action(args)
 
-    relevant_fields = case action.action_type
+    relevant_fields =
+      case action.action_type
       when :create then [:cardtype, :content]
       when :update then [:name, :cardtype, :content]
       when :delete then [:content]
@@ -116,12 +122,12 @@ format do
     end.compact.join
   end
 
-
   view :subedits, perms: :none do |args|
     subedits =
       get_act(args).relevant_actions_for(card).map do |action|
         if action.card_id != card.id
-          action.card.format(format: @format).render_subedit_notice(action: action)
+          action.card.format(format: @format)
+            .render_subedit_notice(action: action)
         end
       end.compact.join
 
@@ -134,16 +140,19 @@ format do
 
   view :subedit_notice, denial: :blank do |args|
     action = get_action(args)
-    name_before_action = (action.new_values[:name] && action.old_values[:name]) || card.name
+    name_before_action =
+      (action.new_values[:name] && action.old_values[:name]) || card.name
 
     wrap_subedit_item %{#{name_before_action} #{action.action_type}d
 #{ render_list_of_changes(args) }}
   end
 
   view :followed, perms: :none, closed: true do |args|
-    if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) &&
-         args[:follow_option] && (option_card = Card.fetch(args[:follow_option]))
-       option_card.description set_card
+    if args[:followed_set] &&
+       (set_card = Card.fetch(args[:followed_set])) &&
+       args[:follow_option] &&
+       (option_card = Card.fetch(args[:follow_option]))
+      option_card.description set_card
     else
       'followed card'
     end
@@ -154,23 +163,29 @@ format do
   end
 
   view :unfollow_url, perms: :none, closed: true do |args|
-    if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) && args[:follow_option] && args[:follower]
-     rule_name = set_card.follow_rule_name args[:follower]
-     target_name = "#{args[:follower]}+#{Card[:follow].name}"
-     update_path = page_path target_name, action: :update, card: {subcards: {rule_name=>Card[:never].name}}
-     card_url update_path # absolutize path
+    if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) &&
+       args[:follow_option] && args[:follower]
+      rule_name = set_card.follow_rule_name args[:follower]
+      target_name = "#{args[:follower]}+#{Card[:follow].name}"
+      update_path = page_path target_name,
+                              action: :update,
+                              card: { subcards: {
+                                rule_name => Card[:never].name
+                              } }
+      card_url update_path # absolutize path
     end
   end
 
   def edit_info_for field, action
     return nil unless action.new_values[field]
 
-    item_title = case action.action_type
-    when :update then 'new '
-    when :delete then 'deleted '
-    else ''
-    end
-    item_title +=  "#{field}: "
+    item_title =
+      case action.action_type
+      when :update then 'new '
+      when :delete then 'deleted '
+      else ''
+      end
+    item_title += "#{field}: "
 
     item_value =
       if action.action_type == :delete
@@ -179,18 +194,20 @@ format do
         action.new_values[field]
       end
 
-     wrap_list_item "#{item_title}#{item_value}"
+    wrap_list_item "#{item_title}#{item_value}"
   end
 
   def get_act args
-    @notification_act ||= args[:act] || (args[:act_id] and Act.find(args[:act_id])) || card.acts.last
+    @notification_act ||= args[:act] ||
+                          (args[:act_id] && Act.find(args[:act_id])) ||
+                          card.acts.last
   end
 
   def get_action args
-    args[:action] || (args[:action_id] and Action.fetch(args[:action_id])) || card.last_action
+    args[:action] || (args[:action_id] && Action.fetch(args[:action_id])) ||
+      card.last_action
   end
 
-
   def wrap_subedits subedits
     "\nThis update included the following changes:#{wrap_list subedits}"
   end
@@ -208,7 +225,6 @@ format do
   end
 end
 
-
 format :email_text do
   view :last_action, perms: :none do |args|
     act = get_act(args)
@@ -234,7 +250,3 @@ format :email_html do
     "<li>#{text}</li>\n"
   end
 end
-
-
-
-

data/mod/05_email/spec/set/all/notify_spec.rb

@@ -15,7 +15,11 @@ shared_examples_for 'notifications' do
       it { is_expected.to include 'cardtype: Basic' }
     end
     context 'for a updated card' do
-      before { @card.update_attributes!(name: 'bnn card', type: :pointer, content: 'changed content') }
+      before do
+        @card.update_attributes!(
+          name: 'bnn card', type: :pointer, content: 'changed content'
+        )
+      end
       it { is_expected.to include 'new content: [[changed content]]' }
       it { is_expected.to include 'new cardtype: Pointer' }
       it { is_expected.to include 'new name: bnn card' }
@@ -28,7 +32,9 @@ shared_examples_for 'notifications' do
     context 'for a given action' do
       subject do
         action = @card.last_action
-        @card.update_attributes!(name: 'bnn card', type: :pointer, content: 'changed content')
+        @card.update_attributes!(
+          name: 'bnn card', type: :pointer, content: 'changed content'
+        )
         @card.format(format: format).render_list_of_changes(action: action)
       end
       it { is_expected.to include "content: #{content}" }
@@ -36,8 +42,11 @@ shared_examples_for 'notifications' do
     context 'for a given action id' do
       subject do
         action_id = @card.last_action.id
-        @card.update_attributes!(name: 'bnn card', type: :pointer, content: 'changed content')
-        @card.format(format: format).render_list_of_changes(action_id: action_id)
+        @card.update_attributes!(
+          name: 'bnn card', type: :pointer, content: 'changed content'
+        )
+        @card.format(format: format)
+          .render_list_of_changes(action_id: action_id)
       end
       it { is_expected.to include "content: #{content}" }
     end
@@ -63,7 +72,9 @@ shared_examples_for 'notifications' do
     context 'for a updated card' do
       changed_name = 'changed subedit notice'
       changed_content = 'changed content'
-      before { @card.update_attributes!(name: changed_name, content: changed_content) }
+      before do
+        @card.update_attributes!(name: changed_name, content: changed_content)
+      end
       it { is_expected.to include changed_name }
       it { is_expected.to include 'updated' }
       it { is_expected.to include list_of_changes_for @card }
@@ -77,13 +88,15 @@ shared_examples_for 'notifications' do
   end
 end
 
-
 describe Card::Set::All::Notify do
+  before do
+    ::Card.any_instance.stub(:'silent_change?').and_return(false)
+  end
 
   describe 'content of notification email' do
     context 'for new card with subcards' do
-      name = "another card with subcards"
-      content = "main content {{+s1}}  {{+s2}}"
+      name = 'another card with subcards'
+      content = 'main content {{+s1}}  {{+s2}}'
       sub1_content = 'new content of subcard 1'
       sub2_content = 'new content of subcard 2'
       before do
@@ -110,9 +123,10 @@ describe Card::Set::All::Notify do
       context 'and missing permissions' do
         context 'for subcard' do
           before do
-            Card.create_or_update! "#{name}+s1+*self+*read", type: 'Pointer', content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+s1+*self+*read",
+                                   type: 'Pointer', content: '[[Administrator]]'
           end
-          it "excludes subcard content" do
+          it 'excludes subcard content' do
             is_expected.not_to include sub1_content
             is_expected.to include sub2_content
           end
@@ -123,40 +137,45 @@ describe Card::Set::All::Notify do
                 context:   @card.refresh(true),
                 to:        Card['Joe User'].email,
                 follower:  Card['Joe User'].name,
-                followed_set:  @card.name+"+s1+*self",
+                followed_set:  @card.name+'+s1+*self',
                 follow_option: '*always'
               ).text_part.body.raw_source
           }
           before do
-            Card.create_or_update! "#{name}+*self+*read",type: 'Pointer',content: '[[Administrator]]'
-            Card.create_or_update! "#{name}+s1+*self+*read",type: 'Pointer',content: '[[Anyone]]'
+            Card.create_or_update! "#{name}+*self+*read",
+                                   type: 'Pointer', content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+s1+*self+*read",
+                                   type: 'Pointer',content: '[[Anyone]]'
           end
           it 'includes subcard content' do
             is_expected.to include sub1_content
           end
-          it "excludes maincard content" do
+          it 'excludes maincard content' do
             is_expected.not_to include content
             is_expected.not_to be_empty
           end
         end
         context 'for all parts' do
           before do
-            Card.create_or_update! "#{name}+s1+*self+*read",type: 'Pointer',content: '[[Administrator]]'
-            Card.create_or_update! "#{name}+s2+*self+*read",type: 'Pointer',content: '[[Administrator]]'
-            Card.create_or_update! "#{name}+*self+*read",type: 'Pointer',content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+s1+*self+*read",
+                                   type: 'Pointer', content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+s2+*self+*read",
+                                   type: 'Pointer', content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+*self+*read",
+                                   type: 'Pointer', content: '[[Administrator]]'
           end
           it { is_expected.not_to include content }
           it { is_expected.not_to include sub1_content }
           it { is_expected.not_to include sub2_content }
-          it "will not be send" do
-            expect(Card['Joe User'].account.changes_visible? @card.acts.last).to be_falsey
+          it 'will not be send' do
+            expect(Card['Joe User'].account.changes_visible? @card.acts.last)
+              .to be_falsey
           end
         end
       end
     end
   end
 
-
   describe 'html format' do
     include_examples 'notifications' do
       let(:format) { 'email_html' }
@@ -169,8 +188,8 @@ describe Card::Set::All::Notify do
     end
 
     it 'creates well formatted text message' do
-      name = "another card with subcards"
-      content = "main content {{+s1}}  {{+s2}}"
+      name = 'another card with subcards'
+      content = 'main content {{+s1}}  {{+s2}}'
       sub1_content = 'new content of subcard 1'
       sub2_content = 'new content of subcard 2'
       Card::Auth.as_bot do
@@ -235,56 +254,56 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
 
 
 
-    it "sends notifications of edits" do
-      expect_user("Big Brother").to be_notified_of "All Eyes On Me+*self"
-      update "All Eyes On Me"
+    it 'sends notifications of edits' do
+      expect_user('Big Brother').to be_notified_of 'All Eyes On Me+*self'
+      update 'All Eyes On Me'
     end
 
-    it "does not send notification to author of change" do
+    it 'does not send notification to author of change' do
       Card::Auth.current_id = Card['Big Brother'].id
-      expect_user("Big Brother").not_to be_notified
-      update "Google glass"
+      expect_user('Big Brother').not_to be_notified
+      update 'Google glass'
     end
 
-    it "sends only one notification per user"  do
-      expect_user("Big Brother").to receive(:send_change_notice).exactly(1)
-      update "Google glass"
+    it 'sends only one notification per user'  do
+      expect_user('Big Brother').to receive(:send_change_notice).exactly(1)
+      update 'Google glass'
     end
 
-    it "does not send notification of not-followed cards" do
-      expect_user("Big Brother").not_to be_notified
-      update "No One Sees Me"
+    it 'does not send notification of not-followed cards' do
+      expect_user('Big Brother').not_to be_notified
+      update 'No One Sees Me'
     end
 
 
 
-    context "when following *type sets" do
+    context 'when following *type sets' do
       before do
         Card::Auth.current_id = Card['joe admin'].id
       end
 
-      it "sends notifications of new card" do
-        new_card = Card.new name: "Microscope", type: "Optic"
-        expect_user("Optic fan").to be_notified_of "Optic+*type", "*always"
+      it 'sends notifications of new card' do
+        new_card = Card.new name: 'Microscope', type: 'Optic'
+        expect_user('Optic fan').to be_notified_of 'Optic+*type', '*always'
         new_card.save!
       end
 
-      it "sends notification of update" do
-        expect_user("Optic fan").to be_notified_of "Optic+*type", '*always'
-        update "Sunglasses"
+      it 'sends notification of update' do
+        expect_user('Optic fan').to be_notified_of 'Optic+*type', '*always'
+        update 'Sunglasses'
       end
     end
 
     context 'when following *right sets' do
-      it "sends notifications of new card" do
-        new_card = Card.new name: "Telescope+lens"
-        expect_user("Big Brother").to be_notified_of "lens+*right", '*always'
+      it 'sends notifications of new card' do
+        new_card = Card.new name: 'Telescope+lens'
+        expect_user('Big Brother').to be_notified_of 'lens+*right', '*always'
         new_card.save!
       end
 
-      it "sends notifications of update" do
-        expect_user("Big Brother").to be_notified_of "lens+*right", '*always'
-        update "Magnifier+lens"
+      it 'sends notifications of update' do
+        expect_user('Big Brother').to be_notified_of 'lens+*right', '*always'
+        update 'Magnifier+lens'
       end
     end
 
@@ -302,8 +321,8 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
       end
     end
 
-    describe "notifications of fields" do
-      context "when following ascendant" do
+    describe 'notifications of fields' do
+      context 'when following ascendant' do
         it "doesn't sends notification of arbitrary subcards" do
           expect_user('Sunglasses fan').not_to be_notified
           Card.create name: 'Sunglasses+about'
@@ -322,21 +341,21 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
           end
         end
 
-        context "and follow fields rule contains *include" do
-          it "sends notification of new included card" do
+        context 'and follow fields rule contains *include' do
+          it 'sends notification of new included card' do
             new_card =  Card.new name: 'Sunglasses+lens'
-            expect_user("Sunglasses fan").to be_notified_of "Sunglasses+*self"
+            expect_user('Sunglasses fan').to be_notified_of 'Sunglasses+*self'
             new_card.save!
           end
 
-          it "sends notification of updated included card" do
-            expect_user("Sunglasses fan").to be_notified_of "Sunglasses+*self"
+          it 'sends notification of updated included card' do
+            expect_user('Sunglasses fan').to be_notified_of 'Sunglasses+*self'
             update 'Sunglasses+tint'
           end
 
           it "doesn't send notification of not included card" do
             new_card = Card.new name: 'Sunglasses+frame'
-            expect_user("Sunglasses fan").not_to be_notified
+            expect_user('Sunglasses fan').not_to be_notified
             new_card.save!
           end
         end