card 1.16.6 → 1.16.7

data/mod/05_standard/set/all/rich_html/wrapper.rb

@@ -33,7 +33,7 @@ format :html do
       }
     div =
       content_tag :div, output(yield).html_safe,
-      :id=>card.cardname.url_key, :data=>data, :style=>h(args[:style]), :class=>classes
+      id: card.cardname.url_key, data: data, style: h(args[:style]), class: classes
 
     if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
       name = h card.name
@@ -48,13 +48,13 @@ format :html do
     css_classes = [ 'card-body' ]
     css_classes << args[:body_class]                      if args[:body_class]
     css_classes += [ 'card-content', card.safe_set_keys ] if args[:content]
-    content_tag :div, :class=>css_classes.compact*' ' do
+    content_tag :div, class: css_classes.compact*' ' do
       yield args
     end
   end
 
   def panel args={}
-    wrap_with :div, :class=>"card-frame #{args[:panel_class]}" do
+    wrap_with :div, class: "card-frame #{args[:panel_class]}" do
       output(yield)
     end
   end
@@ -64,7 +64,7 @@ format :html do
       args.delete(:panel_class)
       subframe args, &block
     else
-      show_subheader = show_view?(:toolbar, args.merge(:default_visibility=>:hide)) && @current_view != :related && @current_view != :open
+      show_subheader = show_view?(:toolbar, args.merge(default_visibility: :hide)) && @current_view != :related && @current_view != :open
       wrap args do
         [
           _optional_render( :menu, args ),
@@ -72,7 +72,7 @@ format :html do
             [
               _optional_render( :header, args, :show),
               _optional_render( :subheader, args,(show_subheader ? :show : :hide)),
-              _optional_render( :help, args.merge(:help_class=>'alert alert-info'), :hide),
+              _optional_render( :help, args.merge(help_class: 'alert alert-info'), :hide),
               wrap_body(args) { output( block.call(args) ) } ,
             ]
           end
@@ -84,9 +84,9 @@ format :html do
   def subframe args={}
     wrap args do
       [
-        _optional_render( :menu, args.merge(:optional_horizontal_menu=>:hide) ),
+        _optional_render( :menu, args.merge(optional_horizontal_menu: :hide) ),
         _optional_render( :subheader, args, :show),
-        _optional_render( :help, args.merge(:help_class=>'alert alert-info'), :hide),
+        _optional_render( :help, args.merge(help_class: 'alert alert-info'), :hide),
         panel(args) do
           [
             _optional_render( :header, args, :hide),
@@ -118,7 +118,7 @@ format :html do
           <span aria-hidden="true">&times;</span>
         </button>
       } : ''
-    content_tag :div, :class=>css_class, :role=>'alert' do
+    content_tag :div, class: css_class, role: 'alert' do
       close_button + output( yield args)
     end
   end

data/mod/05_standard/set/right/account.rb

@@ -58,39 +58,39 @@ format :html do
 end
 
 
-event :validate_accountability, :on=>:create, :before=>:approve do
+event :validate_accountability, on: :create, before: :approve do
   unless left and left.accountable?
     errors.add :content, "not allowed on this card"
   end
 end
 
-event :require_email, :on=>:create, :after=>:approve do
+event :require_email, on: :create, after: :approve do
   unless subcards["+#{Card[:email].name}"]
     errors.add :email, 'required'
   end
 end
 
 
-event :set_default_salt, :on=>:create, :before=>:process_subcards do
+event :set_default_salt, on: :create, before: :process_subcards do
   salt = Digest::SHA1.hexdigest "--#{Time.now.to_s}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
-  subcards["+#{Card[:salt].name}"] ||= { :content => salt }
+  subcards["+#{Card[:salt].name}"] ||= { content: salt }
 end
 
-event :set_default_status, :on=>:create, :before=>:process_subcards do
+event :set_default_status, on: :create, before: :process_subcards do
   default_status = ( Auth.needs_setup? ? 'active' : 'pending' )
-  subcards["+#{Card[:status].name}"] = { :content => default_status }
+  subcards["+#{Card[:status].name}"] = { content: default_status }
 end
 
 def confirm_ok?
-  Card.new( :type_id=>Card.default_accounted_type_id ).ok? :create
+  Card.new( type_id: Card.default_accounted_type_id ).ok? :create
 end
 
-event :generate_confirmation_token, :on=>:create, :before=>:process_subcards, :when=>proc{ |c| c.confirm_ok? } do
-  subcards["+#{Card[:token].name}"] = {:content => generate_token }
+event :generate_confirmation_token, on: :create, before: :process_subcards, when: proc{ |c| c.confirm_ok? } do
+  subcards["+#{Card[:token].name}"] = {content: generate_token }
 end
 
-event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_reset_token? } do
+event :reset_password, on: :update, before: :approve, when: proc{ |c| c.has_reset_token? } do
   case ( result = authenticate_by_token @env_token )
   when Integer
     Auth.signin result
@@ -99,9 +99,9 @@ event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_r
   when :token_expired
     send_reset_password_token
     success << {
-      :id => '_self',
-      :view => 'message',
-      :message => "Sorry, this token has expired. Please check your email for a new password reset link."
+      id: '_self',
+      view: 'message',
+      message: "Sorry, this token has expired. Please check your email for a new password reset link."
     }
     abort :success
   else
@@ -111,9 +111,9 @@ end
 
 def edit_password_success_args
   {
-    :id=>left.name,
-    :view=>:related,
-    :related=>{ :name=>"+#{Card[:account].name}", :view=>'edit' }
+    id: left.name,
+    view: :related,
+    related: { name: "+#{Card[:account].name}", view: 'edit' }
   }
 end
 
@@ -123,26 +123,26 @@ end
 
 event :reset_token do
   Auth.as_bot do
-    token_card.update_attributes! :content => generate_token
+    token_card.update_attributes! content: generate_token
   end
 end
 
 
 event :send_welcome_email do
   if ((welcome = Card['welcome email']) && welcome.type_code == :email_template)
-    welcome.deliver(:context=>left, :to=>self.email)
+    welcome.deliver(context: left, to: self.email)
   end
 end
 
-event :send_account_verification_email, :on=>:create, :after=>:extend, :when=>proc{ |c| c.token.present? } do
-  Card[:verification_email].deliver( :context => self, :to => self.email )
+event :send_account_verification_email, on: :create, after: :extend, when: proc{ |c| c.token.present? } do
+  Card[:verification_email].deliver( context: self, to: self.email )
 end
 
 event :send_reset_password_token do
   Auth.as_bot do
-    token_card.update_attributes! :content => generate_token
+    token_card.update_attributes! content: generate_token
   end
-  Card[:password_reset_email].deliver( :context => self, :to => self.email )
+  Card[:password_reset_email].deliver( context: self, to: self.email )
 end
 
 def ok_to_read
@@ -161,11 +161,11 @@ def send_change_notice act, followed_set, follow_option
   if changes_visible?(act)
     Auth.as(left.id) do
       Card[:follower_notification_email].deliver(
-        :context       => act.card,
-        :to            => email,
-        :follower      => left.name,
-        :followed_set  => followed_set,
-        :follow_option => follow_option
+        context:       act.card,
+        to:            email,
+        follower:      left.name,
+        followed_set:  followed_set,
+        follow_option: follow_option
       )
     end
   end

data/mod/05_standard/set/right/email.rb

@@ -11,17 +11,17 @@ end
 
 view :core, :raw
 
-event :validate_email, :after=>:approve, :on=>:save do
+event :validate_email, after: :approve, on: :save do
   if content.present? && content !~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
     errors.add :content, 'must be valid address'
   end
 end
 
-event :validate_unique_email, :after=>:validate_email, :on=>:save do
+event :validate_unique_email, after: :validate_email, on: :save do
   if content.present?
     Auth.as_bot do
-      wql = { :right_id=>Card::EmailID, :eq=>content }
-      wql[:not] = { :id => id } if id
+      wql = { right_id: Card::EmailID, eq: content }
+      wql[:not] = { id: id } if id
       if Card.search( wql ).first
         errors.add :content, 'must be unique'
       end
@@ -29,7 +29,7 @@ event :validate_unique_email, :after=>:validate_email, :on=>:save do
   end
 end
 
-event :downcase_email, :before=>:approve, :on=>:save do
+event :downcase_email, before: :approve, on: :save do
   if content and content != content.downcase
     self.content = content.downcase
   end

data/mod/05_standard/set/right/password.rb

@@ -4,15 +4,15 @@ include All::Permissions::Accounts
 view :editor do |args|
   card.content = ''
   autocomplete = (@parent && @parent.card.name=='*signin+*account') ? 'on' : 'off' #hack
-  password_field :content, :class=>'card-content', :autocomplete=>autocomplete
+  password_field :content, class: 'card-content', autocomplete: autocomplete
 end
 
 view :raw do |args|
   '<em>encrypted</em>'
 end
 
-event :encrypt_password, :on=>:save, :after=>:process_subcards, :changed=>:content,
-    :when => proc{ |c| !Card::Env[:no_password_encryptions] } do
+event :encrypt_password, on: :save, after: :process_subcards, changed: :content,
+    when: proc{ |c| !Card::Env[:no_password_encryptions] } do
       # no_password_encryptions = hack for import - fix with api for ignoring events
 
   salt = (left && left.salt)
@@ -23,13 +23,13 @@ event :encrypt_password, :on=>:save, :after=>:process_subcards, :changed=>:conte
   #  turns out we have a lot of existing account without a salt.  not sure when that broke??
 end
 
-event :validate_password, :on=>:save, :before=>:approve do
+event :validate_password, on: :save, before: :approve do
   unless content.length > 3
     errors.add :password, 'must be at least 4 characters'
   end
 end
 
-event :validate_password_present, :on=>:update, :before=>:approve do
+event :validate_password_present, on: :update, before: :approve do
   abort :success if content.blank?
 end
 

data/mod/05_standard/set/rstar/rules.rb

@@ -1,4 +1,4 @@
-event :save_recently_edited_settings, :before=>:extend, :on=>:save, :when=>proc{|c| c.is_rule? } do
+event :save_recently_edited_settings, before: :extend, on: :save, when: proc{|c| c.is_rule? } do
   if (recent = Card[:recent_settings])
     recent.insert_item 0, cardname.right
     recent.save
@@ -7,19 +7,19 @@ end
 
 format :html do
 
-  view :closed_rule, :tags=>:unknown_ok do |args|
+  view :closed_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule? #these are helpful for handling non-rule rstar cards until we have real rule sets
 
     rule_card = find_current_rule_card
 
     rule_content = !rule_card ? '' : begin
-      subformat(rule_card)._render_closed_content :set_context=>card.cardname.trunk_name
+      subformat(rule_card)._render_closed_content set_context: card.cardname.trunk_name
     end
 
     cells = [
       ["rule-setting",
-        link_to( card.cardname.tag.sub(/^\*/,''), path(:view=>:open_rule),
-          :class => 'edit-rule-link slotter', :remote => true, :rel=>'nofollow' )
+        link_to( card.cardname.tag.sub(/^\*/,''), path(view: :open_rule),
+          class: 'edit-rule-link slotter', remote: true, rel: 'nofollow' )
       ],
       ["rule-content",
         %{<div class="rule-content-container">
@@ -38,7 +38,7 @@ format :html do
   end
 
 
-  view :open_rule, :tags=>:unknown_ok do |args|
+  view :open_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
     current_rule = args[:current_rule]
     setting_name = args[:setting_name]
@@ -57,8 +57,8 @@ format :html do
     end
 
     opts = {
-      :rule_context => card,   # determines the set options and the success view
-      :set_context  => card.rule_set_name,
+      rule_context: card,   # determines the set options and the success view
+      set_context:  card.rule_set_name,
     }
     rule_view = edit_mode ? :edit_rule : :show_rule
 
@@ -66,8 +66,8 @@ format :html do
       <tr class="card-slot open-rule #{rule_view.to_s.sub '_', '-'}">
         <td class="rule-cell" colspan="3">
           <div class="rule-setting">
-            #{ view_link setting_name.sub(/^\*/,''), :closed_rule, :class=>'close-rule-link slotter' }
-            #{ card_link setting_name, :text=>"all #{setting_name} rules", :class=>'setting-link', :target=>'wagn_setting' }
+            #{ view_link setting_name.sub(/^\*/,''), :closed_rule, class: 'close-rule-link slotter' }
+            #{ card_link setting_name, text: "all #{setting_name} rules", class: 'setting-link', target: 'wagn_setting' }
           </div>
 
           <div class="alert alert-info rule-instruction">
@@ -84,13 +84,13 @@ format :html do
 
   def default_open_rule_args args
     current_rule_card = find_current_rule_card || begin
-      Card.new :name=> "#{Card[:all].name}+#{card.rule_user_setting_name}"
+      Card.new name: "#{Card[:all].name}+#{card.rule_user_setting_name}"
     end
 
-    args.reverse_merge! :current_rule => current_rule_card, :setting_name => card.rule_setting_name
+    args.reverse_merge! current_rule: current_rule_card, setting_name: card.rule_setting_name
   end
 
-  view :show_rule, :tags=>:unknown_ok do |args|
+  view :show_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
 
     if !card.new_card?
@@ -98,7 +98,7 @@ format :html do
       args[:item] ||= :link
       %{
         <div class="rule-set">
-          <label>Applies to</label> #{ card_link set.cardname, :text=>set.label }:
+          <label>Applies to</label> #{ card_link set.cardname, text: set.label }:
         </div>
         #{ _render_core args }
       }
@@ -107,10 +107,10 @@ format :html do
     end
   end
 
-  view :edit_rule, :tags=>:unknown_ok do |args|
+  view :edit_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
-    form_args = { :url=>path(:action=>:update, :no_id=>true),
-       :html=> {:class=>"card-form card-rule-form" } }
+    form_args = { url: path(action: :update, no_id: true),
+       html: {class: "card-form card-rule-form" } }
     if args[:remote]
       form_args[:remote] = true
       form_args[:html][:class] += ' slotter'
@@ -126,7 +126,7 @@ format :html do
     end
   end
 
-  view :related_edit_rule, :view=>:edit_rule
+  view :related_edit_rule, view: :edit_rule
 
   def default_edit_rule_args args
     args[:remote]       ||= true
@@ -137,40 +137,40 @@ format :html do
 
     args[:success] ||= {}
     args[:success].reverse_merge!( {
-      :card => args[:rule_context],
-      :id   => args[:rule_context].cardname.url_key,
-      :view => 'open_rule',
-      :item => 'view_rule'
+      card: args[:rule_context],
+      id:   args[:rule_context].cardname.url_key,
+      view: 'open_rule',
+      item: 'view_rule'
     })
 
     args[:delete_button] ||= delete_button args
     args[:cancel_button] ||=
       begin
-        cancel_path = path :view=>( card.new_card? ? :closed_rule : :open_rule ), :success=>false
-        button_tag( 'Cancel', :class=>'rule-cancel-button slotter', :type=>'button',
-                          :href=>cancel_path )
+        cancel_path = path view: ( card.new_card? ? :closed_rule : :open_rule ), success: false
+        button_tag( 'Cancel', class: 'rule-cancel-button slotter', type: 'button',
+                          href: cancel_path )
       end
   end
 
   def default_related_edit_rule_args args
     args[:remote]  ||= false
     args[:success] ||= {
-        :card => args[:parent] || card,
-        :id => (args[:parent] && args[:parent].cardname.url_key) || card.cardname.url_key,
-        :view => :open,
-        :item => nil
+        card: args[:parent] || card,
+        id: (args[:parent] && args[:parent].cardname.url_key) || card.cardname.url_key,
+        view: :open,
+        item: nil
       }
     default_edit_rule_args args
     args[:delete_button] = delete_button args, '.card-slot.related-view'
-    args[:cancel_button] = card_link( args[:success][:id], :text=>'Cancel',
-      :class=>'rule-cancel-button btn btn-default', :path_opts=>{:view=>args[:success][:view]} )
+    args[:cancel_button] = card_link( args[:success][:id], text: 'Cancel',
+      class: 'rule-cancel-button btn btn-default', path_opts: {view: args[:success][:view]} )
   end
 
   def delete_button args, slot_selector=nil
     if !card.new_card?
-      b_args = { :remote=>true, :class=>'rule-delete-button slotter', :type=>'button' }
+      b_args = { remote: true, class: 'rule-delete-button slotter', type: 'button' }
       b_args['data-slot-selector'] = slot_selector if slot_selector
-      b_args[:href] = path :action=>:delete, :success=>args[:success]
+      b_args[:href] = path action: :delete, success: args[:success]
       if (fset = args[:fallback_set]) && (fcard = Card.fetch(fset))
         b_args['data-confirm']="Deleting will revert to #{card.rule_setting_name} rule for #{fcard.label }"
       end
@@ -181,10 +181,10 @@ format :html do
   # used keys for args:
   # :success,  :set_selected, :set_options, :rule_context
   def editor args
-    wrap_with( :div, :class=>'card-editor' ) do
+    wrap_with( :div, class: 'card-editor' ) do
       [
         (type_formgroup( args ) if card.right.rule_type_editable),
-        formgroup( 'rule', content_field( form, args.merge(:skip_rev_id=>true) ), :editor=>'content' ),
+        formgroup( 'rule', content_field( form, args.merge(skip_rev_id: true) ), editor: 'content' ),
         set_selection( args )
       ]
     end
@@ -193,10 +193,10 @@ format :html do
 
   def type_formgroup args
     formgroup 'type', type_field(
-      :href         => path(:name=>args[:success][:card].name, :view=>args[:success][:view], :type_reload=>true),
-      :class        => 'type-field rule-type-field live-type-field',
+      href:         path(name: args[:success][:card].name, view: args[:success][:view], type_reload: true),
+      class:        'type-field rule-type-field live-type-field',
       'data-remote' => true
-    ), :editor=>'type'
+    ), editor: 'type'
   end
 
 
@@ -209,7 +209,7 @@ format :html do
   end
 
   def set_selection args
-    wrap_with( :div, :class=>'row') do
+    wrap_with( :div, class: 'row') do
       [
         set_formgroup( args ),
         related_set_formgroup( args)
@@ -222,7 +222,7 @@ format :html do
     tag = args[:rule_context].rule_user_setting_name
     narrower_rules = []
     option_list =
-      wrap_each_with :li, :class=>'radio' do
+      wrap_each_with :li, class: 'radio' do
         args[:set_options].map do |set_name, state|
 
           checked    = ( args[:set_selected] == set_name or current_set_key && args[:set_options].length==1 )
@@ -237,17 +237,17 @@ format :html do
              narrower_rules.last[0] = narrower_rules.last[0].downcase
           end
           rule_name  = "#{set_name}+#{tag}"
-          radio_button( :name, rule_name, :checked=>checked, :warning=>warning ) + %{
+          radio_button( :name, rule_name, checked: checked, warning: warning ) + %{
               <label class="set-label" #{'current-set-label' if is_current }>
-                #{ card_link set_name, :text=> Card.fetch(set_name).label, :target=>'wagn_set' }
+                #{ card_link set_name, text: Card.fetch(set_name).label, target: 'wagn_set' }
                 #{'<em>(current)</em>' if is_current }
-                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", :text=>"(overwritten)"}</em>" if state == :overwritten }
+                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", text: "(overwritten)"}</em>" if state == :overwritten }
               </label>
              }.html_safe
          end
 
        end
-    formgroup 'set', "<ul>#{ option_list }</ul>", :editor => 'set', :class=>'col-xs-6'
+    formgroup 'set', "<ul>#{ option_list }</ul>", editor: 'set', class: 'col-xs-6'
   end
 
   def related_set_formgroup args
@@ -255,26 +255,26 @@ format :html do
     return '' unless related_sets && related_sets.size > 0
     tag = args[:rule_context].rule_user_setting_name
     option_list =
-      wrap_each_with :li, :class=>'radio' do
+      wrap_each_with :li, class: 'radio' do
         related_sets.map do |set_name, label|
           rule_name  = "#{set_name}+#{tag}"
-          rule_card  = Card.fetch rule_name, :skip_modules=>true
+          rule_card  = Card.fetch rule_name, skip_modules: true
           radio_button( :name, rule_name) + %{
               <label class="set-label">
-                #{ card_link set_name, :text=>label, :target=>'wagn_set' }
-                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", :text=>"(exists)"}</em>" if rule_card}
+                #{ card_link set_name, text: label, target: 'wagn_set' }
+                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", text: "(exists)"}</em>" if rule_card}
               </label>
              }.html_safe
         end
       end
-    formgroup 'related set', "<ul>#{ option_list }</ul>", :editor => 'set', :class=>'col-xs-6'
+    formgroup 'related set', "<ul>#{ option_list }</ul>", editor: 'set', class: 'col-xs-6'
   end
 
   def edit_buttons  args
-    wrap_with( :div, :class=>'button-area' ) do
+    wrap_with( :div, class: 'button-area' ) do
      [
        args[:delete_button],
-       button_tag( 'Submit', :class=>'rule-submit-button', :situation=>'primary' ),
+       button_tag( 'Submit', class: 'rule-submit-button', situation: 'primary' ),
        args[:cancel_button]
      ]
     end
@@ -304,7 +304,7 @@ format :html do
     # and returns that member's ACTUAL rule for the POTENTIAL rule's setting
     if card.new_card?
       if setting = card.right
-        card.set_prototype.rule_card setting.codename, :user=>card.rule_user
+        card.set_prototype.rule_card setting.codename, user: card.rule_user
       end
     else
       card