card 1.17.4 → 1.18.0

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

@@ -30,19 +30,19 @@ format :html do
   end
 
   def email_warning
-    %{
+    %(
       Email delivery is turned off.
       Change settings in config/application.rb to send sign up notifications.
-    }
+    )
   end
 
   def recaptcha_warning
     warning =
       if Card::Env.localhost?
-        %{Your captcha is currently working with temporary settings. This is fine for a local installation, but you will need new recaptcha keys if you want to make this site public.}
+        %(Your captcha is currently working with temporary settings. This is fine for a local installation, but you will need new recaptcha keys if you want to make this site public.)
       else
-        process_content(%{You are configured to use [[*captcha]], but for that to work you need new recaptcha keys.
-          })
+        process_content(%(You are configured to use [[*captcha]], but for that to work you need new recaptcha keys.
+          ))
       end
     <<-HTML
       <p>

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

@@ -1,5 +1,5 @@
 
-view :raw do |args|
+view :raw do |_args|
   '<!-- *alerts is deprecated. please remove from layout -->'
 end
 view :core, :raw

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

@@ -1,5 +1,5 @@
 
-event :admin_tasks, on: :update, before: :approve do
+event :admin_tasks, :initialize, on: :update do
   if (task = Env.params[:task])
     if Auth.always_ok?
       case task.to_sym

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

@@ -1,6 +1,6 @@
 
 format :html do
-  view :raw do |args|
+  view :raw do |_args|
     '<!-- *foot is deprecated. please remove from layout -->'
   end
 

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

@@ -3,17 +3,17 @@ format :html do
     %(
       <meta charset="UTF-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-      #{ head_title       }
-      #{ head_buttons     }
-      #{ head_stylesheets }
-      #{ head_javascript  }
+      #{head_title}
+      #{head_buttons}
+      #{head_stylesheets}
+      #{head_javascript}
     )
   end
 
   view :core do |args|
     case
     when focal?    then CGI.escapeHTML _render_raw(args)
-    when @mainline then "(*head)"
+    when @mainline then '(*head)'
     else _render_raw(args)
     end
   end
@@ -21,8 +21,8 @@ format :html do
   def head_title
     title = root.card && root.card.name
     title = nil if title.blank?
