card 1.16.6 → 1.16.7

data/tmpsets/set/mod005-04_settings/self/update.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Update; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/update.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=> :permission, :position=>3, :rule_type_editable=>false
+setting_opts group: :permission, position: 3, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/update.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/type/setting.rb

@@ -4,7 +4,7 @@ require_dependency 'json'
 
 def self.member_names
   @@member_names ||= begin
-    Card.search( :type_id=>SettingID, :return=>'key' ).inject({}) do |hash, card_key|
+    Card.search( type_id: SettingID, return: 'key' ).inject({}) do |hash, card_key|
       hash[card_key] = true
       hash
     end
@@ -14,12 +14,12 @@ end
 view :core do |args|
 
   klasses = Card.set_patterns.reverse.map do |set_class|
-    wql = { :left  => { :type =>Card::SetID },
-            :right => card.id,
-            #:sort  => 'content',
-            
-            :sort  => ['content', 'name'],
-            :limit => 0
+    wql = { left:  { type: Card::SetID },
+            right: card.id,
+            #sort:  'content',
+
+            sort:  ['content', 'name'],
+            limit: 0
           }
     wql[:left][ (set_class.anchorless? ? :id : :right_id )] = set_class.pattern_id
 
@@ -28,14 +28,14 @@ view :core do |args|
   end.compact
 
 
-  
-  %{ 
+
+  %{
     #{ _render_rule_help args }
     <table class="setting-rules">
       <tr><th>Set</th><th>Rule</th></tr>
       #{
         klasses.map do |klass, rules|
-          %{ 
+          %{
             <tr class="klass-row anchorless-#{ klass.anchorless? }">
               <td class="setting-klass">#{ klass.anchorless? ? card_link( klass.pattern ) : klass.pattern }</td>
               <td class="rule-content-container">
@@ -52,8 +52,8 @@ view :core do |args|
                   previous_content = current_content
                   %{
                     <tr class="#{ 'rule-changeover' if changeover }">
-                    <td class="rule-anchor">#{ card_link rule.cardname.trunk_name, :text=> rule.cardname.trunk_name.trunk_name }</td>
-                    
+                    <td class="rule-anchor">#{ card_link rule.cardname.trunk_name, text: rule.cardname.trunk_name.trunk_name }</td>
+
                       #{
                         if duplicate
                           %{ <td></td> }
@@ -70,11 +70,11 @@ view :core do |args|
 
                 end * "\n"
               end
-            
+
             }
           }
         end * "\n"
-      
+
       }
     </table>
   }

data/tmpsets/set/mod006-05_email/all/follow.rb

@@ -4,19 +4,23 @@ card_accessor :followers
 
 FOLLOWER_IDS_CACHE_KEY = 'FOLLOWER_IDS'
 
-event :cache_expired_because_of_new_set, :before=>:store, :on=>:create, :when=>proc { |c| c.type_id == Card::SetID } do
+event :cache_expired_for_new_set, before: :store, on: :create,
+  when: proc { |c| c.type_id == Card::SetID } do
   Card.follow_caches_expired
 end
 
-event :cache_expired_because_of_type_change, :before=>:store, :changed=>:type_id do  #FIXME expire (also?) after save
+event :cache_expired_for_type_change, before: :store, changed: :type_id do
+  #FIXME expire (also?) after save
   Card.follow_caches_expired
 end
 
-event :cache_expired_because_of_name_change, :before=>:store, :changed=>:name do
+event :cache_expired_for_name_change, before: :store, changed: :name do
   Card.follow_caches_expired
 end
 
-event :cache_expired_because_of_new_user_rule, :before=>:extend, :when=>proc { |c| c.follow_rule_card? }  do
+event :cache_expired_for_new_user_rule, before: :extend,
+  when: proc { |c| c.follow_rule_card? }  do
+
   Card.follow_caches_expired
 end
 
@@ -24,21 +28,25 @@ format do
 
   def follow_link_hash args
     toggle = args[:toggle] || ( card.followed? ? :off : :on )
-    hash = { :class => "follow-toggle-#{toggle}" }
+    hash = { class: "follow-toggle-#{toggle}" }
+    these_emails = "emails about changes to #{card.follow_label}"
     case toggle
     when :off
       hash[:content] = '*never'
-      hash[:title]   = "stop sending emails about changes to #{card.follow_label}"
+      hash[:title]   = "stop sending #{these_emails}"
       hash[:verb]    = 'unfollow'
     when :on
       hash[:content] = '*always'
-      hash[:title]   = "send emails about changes to #{card.follow_label}"
+      hash[:title]   = "send #{these_emails}"
       hash[:verb]    = 'follow'
     end
-    follow_rule_name = card.default_follow_set_card.follow_rule_name( Auth.current.name )
-    hash[:path] = path :name=>follow_rule_name, :action=>:update,
-                       :success=>{ :layout=>:modal, :view=>:follow_status },
-                       :card=>{ :content=>"[[#{hash[:content]}]]" }
+    set_card = card.default_follow_set_card
+    hash[:path] = path(
+      name: set_card.follow_rule_name( Auth.current.name),
+      action: :update,
+      success: { layout: :modal, view: :follow_status },
+      card: { content: "[[#{hash[:content]}]]" }
+    )
     hash
   end
 
@@ -52,14 +60,14 @@ end
 
 format :html do
 
-  view :follow_link, :tags=>:unknown_ok, :perms=>:none do |args|
+  view :follow_link, tags: :unknown_ok, perms: :none do |args|
     hash = follow_link_hash args
     text = args[:icon] ? glyphicon('flag') : ''
     text += %[<span class="follow-verb menu-item-label">#{hash[:verb]}</span>].html_safe
-    follow_rule_card = Card.fetch(card.default_follow_set_card.follow_rule_name( Auth.current.name ), :new=>{})
+    follow_rule_card = Card.fetch(card.default_follow_set_card.follow_rule_name( Auth.current.name ), new: {})
     opts = ( args[:html_args] || {} ).clone
     opts.merge!(
-      :title           => hash[:title],
+      title:           hash[:title],
       'data-path'      => hash[:path],
       'data-toggle'    => 'modal',
       'data-target'    => "#modal-#{card.cardname.safe_key}",
@@ -116,7 +124,7 @@ end
 
 
 def follow_rule_applies? follower_id
-  follow_rule = rule :follow, :user_id=>follower_id
+  follow_rule = rule :follow, user_id: follower_id
   if follow_rule.present?
     follow_rule.split("\n").each do |value|
 
@@ -212,7 +220,7 @@ def all_direct_follower_ids_with_reason
       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))
           visited << user_id
-          yield(user_id, :set_card=>set_card, :option=>follow_option)
+          yield(user_id, set_card: set_card, option: follow_option)
         end
       end
     end

data/tmpsets/set/mod006-05_email/all/notify.rb

@@ -13,16 +13,16 @@ class FollowerStash
       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
+          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|
+          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)
+              includee_set = Card.search(included_by: card.left.name).map(&:key)
               if !@visited.intersection(includee_set).empty?
                 add_affected_card card.left
                 break
@@ -68,19 +68,19 @@ def notable_change?
   !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
-event :stash_followers, :after=>:approve, :on=>:delete do
+event :stash_followers, after: :approve, 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, after: :extend, on: :delete,
+    when: proc{ |ca| ca.notable_change? } do
   notify_followers
 end
 
@@ -104,7 +104,7 @@ def notify_followers
 end
 
 format do
-  view :list_of_changes, :denial=>:blank do |args|
+  view :list_of_changes, denial: :blank do |args|
     action = get_action(args)
 
     relevant_fields = case action.action_type
@@ -119,10 +119,11 @@ format do
   end
 
 
-  view :subedits, :perms=>:none do |args|
-    subedits = get_act(args).relevant_actions_for(card).map do |action|
+  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
 
@@ -133,7 +134,7 @@ format do
     end
   end
 
-  view :subedit_notice, :denial=>:blank do |args|
+  view :subedit_notice, denial: :blank do |args|
     action = get_action(args)
     name_before_action = (action.new_values[:name] && action.old_values[:name]) || card.name
 
@@ -141,7 +142,7 @@ format do
 #{ render_list_of_changes(args) }}
   end
 
-  view :followed, :perms=>:none, :closed=>true do |args|
+  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
@@ -150,15 +151,15 @@ format do
     end
   end
 
-  view :follower, :perms=>:none, :closed=>true do |args|
+  view :follower, perms: :none, closed: true do |args|
     args[:follower] || 'follower'
   end
 
-  view :unfollow_url, :perms=>:none, :closed=>true do |args|
+  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}}
+     update_path = page_path target_name, action: :update, card: {subcards: {rule_name=>Card[:never].name}}
      card_url update_path # absolutize path
     end
   end
