card 1.17.4 → 1.18.0

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

@@ -7,10 +7,21 @@ card_accessor :salt
 card_accessor :status
 card_accessor :token
 
-def active?;   status == 'active'  end
-def blocked?;  status == 'blocked' end
-def built_in?; status == 'system'  end
-def pending?;  status == 'pending' end
+def active?
+  status == 'active'
+end
+
+def blocked?
+  status == 'blocked'
+end
+
+def built_in?
+  status == 'system'
+end
+
+def pending?
+  status == 'pending'
+end
 
 def validate_token! test_token
   tcard = token_card
@@ -60,23 +71,24 @@ format :html do
   end
 end
 
-event :validate_accountability, on: :create, before: :approve do
+event :validate_accountability, :prepare_to_validate, on: :create do
   unless left && left.accountable?
     errors.add :content, 'not allowed on this card'
   end
 end
 
-event :require_email, on: :create, after: :approve do
+event :require_email, :prepare_to_validate,
+      after: :validate_accountability, on: :create do
   errors.add :email, 'required' unless subfield(:email)
 end
 
-event :set_default_salt, on: :create, before: :approve_subcards do
+event :set_default_salt, :prepare_to_validate, on: :create do
   salt = Digest::SHA1.hexdigest "--#{Time.zone.now}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
   add_subfield :salt, content: salt
 end
 
-event :set_default_status, on: :create, before: :approve_subcards do
+event :set_default_status, :prepare_to_validate, on: :create do
   default_status = Auth.needs_setup? ? 'active' : 'pending'
   add_subfield :status, content: default_status
 end
@@ -85,14 +97,14 @@ def confirm_ok?
   Card.new(type_id: Card.default_accounted_type_id).ok? :create
 end
 
-event :generate_confirmation_token,
-      on: :create, before: :process_subcards,
+event :generate_confirmation_token, :prepare_to_store,
+      on: :create,
       when: proc { |c| c.confirm_ok? } do
   add_subfield :token, content: generate_token
 end
 
-event :reset_password, on: :update, before: :approve, when:
-    proc { |c| c.reset_password? } do
+event :reset_password,
+      :prepare_to_validate, on: :update, when: proc { |c| c.reset_password? } do
   if validate_token! @env_token
     token_card.used!
     Auth.signin left_id
@@ -133,8 +145,8 @@ event :send_welcome_email do
   end
 end
 
-event :send_account_verification_email, on: :create, after: :extend, when:
-    proc { |c| c.token.present? } do
+event :send_account_verification_email, :integrate,
+      on: :create, when: proc { |c| c.token.present? } do
   Card[:verification_email].deliver context: self, to: email
 end
 

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

@@ -12,7 +12,7 @@ end
 
 view :core, :raw
 
-event :validate_email, after: :approve, on: :save do
+event :validate_email, :validate, on: :save do
   if content.present? && content !~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
     errors.add :content, 'must be valid address'
   end
@@ -31,7 +31,7 @@ event :validate_unique_email, after: :validate_email, on: :save do
   end
 end
 
-event :downcase_email, before: :approve, on: :save do
+event :downcase_email, :prepare_to_validate, on: :save do
   return if !content || content == content.downcase
   self.content = content.downcase
 end

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

@@ -17,9 +17,9 @@ view :raw do
   '<em>encrypted</em>'
 end
 
-event :encrypt_password, on: :save, after: :process_subcards,
-                         changed: :content,
-                         when: proc { !Card::Env[:no_password_encryptions] } do
+event :encrypt_password, :store,
+      on: :save, changed: :content,
+      when: proc { !Card::Env[:no_password_encryptions] } do
   # no_password_encryptions = hack for import - fix with api for ignoring events
   salt = left && left.salt
   # HACK: fix with better ORM handling
@@ -31,13 +31,14 @@ event :encrypt_password, on: :save, after: :process_subcards,
   # not sure when that broke??
 end
 
-event :validate_password, on: :save, before: :approve do
+event :validate_password, :validate,
+      on: :save 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, :prepare_to_validate, on: :update do
   abort :success if content.blank?
 end
 

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

@@ -1,5 +1,5 @@
 include All::Permissions::Accounts
 
-view :raw do |args|
-  "Private data"
+view :raw do |_args|
+  'Private data'
 end

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

@@ -1,35 +1,32 @@
 
 view :core do |args|
   if subject = card.left
-  
+
     frame args do
       cache_card = Card.fetch(subject.key)
       db_card    = Card.find_by_key(subject.key)
-    
+
       table = if cache_card && db_card
-        %{<table class="show-cache">
-            <tr><th>Field</th><th>Cache Val</th><th>Database Val</th></tr>
-            #{
-              [ :name, :updated_at, :updater_id, :content ].map do |field|
-                %{<tr>#{ [ field, cache_card.send(field), db_card.send(field) ].map() { |cell| "<td>#{cell}</td>"}.join }</tr>}
-              end.join
-            }
-          </table>
-        }
+                %(<table class="show-cache">
+                    <tr><th>Field</th><th>Cache Val</th><th>Database Val</th></tr>
+                    #{[:name, :updated_at, :updater_id, :content].map do |field|
+                        %(<tr>#{[field, cache_card.send(field), db_card.send(field)].map { |cell| "<td>#{cell}</td>" }.join}</tr>)
+                      end.join}
+                  </table>
+                )
       end