-    title = params[:action] if title=='*placeholder'
-    %(<title>#{title ? "#{title} - " : ''}#{ Card.global_setting :title }</title>)
+    title = params[:action] if title == '*placeholder'
+    %(<title>#{title ? "#{title} - " : ''}#{Card.global_setting :title}</title>)
   end
 
   def head_buttons
@@ -30,9 +30,7 @@ format :html do
     if root.card
       bits << universal_edit_button
       # RSS # move to mods!
-      if root.card.type_id == SearchTypeID
-        bits << rss_link
-      end
+      bits << rss_link if root.card.type_id == SearchTypeID
     end
     bits.compact.join "\n      "
   end
@@ -41,7 +39,7 @@ format :html do
     [:favicon, :logo].each do |name|
       if (c = Card[name]) && c.type_id == ImageID && !c.db_content.blank?
         href = subformat(c)._render_source size: :small
-        return %{<link rel="shortcut icon" href="#{ href }" />}
+        return %(<link rel="shortcut icon" href="#{href}" />)
       end
     end
   end
@@ -49,14 +47,14 @@ format :html do
   def universal_edit_button
     return if root.card.new_record? || !root.card.ok?(:update)
     href = root.path view: :edit
-    %{<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="#{ href }"/>}
+    %(<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="#{href}"/>)
   end
 
   def rss_link
     opts = { format: :rss }
     root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
     href = page_path root.card.cardname, opts
-    %{<link rel="alternate" type="application/rss+xml" title="RSS" href="#{href}" />}
+    %(<link rel="alternate" type="application/rss+xml" title="RSS" href="#{href}" />)
   end
 
   def head_stylesheets
@@ -65,17 +63,17 @@ format :html do
     style_card ||= root.card.rule_card :style
     @css_path =
       if params[:debug] == 'style'
-      page_path(style_card.cardname, item: :import, format: :css)
+        page_path(style_card.cardname, item: :import, format: :css)
       elsif style_card
         card_path style_card.machine_output_url
       end
     return unless @css_path
-    %{<link href="#{@css_path}" media="all" rel="stylesheet" type="text/css" />}
+    %(<link href="#{@css_path}" media="all" rel="stylesheet" type="text/css" />)
   end
 
   def head_javascript
     varvals = [
-      "window.wagn={rootPath:'#{ Card.config.relative_url_root }'}",
+      "window.wagn={rootPath:'#{Card.config.relative_url_root}'}",
       # tinyMCE doesn't load on non-root wagns w/o preinit line
       "window.tinyMCEPreInit={base:\"#{card_path 'assets/tinymce'}\",query:'3.5.9',suffix:''}"
     ]
@@ -98,11 +96,11 @@ format :html do
       end
     ie9_card = Card[:script_html5shiv_printshiv]
     <<-HTML
-      #{ javascript_tag do varvals * ';' end  }
-      #{ @js_tag if @js_tag }
-      <!--[if lt IE 9]>#{ javascript_include_tag ie9_card.machine_output_url if ie9_card }<![endif]-->
-      #{ javascript_tag { "wagn.setTinyMCEConfig('#{ escape_javascript Card.global_setting(:tiny_mce).to_s }')" } }
-      #{ google_analytics_head_javascript }
+      #{javascript_tag { varvals * ';' }}
+      #{@js_tag if @js_tag}
+      <!--[if lt IE 9]>#{javascript_include_tag ie9_card.machine_output_url if ie9_card}<![endif]-->
+      #{javascript_tag { "wagn.setTinyMCEConfig('#{escape_javascript Card.global_setting(:tiny_mce).to_s}')" }}
+      #{google_analytics_head_javascript}
       <script type="text/javascript">
         $('document').ready(function() {
           $('.card-slot').trigger('slotReady');
@@ -111,7 +109,6 @@ format :html do
     HTML
   end
 
-
   def google_analytics_head_javascript
     return unless (ga_key = Card.global_setting(:google_analytics_key))
     <<-JAVASCRIPT

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

@@ -1,10 +1,9 @@
 
 format :html do
-
-  view :raw do |args|
+  view :raw do |_args|
     input_args = { class: 'navbox form-control' }
     @@placeholder ||= begin
-      p = Card["#{Card[:navbox].name}+*placeholder"] and p.raw_content
+      (p = Card["#{Card[:navbox].name}+*placeholder"]) && p.raw_content
     end
     input_args[:placeholder] = @@placeholder if @@placeholder
 
@@ -22,12 +21,9 @@ format :html do
   end
 
   view :core do |args|
-    tag_args = { method: 'get', role: 'search', class: "nodblclick navbox-form #{args[:navbar_class]}"}
+    tag_args = { method: 'get', role: 'search', class: "nodblclick navbox-form #{args[:navbar_class]}" }
     form_tag Card.path_setting('/:search'), tag_args do
       _render_raw args
     end
-
   end
-
 end
-

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

@@ -1,5 +1,5 @@
 
-view :raw do |args|
+view :raw do |_args|
   Time.now.strftime '%A, %B %d, %Y %I:%M %p %Z'
 end
 

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

@@ -1,10 +1,9 @@
 
 view :title do |args|
-   super args.merge( title: 'Recent Changes' )
+  super args.merge(title: 'Recent Changes')
 end
 
 format :html do
-
   view :card_list do |args|
     search_vars[:item] ||= :change
 
@@ -13,36 +12,31 @@ format :html do
       begin
         stamp = card.updated_at
         day = Date.new(stamp.year, stamp.month, stamp.day)
-      rescue =>e
+      rescue => e
         day = Date.today
-        card.content = "(error getting date)"
+        card.content = '(error getting date)'
       end
       cards_by_day[day] << card if card.followable?
     end
 
     paging = _optional_render :paging, args
-    %{
-      #{ paging }
-      #{
-        cards_by_day.keys.sort.reverse.map do |day|
-          %{
-            <h2>#{format_date(day, include_time = false) }</h2>
+    %(
+      #{paging}
+      #{cards_by_day.keys.sort.reverse.map do |day|
+          %(
+            <h2>#{format_date(day, include_time = false)}</h2>
             <div class="search-result-list">
-              #{
-                 cards_by_day[day].map do |card|
-                   %{
-                     <div class="search-result-item item-#{ search_vars[:item] }">
-                      #{ nest(card, view: search_vars[:item]) }
-                    </div>
-                   }
-                 end * ' '
-              }
+              #{cards_by_day[day].map do |card|
+                  %(
+                    <div class="search-result-item item-#{search_vars[:item]}">
+                     #{nest(card, view: search_vars[:item])}
+                   </div>
+                  )
+                end * ' '}
             </div>
-          }
-        end * "\n"
-      }
-      #{ paging }
-    }
+          )
+        end * "\n"}
+      #{paging}
+    )
   end