@@ -173,11 +174,12 @@ format do
     end
     item_title +=  "#{field}: "
 
-    item_value = if action.action_type == :delete
-      action.old_values[field]
-    else
-      action.new_values[field]
-    end
+    item_value =
+      if action.action_type == :delete
+        action.old_values[field]
+      else
+        action.new_values[field]
+      end
 
      wrap_list_item "#{item_title}#{item_value}"
   end
@@ -210,14 +212,14 @@ end
 
 
 format :email_text do
-  view :last_action, :perms=>:none do |args|
+  view :last_action, perms: :none do |args|
     act = get_act(args)
     "#{act.main_action.action_type}d"
   end
 end
 
 format :email_html do
-  view :last_action, :perms=>:none do |args|
+  view :last_action, perms: :none do |args|
     act = get_act(args)
     "#{act.main_action.action_type}d"
   end

data/tmpsets/set/mod006-05_email/all/observer.rb

@@ -1,16 +1,16 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module Observer; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/all/observer.rb ~~~~~~~~~~~
-def send_action_mails args  
-  setting = "on_#{args[:on]}".to_sym    
+def send_action_mails args
+  setting = "on_#{args[:on]}".to_sym
   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) and event_card.extended_item_cards )
+
+  if (email_templates = @email_template_cache ||
+      ((event_card = self.rule_card(setting)) && event_card.extended_item_cards))
     email_templates.each do |mailcard|
       yield(mailcard)
     end