-  
-      %{
+
+      %(
         <h1>Cache/DB Comparison</h1>
-        #{ table }
-      
+        #{table}
+
         <h1>Cached Card Inspect</h1>
-        #{ h cache_card.inspect }
+        #{h cache_card.inspect}
 
         <h1>Database Card Inspect</h1>
-        #{ h db_card.inspect }
-       }
+        #{h db_card.inspect}
+       )
     end
-    
+
   end
 end
-

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

@@ -1,6 +1,6 @@
 include All::Permissions::Accounts
 
-DURATIONS = 'second|minute|hour|day|week|month|year'
+DURATIONS = 'second|minute|hour|day|week|month|year'.freeze
 
 card_accessor :expiration
 

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

@@ -1,4 +1,4 @@
-view :raw do |args|
+view :raw do |_args|
   card.left.new_card? ? '' : card.left.created_at.strftime('%A, %B %d, %Y %I:%M %p %Z')
 end
 

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

@@ -1,4 +1,4 @@
-view :raw do |args|
+view :raw do |_args|
   card.left.new_card? ? '' : card.left.updated_at.strftime('%A, %B %d, %Y %I:%M %p %Z')
 end
 

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

@@ -1,5 +1,5 @@
-event :save_recently_edited_settings,
-      before: :extend, on: :save, when: proc { |c| c.is_rule? } do
+event :save_recently_edited_settings, :integrate,
+      on: :save, when: proc { |c| c.is_rule? } do
   if (recent = Card[:recent_settings])
     recent.insert_item 0, cardname.right
     recent.save
@@ -88,7 +88,7 @@ def set_options
   # have the option to create rules based on arbitrary narrower sets, though
   # narrower sets will always apply to whatever prototype we create
 
-  return res, fallback_set
+  [res, fallback_set]
 end
 
 def set_prototype

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

@@ -2,7 +2,7 @@ format :html do
   view :closed_rule, tags: :unknown_ok do
     # these are helpful for handling non-rule rstar cards until we have real
     # rule sets
-    return 'not a rule' if !card.is_rule?
+    return 'not a rule' unless card.is_rule?
 
     rule_card = find_current_rule_card
     rule_content =
@@ -22,24 +22,24 @@ format :html do
        )
       ],
       ['rule-content',
-       %{<div class="rule-content-container">
+       %(<div class="rule-content-container">
            <span class="closed-content content">#{rule_content}</span>
-         </div> }],
-      ['rule-set', (rule_card ? rule_card.trunk.label : '')],
+         </div> )],
+      ['rule-set', (rule_card ? rule_card.trunk.label : '')]
     ]
     extra_css_class =
       rule_card && !rule_card.new_card? ? 'known-rule' : 'missing-rule'
 
     row =
       cells.map do |css_class, content|