-
 end

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

@@ -3,7 +3,7 @@ format :html do
   view :title do |args|
     vars = root.search_params[:vars]
     if vars && vars[:keyword]
-      args.merge! title: %{Search results for: <span class="search-keyword">}\
+      args[:title] = %(Search results for: <span class="search-keyword">)\
                          "#{vars[:keyword]}</span>"
     end
     super args
@@ -39,9 +39,7 @@ format :json do
 
   def goto_items term, exact
     goto_names = Card.search goto_wql(term), "goto items for term: #{term}"
-    if add_exact_to_goto_names? exact, goto_names
-      goto_names.unshift exact.name
-    end
+    goto_names.unshift exact.name if add_exact_to_goto_names? exact, goto_names
     goto_names.map do |name|
       [name, highlight(name, term), name.to_name.url_key]
     end

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

@@ -1,7 +1,7 @@
 
 format :html do
   view :open do |args|
-    args.merge! optional_help: :show
+    args[:optional_help] = :show
     super args
   end
 
@@ -25,8 +25,8 @@ format :html do
     end
     args[:buttons] += raw(
       "<div style='float:right'>" \
-      "#{ view_link 'RESET PASSWORD', :edit,
-                    path_opts: { slot: { hide: :toolbar } } }" \
+      "#{view_link 'RESET PASSWORD', :edit,
+                   path_opts: { slot: { hide: :toolbar } }}" \
       '</div>') # FIXME: hardcoded styling
     args
   end
@@ -36,7 +36,7 @@ format :html do
       hidden: { success: "REDIRECT: #{Env.interrupted_action || '*previous'}" },
       recaptcha: :off
     }
