card 1.17.4 → 1.18.0

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

@@ -1,5 +1,4 @@
 format :email_html do
-  view :missing        do |args| '' end
-  view :closed_missing do |args| '' end
+  view :missing        do |_args| '' end
+  view :closed_missing do |_args| '' end
 end
-

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

@@ -1,5 +1,5 @@
 
-format :email_text do    
-  view :missing        do |args| '' end
-  view :closed_missing do |args| '' end
+format :email_text do
+  view :missing        do |_args| '' end
+  view :closed_missing do |_args| '' end
 end

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

@@ -1,27 +1,21 @@
 card_accessor :followers
 
-FOLLOWER_IDS_CACHE_KEY = 'FOLLOWER_IDS'
+FOLLOWER_IDS_CACHE_KEY = 'FOLLOWER_IDS'.freeze
 
 # FIXME: this should be in type/set
-event :cache_expired_for_new_set,
-      before: :store, on: :create,
+event :cache_expired_for_new_set, :store,
+      on: :create,
       when: proc { |c| c.type_id == Card::SetID } do
   Card.follow_caches_expired
 end
 
-event :cache_expired_for_type_change, before: :store, on: :update,
-                                      changed: :type_id do
+event :cache_expired_for_type_change, :store,
+      on: :update, changed: [:type_id, :name] do
   # FIXME: expire (also?) after save
   Card.follow_caches_expired
 end
 
-event :cache_expired_for_name_change, before: :store, on: :update,
-                                      changed: :name do
-  Card.follow_caches_expired
-end
-
-event :cache_expired_for_new_preference,
-      before: :extend,
+event :cache_expired_for_new_preference, :integrate,
       when: proc { |c| c.follow_rule_card? }  do
   Card.follow_caches_expired
 end
@@ -63,7 +57,7 @@ format :html do
     hash = follow_link_hash args
     text = args[:icon] ? glyphicon('flag') : ''
     span_attrs = 'follow-verb menu-item-label'
-    text += %[<span class="#{span_attrs}">#{hash[:verb]}</span>].html_safe
+    text += %(<span class="#{span_attrs}">#{hash[:verb]}</span>).html_safe
     # follow_rule_card = Card.fetch(
     #   card.default_follow_set_card.follow_rule_name(Auth.current.name),
     #   new: {}
@@ -73,7 +67,7 @@ format :html do
       title:           hash[:title],
       'data-path'      => hash[:path],
       'data-toggle'    => 'modal',
-      'data-target'    => "#modal-#{card.cardname.safe_key}",
+      'data-target'    => "#modal-#{card.cardname.safe_key}"
     )
     opts[:class] = "follow-link #{opts[:class]}"
     link_to text, hash[:path], opts
@@ -162,8 +156,8 @@ end
 def followed_field? field_card
   (follow_field_rule = rule_card(:follow_fields)) ||
     follow_field_rule.item_names.find do |item|
-     item.to_name.key == field_card.key || (item.to_name.key == Card[:includes].key && included_card_ids.include?(field_card.id) )
-  end
+      item.to_name.key == field_card.key || (item.to_name.key == Card[:includes].key && included_card_ids.include?(field_card.id))
+    end
 end
 
 def follower_ids
@@ -171,9 +165,7 @@ def follower_ids
     result = direct_follower_ids
     left_card = left
     while left_card
-      if left_card.followed_field? self
-        result += left_card.direct_follower_ids
-      end
+      result += left_card.direct_follower_ids if left_card.followed_field? self
       left_card = left_card.left
     end
     write_follower_ids_cache result
@@ -196,7 +188,7 @@ def direct_follower_ids _args={}
     set_names.each do |set_name|
       set_card = Card.fetch(set_name)
       set_card.all_user_ids_with_rule_for(:follow).each do |user_id|
-        if (!result.include? user_id) && self.follow_rule_applies?(user_id)
+        if !result.include?(user_id) && follow_rule_applies?(user_id)
           result << user_id
         end
       end
@@ -211,8 +203,8 @@ def all_direct_follower_ids_with_reason
     set_names.each do |set_name|
       set_card = Card.fetch(set_name)
       set_card.all_user_ids_with_rule_for(:follow).each do |user_id|
-        if (!visited.include?(user_id)) &&
-           (follow_option = self.follow_rule_applies?(user_id))
+        if !visited.include?(user_id) &&
+           (follow_option = follow_rule_applies?(user_id))
           visited << user_id
           yield(user_id, set_card: set_card, option: follow_option)
         end

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

@@ -22,7 +22,7 @@ class FollowerStash
             { included_by: left_card.name },
             "follow cards included by #{left_card.name}"
           ).map(&:key)
-          if !@visited.intersection(includee_set).empty?
+          unless @visited.intersection(includee_set).empty?
             add_affected_card left_card
             break
           end
@@ -72,21 +72,21 @@ def notable_change?
     Card::Auth.current_id != WagnBotID && followable?
 end
 