-        %{<td class="rule-cell #{css_class} #{extra_css_class}">#{content}</td>}
+        %(<td class="rule-cell #{css_class} #{extra_css_class}">#{content}</td>)
       end.join("\n")
 
-    %{<tr class="card-slot closed-rule"> #{row} </tr>}
+    %(<tr class="card-slot closed-rule"> #{row} </tr>)
   end
 
   view :open_rule, tags: :unknown_ok do |args|
-    return 'not a rule' if !card.is_rule?
+    return 'not a rule' unless card.is_rule?
     current_rule = args[:current_rule]
     setting_name = args[:setting_name]
 
@@ -59,7 +59,7 @@ format :html do
 
     opts = {
       rule_context: card,   # determines the set options and the success view
-      set_context:  card.rule_set_name,
+      set_context:  card.rule_set_name
     }
     rule_view = edit_mode ? :edit_rule : :show_rule
 
@@ -67,20 +67,20 @@ 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">
-            #{ process_content "{{#{setting_name}+*right+*help|content}}" }
+            #{process_content "{{#{setting_name}+*right+*help|content}}"}
           </div>
 
           <div class="card-body">
-            #{ subformat(current_rule)._render rule_view, opts }
+            #{subformat(current_rule)._render rule_view, opts}
           </div>
         </td>
       </tr>
@@ -96,24 +96,24 @@ format :html do
   end
 
   view :show_rule, tags: :unknown_ok do |args|
-    return 'not a rule' if !card.is_rule?
+    return 'not a rule' unless card.is_rule?
 
     if !card.new_card?
       set = card.rule_set
       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 }
-      }
+        #{_render_core args}
+      )
     else
       'No Current Rule'
     end
   end
 
   view :edit_rule, tags: :unknown_ok do |args|
-    return 'not a rule' if !card.is_rule?
+    return 'not a rule' unless card.is_rule?
     form_args = {
       url: path(action: :update, no_id: true),
       html: { class: 'card-form card-rule-form' }
@@ -125,11 +125,11 @@ format :html do
 
     form_for card, form_args do |form|
       @form = form
-      %{
-        #{ hidden_success_formgroup args[:success]}
-        #{ editor args }
-        #{ edit_buttons args }
-      }
+      %(
+        #{hidden_success_formgroup args[:success]}
+        #{editor args}
+        #{edit_buttons args}
+      )
     end
   end
 
@@ -194,10 +194,10 @@ format :html do
     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 }"
+        "Deleting will revert to #{card.rule_setting_name} rule for " \
+        "#{fcard.label}"
     end
-    %{<span class="rule-delete-section">#{ button_tag 'Delete', b_args }</span>}
+    %(<span class="rule-delete-section">#{button_tag 'Delete', b_args}</span>)
   end
 
   # used keys for args:
@@ -225,11 +225,11 @@ format :html do
   end
 
   def hidden_success_formgroup args
-    %{
-      #{ hidden_field_tag 'success[id]', args[:id] || args[:card].name }
-      #{ hidden_field_tag 'success[view]', args[:view] }
-      #{ hidden_field_tag 'success[item]', args[:item] }
-    }
+    %(
+      #{hidden_field_tag 'success[id]', args[:id] || args[:card].name}
+      #{hidden_field_tag 'success[view]', args[:view]}
+      #{hidden_field_tag 'success[item]', args[:item]}
+    )
   end
 
   def set_selection args
@@ -299,9 +299,9 @@ format :html do
                   text: "(#{state})"
       end
     label = <<-HTML
-      <label class="set-label #{ 'current-set-label' if state == :current }">
-        #{ card_link set_name, text: label, target: 'wagn_set' }
-        #{"<em> #{info} </em>" if info }
+      <label class="set-label #{'current-set-label' if state == :current}">
+        #{card_link set_name, text: label, target: 'wagn_set'}
+        #{"<em> #{info} </em>" if info}
       </label>
     HTML
     label.html_safe
@@ -319,7 +319,7 @@ format :html do
       wrap_each_with(:li, class: 'radio') do
         yield
       end
-    formgroup title, "<ul>#{ list }</ul>", editor: 'set', class: 'col-xs-6'
+    formgroup title, "<ul>#{list}</ul>", editor: 'set', class: 'col-xs-6'
   end
 
   def edit_buttons  args

data/mod/05_standard/set/self/account_links.rb

@@ -1,40 +1,39 @@
 
 format :html do
-
   def item_links args
     [
-      optional_render( :my_card, args),
-      optional_render( :invite, args),
-      optional_render( :sign_out, args),
-      optional_render( :sign_up, args),
-      optional_render( :sign_in, args)
+      optional_render(:my_card, args),
+      optional_render(:invite, args),
+      optional_render(:sign_out, args),
+      optional_render(:sign_up, args),
+      optional_render(:sign_in, args)
     ]
   end
 
-  #ENGLISH below
-  view :sign_up, perms: lambda { |r| !Auth.signed_in? && Card.new(type_id: Card::SignupID).ok?(:create) },
-                 denial: :blank do |args|
-    link_to( 'Sign up', card_path('account/signup'), id: 'signup-link' )
+  # ENGLISH below
+  view :sign_up, perms: ->(_r) { !Auth.signed_in? && Card.new(type_id: Card::SignupID).ok?(:create) },
+                 denial: :blank do |_args|
+    link_to('Sign up', card_path('account/signup'), id: 'signup-link')
   end
 
-  view :sign_in, perms: lambda { |r| !Auth.signed_in? },
-                 denial: :blank do |args|
-    link_to( 'Sign in', card_path(':signin'), id: 'signin-link' )
+  view :sign_in, perms: ->(_r) { !Auth.signed_in? },
+                 denial: :blank do |_args|
+    link_to('Sign in', card_path(':signin'), id: 'signin-link')
   end
 
-  view :invite, perms: lambda { |r|  Auth.signed_in? && Card.new(type_id: Card.default_accounted_type_id).ok?(:create) },
-                denial: :blank do |args|
-    link_to( 'Invite', card_path('account/signup'), id: 'invite-a-friend-link' )
+  view :invite, perms: ->(_r) {  Auth.signed_in? && Card.new(type_id: Card.default_accounted_type_id).ok?(:create) },
+                denial: :blank do |_args|
+    link_to('Invite', card_path('account/signup'), id: 'invite-a-friend-link')
   end
 
-  view :sign_out, perms: lambda { |r| Auth.signed_in? },
-                  denial: :blank do |args|
-    link_to( 'Sign out', card_path('delete/:signin'), id: 'signout-link' )
+  view :sign_out, perms: ->(_r) { Auth.signed_in? },
+                  denial: :blank do |_args|
+    link_to('Sign out', card_path('delete/:signin'), id: 'signout-link')
   end
 
-  view :my_card, perms: lambda { |r| Auth.signed_in? },
-                 denial: :blank do |args|
-    card_link( Auth.current.cardname, id: 'my-card-link' )
+  view :my_card, perms: ->(_r) { Auth.signed_in? },
+                 denial: :blank do |_args|
+    card_link(Auth.current.cardname, id: 'my-card-link')
   end
 
   view :raw do |args|