card 1.16.6 → 1.16.7

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

@@ -1,19 +1,19 @@
 
 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
@@ -22,19 +22,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/mod/05_email/set/right/follow.rb

@@ -5,7 +5,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
 
 
@@ -14,13 +18,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])
@@ -34,11 +38,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
@@ -49,36 +56,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
 

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

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

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

@@ -4,49 +4,58 @@ def virtual?; true end
 
 format :html do
 
-   view :core do |args|
-     if card.left and Auth.signed_in?
-       render_rule_editor args
-     else
-       followers_card = Card.fetch("#{card.cardname.left}+#{Card[:followers].name}") 
-       nest followers_card, :view=>:titled, :item=>:link
-     end
-   end
-   
-   view :status do |args|
-     if rcard = current_follow_rule_card
-       rcard.item_cards.map do |item|
-         %{<div class="alert alert-success" role="alert">
-           <strong>#{rcard.rule_set.follow_label}</strong>: #{item.title}
-          </div>}
-       end.join
-     else
-       "No following preference"
-     end
-   end
-   
-   view :closed_content do |args|
-     ''
-   end
-   
+  view :core do |args|
+    if card.left && Auth.signed_in?
+      render_rule_editor args
+    else
+      fname = "#{card.cardname.left}+#{Card[:followers].name}"
+      fcard = Card.fetch fname
+      nest fcard, view: :titled, item: :link
+    end
+  end
+
+  view :status do |args|
+    if (rcard = current_follow_rule_card)
+      rcard.item_cards.map do |item|
+        %{<div class="alert alert-success" role="alert">
+          <strong>#{rcard.rule_set.follow_label}</strong>: #{item.title}
+         </div>}
+      end.join
+    else
+      'No following preference'
+    end
+  end
+
+  view :closed_content do |args|
+    ''
+  end
+
 =begin
    view :editor do |args|
-     hidden_field( :content, :class=>'card-content', 'no-autosave'=>true) +
+     hidden_field( :content, class: 'card-content', 'no-autosave'=>true) +
         (args.delete(:select_list) ? raw(render_rule_editor(args)) : super(args) )
    end
 =end
-   
-   view :rule_editor do |args|
-     preference_name = "#{card.left.default_follow_set_card.name}+#{Auth.current.name}+#{Card[:follow].name}"
-     rule_context = Card.fetch preference_name, :new=>{:type_id=>PointerID}
-     wrap_with :div, :class=>'edit-rule' do
-       subformat(current_follow_rule_card || rule_context).render_edit_rule :rule_context=>rule_context, 
-         :success=>{ :view=>'status', :id=>card.name }
-     end
-   end
-   
-   def current_follow_rule_card
-     card.left.rule_card :follow, :user=>Auth.current
-   end
-     
+
+  view :rule_editor do |args|
+    preference_name = [
+      card.left.default_follow_set_card.name,
+      Auth.current.name,
+      Card[:follow].name
+    ]*'+'
+    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
+      subformat(follow_context).render_edit_rule(
+        rule_context: rule_context,
+        success: { view: 'status', id: card.name }
+      )
+    end
+  end
+
+  def current_follow_rule_card
+    card.left.rule_card :follow, user: Auth.current
+  end
+
 end

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

@@ -1,8 +1,8 @@
 include Card::FollowOption
 
-self.follow_opts :position=>2
+follow_opts position: 2
 
-self.follow_test { |follower_id, accounted_ids| true }
+follow_test { |follower_id, accounted_ids| true }
 
 def title
   'Following'

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

@@ -1,6 +1,6 @@
 include Card::FollowOption
 
-self.restrictive_follow_opts :position=>1
+self.restrictive_follow_opts position: 1
 
 self.follower_candidate_ids do |card|
   [ card.creator_id ]

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

@@ -1,21 +1,21 @@
 include Card::FollowOption
 
-self.restrictive_follow_opts :position=>2
+self.restrictive_follow_opts position: 2
 
 self.follower_candidate_ids do |card|
   # FIXME? - could optimize by not using cards table...
-  Card.search :editor_of=>card.name, :return=>:id
+  Card.search editor_of: card.name, return: :id
 end
 
 
-def title 
+def title
   'Following content you edited'
 end
 
 def label
   "follow if I edited"
 end
-  
+
 def description set_card
   "#{set_card.follow_label} I edited"
 end

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

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:other, :position=>7, :rule_type_editable => false, :user_specific=>true
+setting_opts group: :other, position: 7, rule_type_editable: false, user_specific: true

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