-event :notify_followers_after_save,
-      after: :extend, on: :save, when: proc { |ca| ca.notable_change? } do
+event :notify_followers_after_save, :integrate,
+      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
-event :stash_followers, after: :approve, on: :delete do
+# We have to deal with the notifications in the integrate phase instead of the
+# integrate_with_delay phase
+event :stash_followers, :store, on: :delete do
   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, :integrate,
+      on: :delete, when: proc { |ca| ca.notable_change? } do
   notify_followers
 end
 
@@ -130,7 +130,7 @@ format do
       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)
+                .render_subedit_notice(action: action)
         end
       end.compact.join
 
@@ -146,8 +146,8 @@ format do
     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) }}
+    wrap_subedit_item %(#{name_before_action} #{action.action_type}d
+#{render_list_of_changes(args)})
   end
 
   view :followed, perms: :none, closed: true do |args|

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

@@ -1,14 +1,13 @@
 def send_action_mails args
   setting = "on_#{args[:on]}".to_sym
-  email_templates_for( setting ) do |mailcard|
-    mailcard.deliver( context: self )
+  email_templates_for(setting) do |mailcard|
+    mailcard.deliver(context: self)
   end
 end
 
 def email_templates_for setting
-
   if (email_templates = @email_template_cache ||
-      ((event_card = self.rule_card(setting)) && event_card.extended_item_cards))
+      ((event_card = rule_card(setting)) && event_card.extended_item_cards))
     email_templates.each do |mailcard|
       yield(mailcard)
     end
@@ -16,12 +15,12 @@ def email_templates_for setting
 end
 
 [:create, :update, :delete].each do |action|
-  event "observer_#{action}".to_sym, after: :extend, on: action do
-    self.send_action_mails on: action
+  event "observer_#{action}".to_sym, :integrate, on: action do
+    send_action_mails on: action
   end
 end
 
-event :cache_delete_email_templates, after: :approve, on: :delete do
-  event_card = self.rule_card(:on_delete)
+event :cache_delete_email_templates, :store, on: :delete do
+  event_card = rule_card(:on_delete)
   @email_template_cache = event_card && event_card.extended_item_cards
 end

data/mod/05_email/set/right/bcc.rb

@@ -3,14 +3,12 @@ def process_email_addresses context_card, format_args, args
   format(format_args).render_email_addresses(args.merge(context: context_card))
 end
 
-
 format do
-  def chunk_list  #turn off autodetection of uri's
+  def chunk_list  # turn off autodetection of uri's
     :references
   end
 end
 
-
 format :html do
   view :pointer_items do |args|
     card.item_names(context: :raw).map do |iname|
@@ -26,20 +24,17 @@ format :email_text do
       # note that context is processed twice here because pointers absolutize item_names by default
       # while other types can return relative names.  That's poor default behavior and should be fixed!
       item_name = item_name.to_name.to_absolute(context).to_s
-      if item_name.match(/.+\@.+\..+/)
+      if item_name =~ /.+\@.+\..+/
         item_name
-      elsif item_card = Card.fetch( item_name )
+      elsif item_card = Card.fetch(item_name)
         if item_card.account
           item_card.account.email
         else
-          item_card.contextual_content(context,format: :email_text).split( /[,\n]/ )
+          item_card.contextual_content(context, format: :email_text).split(/[,\n]/)
         end
       end
     end.flatten.compact.join(', ')
   end
 end
 
-
-
 # _user, info@mail.com, Ethan, Pointer -> ..., _left+email, my email address -> info@mail.com
-

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

@@ -8,11 +8,10 @@ def options_rule_card
   Card.new(
     name: 'follow_options_card',
     type_code: :pointer,
-    content: option_cards.map {|oc| "[[#{oc.title}]]" }.join("\n")
+    content: option_cards.map { |oc| "[[#{oc.title}]]" }.join("\n")
   )
 end
 
-
 format :html do
   def default_follow_item_args args
     args[:condition] ||= Env.params[:condition] || '*always'
@@ -21,10 +20,10 @@ format :html do
   view :follow_item, tags: :unknown_ok do |args|
     if card.new_card? || !card.include_item?(args[:condition])
       button_view = :add_follow_rule_button
-      form_opts = {add_item: args[:condition]}
+      form_opts = { add_item: args[:condition] }
     else
       button_view = :delete_follow_rule_button
-      form_opts = {drop_item: args[:condition]}
+      form_opts = { drop_item: args[:condition] }
     end
 
     text = if (option_card = Card.fetch args[:condition])
@@ -42,10 +41,9 @@ format :html do
         { action: :update, name: card.name, success: { view: :follow_item } },
         hidden: { condition: args[:condition] }.merge(form_opts)
       ) do
-
         output [
           _optional_render(button_view, args),
-          card_link( link_target, text: text)
+          card_link(link_target, text: text)
         ]
       end
     end
@@ -56,57 +54,46 @@ format :html do
   end
 
   view :follow_status do |args|