-    with_inclusion_mode :edit do
+    with_nest_mode :edit do
       card_form :update, form_args do
         [
           _optional_render(:content_formgroup, args.merge(structure: true)),
@@ -79,7 +79,7 @@ format :html do
   end
 end
 
-event :signin, before: :approve, on: :update do
+event :signin, :validate, on: :update do
   email = subfield :email
   email &&= email.content
   pword = subfield :password
@@ -127,7 +127,7 @@ event :send_reset_password_token,
   end
 end
 
-event :signout, before: :approve, on: :delete do
+event :signout, :validate, on: :delete do
   Auth.signin nil
   abort :success
 end

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

@@ -1,9 +1,9 @@
 
 format :html do
-  view :core do |args|
+  view :core do |_args|
     oldmem = session[:memory]
     session[:memory] = newmem = card.profile_memory
-    stats = %{
+    stats = %(
       <table>
         <tr>
           <th>Stat</th>
@@ -12,87 +12,80 @@ format :html do
         </tr>
         <tr>
           <td>cards</td>
-          <td>#{ Card.where(trash: false).count }</td>
+          <td>#{Card.where(trash: false).count}</td>
           <td></td>
         </tr>
         <tr>
           <td>trashed cards</td>
-          <td>#{ Card.where(trash: true).count  }</td>
-          <td>#{link_to 'delete all', card_path( 'update/:all?task=empty_trash' )}</td>
+          <td>#{Card.where(trash: true).count}</td>
+          <td>#{link_to 'delete all', card_path('update/:all?task=empty_trash')}</td>
         </tr>
         <tr>
           <td>actions</td>
-          <td>#{ Card::Action.count }</td>
-          <td>#{link_to 'delete old', card_path( 'update/:all?task=delete_old_revisions' ) }</td>
+          <td>#{Card::Action.count}</td>
+          <td>#{link_to 'delete old', card_path('update/:all?task=delete_old_revisions')}</td>
         </tr>
           <tr><td>references</td>
-          <td>#{ Card::Reference.count }</td>
-          <td>#{link_to 'repair all', card_path( 'update/:all?task=repair_references' ) }</td>
+          <td>#{Card::Reference.count}</td>
+          <td>#{link_to 'repair all', card_path('update/:all?task=repair_references')}</td>
         </tr>
         <tr>
           <td>sessions</td>
-          <td>#{ ActiveRecord::SessionStore::Session.count }</td>
+          <td>#{ActiveRecord::SessionStore::Session.count}</td>
           <td>
             delete older than
-            #{ delete_sessions_link 1 }
-            #{ delete_sessions_link 2 }
-            #{ delete_sessions_link 3 }
+            #{delete_sessions_link 1}
+            #{delete_sessions_link 2}
+            #{delete_sessions_link 3}
             months
           </td>
         </tr>
-        #{
-          if Card.config.view_cache
-            %{
+        #{if Card.config.view_cache
+            %(
               <tr>
                 <td>view cache</td>
-                <td>#{ Card::ViewCache.count }</td>
-                <td>#{link_to 'clear view cache',  card_path( 'update/:all?task=clear_view_cache' ) }</td>
+                <td>#{Card::ViewCache.count}</td>
+                <td>#{link_to 'clear view cache',  card_path('update/:all?task=clear_view_cache')}</td>
               </tr>
-            }
-          end
-        }
+            )
+          end}
 
         <tr>
           <td>memory now</td>
-          <td>#{ newmem }M</td>
-          <td>#{link_to 'clear cache',  card_path( 'update/:all?task=clear_cache' ) }</td>
+          <td>#{newmem}M</td>
+          <td>#{link_to 'clear cache',  card_path('update/:all?task=clear_cache')}</td>
         </tr>
-        #{
-          if oldmem
-            %{
+        #{if oldmem
+            %(
               <tr>
                 <td>memory prev</td>
-                <td>#{ oldmem }M</td>
+                <td>#{oldmem}M</td>
                 <td></td>
               </tr>
               <tr>
                 <td>memory diff</td>
-                <td>#{ newmem - oldmem }M</td>
+                <td>#{newmem - oldmem}M</td>
                 <td></td>
               </tr>
 
-            }
-          end
-        }
+            )
+          end}
       </table>
-    }
+    )
   end
 
   def delete_sessions_link months
-    link_to months, card_path( "update/:all?task=delete_old_sessions&months=#{months}")
+    link_to months, card_path("update/:all?task=delete_old_sessions&months=#{months}")
   end
 end
 
-
-
-
 def get_current_memory_usage
   `ps -o rss= -p #{Process.pid}`.to_i
 end
 
-def profile_memory(&block)
+def profile_memory &block
   before = get_current_memory_usage
-  file, line, _ = caller[0].split(':')
+  file, line, = caller[0].split(':')
   if block_given?
     instance_eval(&block)
     (get_current_memory_usage - before) / 1024