@@ -1,4 +1,4 @@
-event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.update_all_users } do
+event :update_follow_rules, after: :store, on: :save, when: proc { |c| c.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]
@@ -13,9 +13,9 @@ event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.upd
     end
   end.compact
   Auth.as_bot do
-    Card.search(:type=>'user').each do |user|
+    Card.search(type: 'user').each do |user|
       defaults.each do |set_card, option|
-        if (follow_rule = Card.fetch(set_card.follow_rule_name(user.name), :new=>{}))
+        if (follow_rule = Card.fetch(set_card.follow_rule_name(user.name), new: {}))
          follow_rule.drop_item "*never"
          follow_rule.drop_item "*always"
          follow_rule.add_item option
@@ -28,7 +28,7 @@ event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.upd
 end
 
 format :html do
-  view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
+  view :edit, perms: :update, tags: :unknown_ok do |args|
     frame_and_form :update, args do
       [
         _optional_render( :content_formgroup, args ),
@@ -53,13 +53,13 @@ format :html do
   def default_edit_args args
     args[:hidden] ||= {}
     args[:hidden].reverse_merge!(
-      :success  => '_self',
-      :card     => { :update_all_users => false }
+      success: '_self',
+      card:    { update_all_users: false }
     )
     args[:buttons] = %{
-      #{ button_tag 'Submit and update all users', :disable_with=>'Updating', :class=>'follow-updater', :situation=>'primary' }
-      #{ button_tag 'Submit', :class=>'follow'         }
-      #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
+      #{ button_tag 'Submit and update all users', disable_with: 'Updating', class: 'follow-updater', situation: 'primary' }
+      #{ button_tag 'Submit', class: 'follow'         }
+      #{ button_tag 'Cancel', class: 'slotter', type: 'button', href: path(view: :edit, id: card.id)}
     }
 
   end

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

@@ -1,6 +1,6 @@
 include Card::FollowOption
 
-self.follow_opts :position=>3
+self.follow_opts position: 3
 
 self.follow_test { |follower_id, accounted_ids| false }
 

data/mod/05_email/set/type/email_template.rb

@@ -16,7 +16,7 @@ def process_email_field field, config, args
   config[field] =
     if args[field]
       args[field]
-    elsif field_card = fetch(:trait=>field)
+    elsif field_card = fetch(trait: field)
       # configuration can be anything visible to configurer
       user = ( args[:follower] and Card.fetch(args[:follower]) ) || field_card.updater
       Auth.as( user ) do
@@ -31,7 +31,7 @@ def process_message_field field, config, args, format, special_args=nil
   process_email_field( field, config, args ) do |field_card|
     content_args = args.clone
     content_args.merge! special_args if special_args
-    field_card.contextual_content args[:context], { :format=>format }, content_args
+    field_card.contextual_content args[:context], { format: format }, content_args
   end
 end
 
@@ -41,13 +41,13 @@ def email_config args={}
 
   [:to, :from, :cc, :bcc].each do |field_name|
     process_email_field( field_name, config, args ) do |field_card|
-      field_card.process_email_addresses args[:context], {:format=>'email_text'}, args
+      field_card.process_email_addresses args[:context], {format: 'email_text'}, args
     end
   end
   process_email_field( :attach, config, args ) do |field_card|
     field_card.extended_item_contents args[:context]
   end
-  process_message_field :subject,      config, args, 'email_text', :content_opts=>{ :chunk_list=>:inclusion_only }
+  process_message_field :subject,      config, args, 'email_text', content_opts: { chunk_list: :inclusion_only }
   process_message_field :text_message, config, args, 'email_text'
   process_message_field :html_message, config, args, 'email_html'
   config[:html_message] = Card::Mailer.layout config[:html_message] if config[:html_message].present?
@@ -66,7 +66,7 @@ end
 
 
 format do
-  view :mail, :perms=>:none do |args|
+  view :mail, perms: :none do |args|
     args = card.email_config(args)
     text_message = args.delete(:text_message)
     html_message = args.delete(:html_message)
@@ -76,11 +76,11 @@ format do
       if alternative
         if attachment_list and !attachment_list.empty?
           content_type 'multipart/mixed'
-          part :content_type => 'multipart/alternative' do |copy|
-            copy.part :content_type => 'text/plain' do |plain|
+          part content_type: 'multipart/alternative' do |copy|
+            copy.part content_type: 'text/plain' do |plain|
               plain.body = text_message
             end
-            copy.part :content_type => 'text/html' do |html|
+            copy.part content_type: 'text/html' do |html|
               html.body = html_message
             end
           end
@@ -102,7 +102,7 @@ format do
       if attachment_list
         attachment_list.each_with_index do |cardname, i|
           if c = Card[ cardname ] and c.respond_to?(:attachment)
-            add_file :filename => "attachment-#{i + 1}.#{c.attachment.extension}", :content => File.read( c.attachment.path )
+            add_file filename: "attachment-#{i + 1}.#{c.attachment.extension}", content: File.read( c.attachment.path )
           end
         end
       end

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

@@ -75,13 +75,13 @@ format :html do
 
    # returns hashes with existing and suggested follow options
    # structure:
-   # set_pattern_class => [ {:card=>rule_card, :options=>['*always', '*created'] },.... ]
+   # set_pattern_class => [ {card: rule_card, options: ['*always', '*created'] },.... ]
    def followed_by_set
      res = Hash.new { |h,k| h[k] = [] }
      never = Card[:never].name
      card.item_cards.each do |follow_rule|
        options = follow_rule.item_names.reject { |item| item == never}
-       res[follow_rule.rule_set.subclass_for_set] << { :card=>follow_rule, :options=>options }
+       res[follow_rule.rule_set.subclass_for_set] << { card: follow_rule, options: options }
      end
 
      if Auth.signed_in? && Auth.current_id == card.left.id
@@ -92,8 +92,8 @@ format :html do
              rule[:options] << option
            end
          else
-           rule_card =  Card.new(:name=>suggested_rule_name)
-           res[set_card.subclass_for_set] << {:card=>rule_card, :options=>[option]}
+           rule_card =  Card.new(name: suggested_rule_name)
+           res[set_card.subclass_for_set] << {card: rule_card, options: [option]}
          end
        end
      end
@@ -107,15 +107,15 @@ format :html do
      end
 
      sets = followed_by_set
-     wrap_with :div, :class=>'pointer-list-editor' do
-       wrap_with :ul, :class=>'delete-list list-group' do
+     wrap_with :div, class: 'pointer-list-editor' do
+       wrap_with :ul, class: 'delete-list list-group' do
 
          Card.set_patterns.select{|p| sets[p]}.reverse.map do |set_pattern|
            sets[set_pattern].map do |rule|
              rule[:options].map do |option|
 
-                 content_tag :li, :class=>'list-group-item' do
-                   subformat(rule[:card]).render_follow_item :condition=>option, :hide=>hide_buttons
+                 content_tag :li, class: 'list-group-item' do
+                   subformat(rule[:card]).render_follow_item condition: option, hide: hide_buttons
                  end
 
              end.join("\n")
@@ -140,12 +140,12 @@ format :html do
        hide_buttons = [:delete_follow_rule_button, :add_follow_rule_button]
      end
      never = Card[:never].name
-     wrap_with :div, :class=>'pointer-list-editor' do
-       wrap_with :ul, :class=>'delete-list list-group' do
+     wrap_with :div, class: 'pointer-list-editor' do
+       wrap_with :ul, class: 'delete-list list-group' do
 
          ignore_list.map do |rule_card|
-           content_tag :li, :class=>'list-group-item' do
-             subformat(rule_card).render_follow_item :condition=>never, :hide=>hide_buttons
+           content_tag :li, class: 'list-group-item' do
+             subformat(rule_card).render_follow_item condition: never, hide: hide_buttons
            end
          end.join "\n"
 
@@ -153,16 +153,16 @@ format :html do
      end
    end
 
-   view :pointer_items, :tags=>:unknown_ok do |args|
-     super(args.merge(:item=>:link))
+   view :pointer_items, tags: :unknown_ok do |args|
+     super(args.merge(item: :link))
    end
 
-   view :errors, :perms=>:none do |args|
+   view :errors, perms: :none do |args|
      if card.errors.any?
        if card.errors.find { |attrib,msg| attrib == :permission_denied }
          Env.save_interrupted_action(request.env['REQUEST_URI'])
          title = "Problems with #{card.name}"
-         frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
+         frame args.merge(panel_class: "panel panel-warning", title: title, hide: 'menu' ) do
            "Please #{ link_to 'sign in', card_url(':signin') }" #" #{to_task}"
          end
        else