-    %{
+    %(
       <h4>Get notified about changes</h4>
 
-      #{
-        wrap_with( :ul, class: 'delete-list list-group') do
+      #{wrap_with(:ul, class: 'delete-list list-group') do
           card.item_names.map do |option|
             content_tag :li, class: 'list-group-item' do
               condition = option == '*never' ? '*always' : option
               subformat(card).render_follow_item condition: condition
             end
           end.join "\n"
-        end
-      }
-
-      #{
-        card_link(args[:card_key], {
-          text: 'more options',
-          path_opts: {
-            view: :related,
-            related: {
-              name: card.name,
-              view: :related_edit_rule
-            }
-          },
-          class: 'btn update-follow-link',
-          'data-card_key'=>args[:card_key]
-        })
-      }
-    }
+        end}
+
+      #{card_link(args[:card_key],                     text: 'more options',
+                                                       path_opts: {
+                                                         view: :related,
+                                                         related: {
+                                                           name: card.name,
+                                                           view: :related_edit_rule
+                                                         }
+                                                       },
+                                                       class: 'btn update-follow-link',
+                                                       'data-card_key' => args[:card_key])}
+    )
   end
 
-
-  view :delete_follow_rule_button do |args|
+  view :delete_follow_rule_button do |_args|
     button_tag(
       type: :submit,
-      class: 'btn-xs btn-item-delete btn-primary', 'aria-label'=>'Left Align'
+      class: 'btn-xs btn-item-delete btn-primary', 'aria-label' => 'Left Align'
     ) do
-
-      tag :span, class: "glyphicon glyphicon-ok", 'aria-hidden'=>"true"
+      tag :span, class: 'glyphicon glyphicon-ok', 'aria-hidden' => 'true'
     end
-
   end
 
-  view :add_follow_rule_button do |args|
+  view :add_follow_rule_button do |_args|
     button_tag(
       type: :submit,
-      class: 'btn-xs btn-item-add', 'aria-label'=>'Left Align'
+      class: 'btn-xs btn-item-add', 'aria-label' => 'Left Align'
     ) do
-
-      tag :span, class: "glyphicon glyphicon-plus", 'aria-hidden'=>"true"
+      tag :span, class: 'glyphicon glyphicon-plus', 'aria-hidden' => 'true'
     end
   end
-
-end
+end

data/mod/05_email/set/right/follow_fields.rb

@@ -1,3 +1,3 @@
-event :follow_fields_changed, before: :extend do
+event :follow_fields_changed, :integrate do
   Card.follow_caches_expired
-end
+end

data/mod/05_email/set/right/followers.rb

@@ -21,7 +21,9 @@ def raw_content
   end
 end
 
-def virtual?; !real? end
+def virtual?
+  !real?
+end
 
 format do
   include Card::Set::Type::Pointer::Format

data/mod/05_email/set/right/following.rb

@@ -1,9 +1,9 @@
 
-def virtual?; !real? end
-
+def virtual?
+  !real?
+end
 
 format :html do
-
   view :core do |args|
     if card.left && Auth.signed_in?
       render_rule_editor args
@@ -14,35 +14,33 @@ format :html do
     end
   end
 
-  view :status do |args|
+  view :status do |_args|
     if (rcard = current_follow_rule_card)
       rcard.item_cards.map do |item|
-        %{<div class="alert alert-success" role="alert">
+        %(<div class="alert alert-success" role="alert">
           <strong>#{rcard.rule_set.follow_label}</strong>: #{item.title}
-         </div>}
+         </div>)
       end.join
     else
       'No following preference'
     end
   end
 
-  view :closed_content do |args|
+  view :closed_content do |_args|
     ''
   end
 
-=begin
-   view :editor do |args|
-     hidden_field( :content, class: 'card-content', 'no-autosave'=>true) +
-        (args.delete(:select_list) ? raw(render_rule_editor(args)) : super(args) )
-   end
-=end
+  #    view :editor do |args|
+  #      hidden_field( :content, class: 'card-content', 'no-autosave'=>true) +
+  #         (args.delete(:select_list) ? raw(render_rule_editor(args)) : super(args) )
+  #    end
 
-  view :rule_editor do |args|
+  view :rule_editor do |_args|
     preference_name = [
       card.left.default_follow_set_card.name,
       Auth.current.name,
       Card[:follow].name
-    ]*'+'
+    ].join('+')
     rule_context = Card.fetch preference_name, new: { type_id: PointerID }
 
     wrap_with :div, class: 'edit-rule' do
@@ -57,5 +55,4 @@ format :html do
   def current_follow_rule_card
     card.left.rule_card :follow, user: Auth.current
   end
-
 end

data/mod/05_email/set/self/always.rb

@@ -2,7 +2,7 @@ include Card::FollowOption
 
 follow_opts position: 2
 
-follow_test { |follower_id, accounted_ids| true }
+follow_test { |_follower_id, _accounted_ids| true }
 
 def title
   'Following'
@@ -11,4 +11,3 @@ end
 def label
   'follow'
 end
-