@@ -18,12 +18,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, after: :extend, on: action do
+    self.send_action_mails on: action
   end
 end
 
-event :cache_delete_email_templates, :after=>:approve, :on=>:delete do 
+event :cache_delete_email_templates, after: :approve, on: :delete do
   event_card = self.rule_card(:on_delete)
   @email_template_cache = event_card && event_card.extended_item_cards
 end

data/tmpsets/set/mod006-05_email/right/bcc.rb

@@ -2,20 +2,20 @@
 class Card; module Set; module Right; module Bcc; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/right/bcc.rb ~~~~~~~~~~~
 
 def process_email_addresses context_card, format_args, args
-  format(format_args).render_email_addresses(args.merge(:context=>context_card))
+  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|
+  view :pointer_items do |args|
+    card.item_names(context: :raw).map do |iname|
       wrap_item iname, args
     end.join ', '
   end
@@ -24,19 +24,19 @@ end
 format :email_text do
   view :email_addresses do |args|
     context = args[:context] || self
-    card.item_names(:context=>context.cardname).map do |item_name|
+    card.item_names(context: context.cardname).map do |item_name|
       # 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.match(/.+\@.+\..+/)
         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
     end.flatten.compact.join(', ')
   end
 end

data/tmpsets/set/mod006-05_email/right/follow.rb

@@ -7,7 +7,11 @@ def option_cards
 end
 
 def options_rule_card
-  Card.new :name=>'follow_options_card', :type_code=>:pointer, :content=>option_cards.map {|oc| "[[#{oc.title}]]" }.join("\n")
+  Card.new(
+    name: 'follow_options_card',
+    type_code: :pointer,
+    content: option_cards.map {|oc| "[[#{oc.title}]]" }.join("\n")
+  )
 end
 
 
@@ -16,13 +20,13 @@ format :html do
     args[:condition] ||= Env.params[:condition] || '*always'
   end
 
-  view :follow_item, :tags=>:unknown_ok do |args|
+  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])
@@ -36,11 +40,14 @@ format :html do
                     "#{card.rule_set_name}+by name"
                   end
     wrap do
-      card_form({:action=>:update, :name=>card.name, :success=>{:view=>:follow_item}},
-              :hidden=>{:condition=>args[:condition]}.merge(form_opts)) do
+      card_form(
+        { 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
@@ -51,36 +58,56 @@ format :html do
   end
 
   view :follow_status do |args|
-    #          #{ link_to '×', '', 'aria-hidden'=>true, :class=>'close update-follow-link', 'data-dismiss'=>'modal', 'data-card_key'=>args[:card_key] }
     %{
-
       <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
-              subformat(card).render_follow_item :condition=>(option == '*never' ? '*always' : 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]) }
+      #{
+        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|
-    button_tag :type=>:submit, :class=>'btn-xs btn-item-delete btn-primary', 'aria-label'=>'Left Align' do
-      tag :span, :class=>"glyphicon glyphicon-ok", 'aria-hidden'=>"true"
+    button_tag(
+      type: :submit,
+      class: 'btn-xs btn-item-delete btn-primary', 'aria-label'=>'Left Align'
+    ) do
+
+      tag :span, class: "glyphicon glyphicon-ok", 'aria-hidden'=>"true"
     end
 
   end
 
   view :add_follow_rule_button do |args|
-    button_tag :type=>:submit, :class=>'btn-xs btn-item-add', 'aria-label'=>'Left Align' do
-      tag :span, :class=>"glyphicon glyphicon-plus", 'aria-hidden'=>"true"
+    button_tag(
+      type: :submit,
+      class: 'btn-xs btn-item-add', 'aria-label'=>'Left Align'
+    ) do
+
+      tag :span, class: "glyphicon glyphicon-plus", 'aria-hidden'=>"true"
     end
   end