card 1.16.14 → 1.16.15

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

@@ -5,81 +5,93 @@ def copy_errors card
 end
 
 format do
-  view :closed_missing, perms: :none, closed: true do |args|
+  view :closed_missing, perms: :none, closed: true do
     ''
   end
 
-  view :missing, perms: :none do |args|
+  view :unsupported_view, perms: :none, tags: :unknown_ok do |args|
+    "view (#{args[:unsupported_view]}) not supported for #{error_cardname}"
+  end
+
+  view :missing, perms: :none do
     ''
   end
 
-  view :not_found, perms: :none, error_code: 404 do |args|
-    %{ Could not find #{card.name.present? ? %{"#{card.name}"} : 'the card requested'}. }
+  view :not_found, perms: :none, error_code: 404 do |_args|
+    error_name = card.name.present? ? card.name : 'the card requested'
+    %{ Could not find #{error_name}. }
   end
 
-  view :server_error, perms: :none, error_code: 500 do |args|
-    %{ Wagn Hitch!  Server Error. Yuck, sorry about that.\n}+
-    %{ To tell us more and follow the fix, add a support ticket at http://wagn.org/new/Support_Ticket }
+  view :server_error, perms: :none, error_code: 500 do
+    %{
+      Wagn Hitch!  Server Error. Yuck, sorry about that.
+      To tell us more and follow the fix,
+      add a support ticket at http://wagn.org/new/Support_Ticket
+    }
   end
 
-  view :denial, perms: :none, error_code: 403 do |args|
+  view :denial, perms: :none, error_code: 403 do
     focal? ? 'Permission Denied' : ''
   end
 
-  view :bad_address, perms: :none, error_code: 404 do |args|
+  view :bad_address, perms: :none, error_code: 404 do
     %{ 404: Bad Address }
   end
 
-  view :too_deep, perms: :none, closed: true do |args|
+  view :too_deep, perms: :none, closed: true do
     %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
   end
 
-  view :too_slow, perms: :none, closed: true do |args|
-    %{ Timed out! #{ showname } took too long to load. }
+  view :too_slow, perms: :none, closed: true do
+    %{ Timed out! #{showname} took too long to load. }
   end
 end
 
-
 format :html do
   def view_for_unknown view, args
     case
-    when focal? && ok?( :create )   ;  :new
-    when commentable?( view, args ) ;  view
-    else                               super
+    when focal? && ok?(:create)   then :new
+    when commentable?(view, args) then view
+    else super
     end
   end
 
   def commentable? view, args
-    self.class.tagged view, :comment                                   and
-    show_view? :comment_box, args.merge( default_visibility: :hide )  and #developer or wagneer has overridden default
+    return false unless self.class.tagged view, :comment
+    visibility_args = args.merge default_visibility: :hide
+    return false unless show_view? :comment_box, visibility_args
     ok? :comment
   end
 
   def rendering_error exception, view
-    details = if Auth.always_ok?
-                card_link(error_cardname, class: 'render-error-link') +
-                    alert('warning', dismissible: true, alert_class: "render-error-message errors-view admin-error-message") do
-                      %{
-                        <h3>Error message (visible to admin only)</h3>
-                        <p><strong>#{ exception.message }</strong></p>
-                        <div>#{exception.backtrace * "<br>\n"}</div>
-                      }
-                  end
-              else
-                error_cardname
-              end
-
+    details = Auth.always_ok? ? backtrace_link(exception) : error_cardname
     content_tag :span, class: 'render-error alert alert-danger' do
-      [
-        'error rendering',
-        details,
-        "(#{view} view)"
-      ].join "\n"
+      ['error rendering', details, "(#{view} view)"].join "\n"
+    end
+  end
+
+  def backtrace_link exception
+    warning_options = {
+      dismissible: true,
+      alert_class: 'render-error-message errors-view admin-error-message'
+    }
+    warning = alert('warning', warning_options) do
+      %{
+        <h3>Error message (visible to admin only)</h3>
+        <p><strong>#{exception.message}</strong></p>
+        <div>#{exception.backtrace * "<br>\n"}</div>
+      }
     end
+    card_link(error_cardname, class: 'render-error-link') + warning
   end
 
-  def unsupported_view view
-    "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
+  view :unsupported_view, perms: :none, tags: :unknown_ok do |args|
+    %{
+      <strong>
+        view <em>#{args[:unsupported_view]}</em>
+        not supported for <em>#{error_cardname}</em>
+      </strong>
+    }
   end
 
   view :message, perms: :none, tags: :unknown_ok do |args|
@@ -88,46 +100,53 @@ format :html do
     end
   end
 
-
   view :missing do |args|
     return '' unless card.ok? :create  # should this be moved into ok_view?
 
-    opts = { remote: true, class: "slotter missing-#{ args[:denied_view] || args[:home_view]}" }
-    opts[:path_opts] = { type: args[:type] } if args[:type]
+    link_opts = {
+      remote: true,
+      class: "slotter missing-#{args[:denied_view] || args[:home_view]}"
+    }
+    link_opts[:path_opts] = { type: args[:type] } if args[:type]
 
     wrap args do
-      view_link "Add #{ fancy_title args[:title] }", :new, opts
+      view_link "Add #{fancy_title args[:title]}", :new, link_opts
     end
   end
 
-  view :closed_missing, perms: :none do |args|
-    %{<span class="faint"> #{ showname } </span>}
+  view :closed_missing, perms: :none do
+    %{<span class="faint"> #{showname} </span>}
   end
 
-
-
   view :conflict, error_code: 409 do |args|
-    wrap args.merge( slot_class: 'error-view' ) do  #ENGLISH below
+    actor_link = card_link card.last_action.act.actor.cardname
+    expanded_act = wrap(args) do
+      _render_act_expanded act: card.last_action.act, current_rev_nr: 0
+    end
+    wrap args.merge(slot_class: 'error-view') do # ENGLISH below
       alert 'warning' do
-        %{<strong>Conflict!</strong><span class="new-current-revision-id">#{card.last_action_id}</span>
-          <div>#{ card_link card.last_action.act.actor.cardname } has also been making changes.</div>
+        %{
+          <strong>Conflict!</strong>
+          <span class="new-current-revision-id">#{card.last_action_id}</span>
+          <div>#{actor_link} has also been making changes.</div>
           <div>Please examine below, resolve above, and re-submit.</div>
-          #{ wrap do |args|
-              _render_act_expanded act: card.last_action.act, current_rev_nr: 0
-            end
-           }
+          #{expanded_act}
         }
       end
     end
   end
 
   view :errors, perms: :none do |args|
-
     if card.errors.any?
-      title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
-      frame args.merge(panel_class: "panel panel-warning", title: title, hide: 'menu' ) do
+      title = 'Problems'
+      title += " with #{card.name}" unless card.name.blank?
+      frame_opts = { panel_class: 'panel panel-warning',
+                     title: title, hide: 'menu' }
+      frame args.merge(frame_opts) do
         card.errors.map do |attrib, msg|
-          msg = "<strong>#{attrib.to_s.upcase}:</strong> #{msg}" unless attrib == :abort
+          unless attrib == :abort
+            msg = "<strong>#{attrib.to_s.upcase}:</strong> #{msg}"
+          end
           alert 'warning', dismissible: true, alert_class: 'card-error-msg' do
             msg
           end
@@ -136,61 +155,68 @@ format :html do
     end
   end
 
-  view :not_found do |args| #ug.  bad name.
-    sign_in_or_up_links = if !Auth.signed_in?
-      %{<div>
-        #{ card_link :signin, text: 'Sign in' } or
-        #{ link_to 'Sign up', card_path('new/:signup') } to create it.
-       </div>}
-    end
+  view :not_found do |args| # ug.  bad name.
+    sign_in_or_up_links =
+      if !Auth.signed_in?
+        signin_link = card_link :signin, text: 'Sign in'
+        signup_link = link_to 'Sign up', card_path('new/:signup')
+        %{<div>#{signin_link} or #{signup_link} to create it.</div>}
+      end
     frame args.merge(title: 'Not Found', optional_menu: :never) do
-      %{
-        <h2>Could not find #{card.name.present? ? "<em>#{card.name}</em>" : 'that'}.</h2>
-        #{sign_in_or_up_links}
-      }
+      card_label = card.name.present? ? "<em>#{card.name}</em>" : 'that'
+      %{<h2>Could not find #{card_label}.</h2> #{sign_in_or_up_links}}
     end
   end
 
   view :denial do |args|
-    to_task = if task = args[:denied_task]
-      %{to #{task} this.}
-    else
-      'to do that.'
-    end
+    task = args[:denied_task]
+    to_task = task ? "to #{task} this." : 'to do that.'
     if !focal?
-      %{<span class="denied"><!-- Sorry, you don't have permission #{to_task} --></span>}
+      %{
+        <span class="denied">
+          <!-- Sorry, you don't have permission #{to_task} -->
+        </span>
+      }
     else
-      frame args do #ENGLISH below
-        message = case
-        when task != :read && Card.config.read_only
-          "We are currently in read-only mode.  Please try again later."
-        when Auth.signed_in?
-          "You need permission #{to_task}"
-        else
-          or_signup = if Card.new(type_id: Card::SignupID).ok? :create
-            "or #{ link_to 'sign up', card_url('new/:signup') }"
+      frame args do # ENGLISH below
+        message =
+          case
+          when task != :read && Card.config.read_only
+            'We are currently in read-only mode.  Please try again later.'
+          when Auth.signed_in?
+            "You need permission #{to_task}"
+          else
+            signin_link = link_to 'sign in', card_url(':signin')
+            or_signup_link =
+              if Card.new(type_id: Card::SignupID).ok? :create
+                'or ' + link_to('sign up', card_url('new/:signup'))
+              end
+            Env.save_interrupted_action(request.env['REQUEST_URI'])
+            "Please #{signin_link} #{or_signup_link} #{to_task}"
           end
-          Env.save_interrupted_action(request.env['REQUEST_URI'])
-          "Please #{ link_to 'sign in', card_url(':signin') } #{or_signup} #{to_task}"
-        end
 
-        %{<h1>Sorry!</h1>\n<div>#{ message }</div>}
+        %{
+          <h1>Sorry!</h1>
+          <div>#{message}</div>
+        }
       end
     end
   end
 
-
-  view :server_error do |args|
+  view :server_error do
     %{
-    <body>
-      <div class="dialog">
-        <h1>Wagn Hitch :(</h1>
-        <p>Server Error. Yuck, sorry about that.</p>
-        <p><a href="http://www.wagn.org/new/Support_Ticket">Add a support ticket</a>
-            to tell us more and follow the fix.</p>
-      </div>
-    </body>
+      <body>
+        <div class="dialog">
+          <h1>Wagn Hitch :(</h1>
+          <p>Server Error. Yuck, sorry about that.</p>
+          <p>
+            <a href="http://www.wagn.org/new/Support_Ticket">
+              Add a support ticket
+            </a>
+            to tell us more and follow the fix.
+          </p>
+        </div>
+      </body>
     }
   end
-
 end

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

@@ -1,43 +1,48 @@
 # -*- encoding : utf-8 -*-
 
+
+def list_fields
+  Card.search({ left: name, type_id: Card::ListID }, 'list fields')
+end
+
+def listed_by_fields
+  Card.search({ left: name, type_id: Card::ListedByID }, 'listed by fields')
+end
+
+def linker_lists
+  Card.search({ type_id: Card::ListID, link_to: name },
+              "lists that link to #{name}")
+end
+
 event :trunk_cardtype_of_a_list_relation_changed,
       changed: :type, after: :store, on: :update,
       when: proc { Codename[:list] } do
-  type_key_was = (tk = Card.fetch(type_id_was)) && tk.key
-  if (list_cards = Card.search(left: name, type_id: Card::ListID))
-    list_cards.each do |card|
-      card.update_listed_by_cache_for card.item_keys, type_key: type_key_was
-      card.update_listed_by_cache_for card.item_keys
-    end
-  end
-  if (listed_by_cards = Card.search(left: name, type_id: Card::ListedByID))
-    listed_by_cards.each(&:update_cached_list)
+  type_key_was = (tk = Card.quick_fetch(type_id_was)) && tk.key
+
+  list_fields.each do |card|
+    card.update_listed_by_cache_for card.item_keys, type_key: type_key_was
+    card.update_listed_by_cache_for card.item_keys
   end
+  listed_by_fields.each &:update_cached_list
 end
 
 event :trunk_name_of_a_list_relation_changed,
       changed: :name, after: :store, on: :update,
       when: proc { Codename[:list] } do
-  if (list_cards = Card.search(left: name, type_id: Card::ListID))
-    list_cards.each do |card|
-      card.update_listed_by_cache_for card.item_keys
-    end
-  end
-  if (listed_by_cards = Card.search(left: name, type_id: Card::ListedByID))
-    listed_by_cards.each(&:update_cached_list)
+  list_fields.each do |card|
+    card.update_listed_by_cache_for card.item_keys
   end
+  listed_by_fields.each &:update_cached_list
 end
 
 event :cardtype_of_list_item_changed,
       changed: :type, before: :approve, on: :save,
       when: proc { Codename[:list] } do
-  Card.search(type_id: Card::ListID, link_to: name).each do |card|
+  linker_lists.each do |card|
     if card.item_type_id != type_id
-      errors.add(
-        :type,
-        "can't be changed because #{name} " \
-        "is referenced by list card #{card.name}"
-      )
+      errors.add(:type,
+                 "can't be changed because #{name} " \
+                 "is referenced by list card #{card.name}")
     end
   end
 end

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

@@ -19,7 +19,13 @@ format :html do
 
     args[:optional_help] ||= :show
 
-    # name field / title
+    default_new_args_for_name_field_or_title args
+    default_new_args_for_type_field args
+    default_new_args_buttons args
+  end
+
+  def default_new_args_for_name_field_or_title args
+    hidden = args[:hidden]
     if !params[:name_prompt] && !card.cardname.blank?
       # name is ready and will show up in title
       hidden[:card][:name] ||= card.name
@@ -38,36 +44,29 @@ format :html do
       end
     end
     args[:optional_name_formgroup] ||= :hide
+  end
 
-    # type field
-    if !params[:type] &&
-       !args[:type] &&
-       (main? || card.simple? || card.is_template?) &&
-       Card.new(type_id: card.type_id).ok?(:create)
-      # otherwise current type won't be on menu
-
+  def default_new_args_for_type_field args
+    if show_type_formgroup?(args)
       args[:optional_type_formgroup] = :show
     else
-      hidden[:card][:type_id] ||= card.type_id
+      args[:hidden][:card][:type_id] ||= card.type_id
       args[:optional_type_formgroup] = :hide
     end
+  end
 
-    cancel =
-      if main?
-        { class: 'redirecter', href: Card.path_setting('/*previous') }
-      else
-        { class: 'slotter', href: path(view: :missing) }
-      end
+  def show_type_formgroup? args
+    !params[:type] && !args[:type] &&
+      (main? || card.simple? || card.is_template?) &&
+      Card.new(type_id: card.type_id).ok?(:create)
+  end
 
+  def default_new_args_buttons args
+    cancel_path = !main? && path(view: :missing)
     args[:buttons] ||= %{
-      #{button_tag 'Submit',
-                   class: 'create-submit-button',
-                   disable_with: 'Submitting',
-                   situation: 'primary'}
-      #{button_tag 'Cancel',
-                   type: 'button',
-                   class: "create-cancel-button #{cancel[:class]}",
-                   href: cancel[:href]}
+      #{submit_button class: 'create-submit-button'}
+      #{cancel_button class: 'create-cancel-button',
+                      href: cancel_path}
     }
   end
 
@@ -80,46 +79,60 @@ format :html do
     end
   end
 
-
   def default_edit_args args
     args[:optional_help] ||= :show
     args[:optional_toolbar] ||= :show
 
     args[:buttons] ||= %{
-      #{ button_tag 'Submit', class: 'submit-button', disable_with: 'Submitting', situation: 'primary' }
-      #{ button_tag 'Cancel', class: 'cancel-button slotter', 'data-slot-selector'=>args[:cancel_slot_selector],
-       href: (args[:cancel_path] || path), type: 'button' }
+      #{submit_button class: 'submit-button'}
+      #{cancel_button href: (args[:cancel_path] || path),
+                      class: 'cancel-button',
+                      'data-slot-selector' => args[:cancel_slot_selector]}
     }
   end
 
-
   view :edit_name, perms: :update do |args|
-    frame_and_form( { action: :update, id: card.id }, args, 'main-success'=>'REDIRECT' ) do
+    frame_and_form(
+      { action: :update, id: card.id }, args, 'main-success' => 'REDIRECT'
+    ) do
       [
-        _render_name_formgroup( args ),
-        _optional_render( :confirm_rename, args ),
-        _optional_render( :button_formgroup, args )
+        _render_name_formgroup(args),
+        _optional_render(:confirm_rename, args),
+        _optional_render(:button_formgroup, args)
       ]
     end
   end
 
-
   view :confirm_rename do |args|
     referers = args[:referers]
     descendants = card.descendants
+    msg = "<h5>Are you sure you want to rename <em>#{card.name}</em>?</h5>"
+    if referers.any? || descendants.any?
+      msg << rename_info(referers, descendants)
+    end
     alert 'warning' do
-      %{
-        <h5>Are you sure you want to rename <em>#{card.name}</em>?</h5>
-        #{ %{ <h6>This change will...</h6> } if referers.any? || descendants.any? }
-        <ul>
-          #{ %{<li>automatically alter #{ descendants.size } related name(s). </li>} if descendants.any? }
-          #{ %{<li>affect at least #{referers.size} reference(s) to "#{card.name}".</li>} if referers.any? }
-        </ul>
-        #{ %{<p>You may choose to <em>update or ignore</em> the references.</p>} if referers.any? }
-      }
+      msg
     end
   end
 
+  def rename_info referers, descendants
+    msg = '<h6>This change will...</h6>'
+    msg << '<ul>'
+    if descendants.any?
+      msg << "<li>automatically alter #{descendants.size} related name(s)." \
+             '</li>'
+    end
+    if referers.any?
+      msg << "<li>affect at least #{referers.size} reference(s) to " \
+             "\"#{card.name}\".</li>"
+    end
+    msg << '</ul>'
+    if referers.any?
+      msg << '<p>You may choose to <em>update or ignore</em> the references.' \
+             '</p>'
+    end
+    msg
+  end
 
   def default_edit_name_args args
     referers = args[:referers] = card.extended_referencers
@@ -131,57 +144,70 @@ format :html do
       card:     { update_referencers: false }
     )
     args[:optional_toolbar] ||= :show
-    args[:buttons] = %{
-      #{ button_tag 'Rename and Update', disable_with: 'Renaming', class: 'renamer-updater', situation: 'primary' }
-      #{ button_tag 'Rename',            disable_with: 'Renaming', class: 'renamer'         }
-      #{ button_tag 'Cancel', class: 'slotter',  type: 'button', href: path }
-    }
-
+    args[:buttons] =
+      %{
+        #{submit_button text: 'Rename and Update', disable_with: 'Renaming',
+                        class: 'renamer-updater'}
+        #{button_tag 'Rename',
+                     data: { disable_with: 'Renaming' },
+                     class: 'renamer'}
+        #{cancel_button href: path}
+      }
   end
 
-
   view :edit_type, perms: :update do |args|
     frame_and_form :update, args do
-    #'main-success'=>'REDIRECT: _self', # adding this back in would make main cards redirect on cardtype changes
+      # 'main-success'=>'REDIRECT: _self', # adding this back in would make
+      # main cards redirect on cardtype changes
       [
-        _render_type_formgroup( args ),
-        optional_render( :button_formgroup, args )
+        _render_type_formgroup(args),
+        optional_render(:button_formgroup, args)
       ]
     end
   end
 
   def default_edit_type_args args
-    args[:variety] = :edit #YUCK!
+    args[:variety] = :edit # YUCK!
     args[:optional_toolbar] ||= :show
-    args[:hidden] ||= { success: {view: :edit} }
+    args[:hidden] ||= { success: { view: :edit } }
     args[:buttons] = %{
-      #{ button_tag 'Submit', disable_with: 'Submitting', situation: 'primary' }
-      #{ button_tag 'Cancel', href: path(view: :edit), type: 'button', class: 'slotter' }
+      #{submit_button}
+      #{cancel_button href: path(view: :edit)}
     }
   end
 
   view :edit_rules, tags: :unknown_ok do |args|
     view = args[:rule_view] || :common_rules
-    slot_args = {
-        rule_view: view, optional_set_navbar: :show, optional_set_label: :hide, optional_rule_navbar: :hide
+    slot_args =
+      {
+        rule_view: view,
+        optional_set_navbar: :show,
+        optional_set_label: :hide,
+        optional_rule_navbar: :hide
       }
-    _render_related args.merge(related: {card: current_set_card, view: :open, slot: slot_args})
+    _render_related args.merge(
+      related: { card: current_set_card, view: :open, slot: slot_args }
+    )
   end
 
   def default_edit_rules_args args
     args[:optional_toolbar] ||= :show
   end
 
-  view :options, {view: :edit_rules, mod: All::RichHtml::Editing::HtmlFormat} # for backwards compatibility
+  # for backwards compatibility
+  view :options, view: :edit_rules, mod: All::RichHtml::Editing::HtmlFormat
 
   view :edit_structure do |args|
-    slot_args = {
+    slot_args =
+      {
         cancel_slot_selector: '.card-slot.related-view',
         cancel_path: card.format.path(view: :edit),
         optional_edit_toolbar: :hide,
-        hidden: {success: {view: :open, 'slot[subframe]'=>true}}
+        hidden: { success: { view: :open, 'slot[subframe]' => true } }
       }
-    render_related args.merge(related: {card: card.structure, view: :edit, slot: slot_args})
+    render_related args.merge(
+      related: { card: card.structure, view: :edit, slot: slot_args }
+    )
   end
 
   def default_edit_structure_args args
@@ -202,10 +228,13 @@ format :html do
   view :edit_nest_rules do |args|
     view = args[:rule_view] || :field_related_rules
     frame args do
-#      with_inclusion_mode :edit do
-       nested_fields(args).map do |chunk|
-         nest Card.fetch("#{chunk.referee_name}+*self"), view: :titled, rule_view: view, optional_set_label: :hide, optional_rule_navbar: :show
-       end
+      # with_inclusion_mode :edit do
+      nested_fields(args).map do |chunk|
+        nest Card.fetch("#{chunk.referee_name}+*self"),
+             view: :titled, rule_view: view,
+             optional_set_label: :hide,
+             optional_rule_navbar: :show
+      end
     end
   end
 
@@ -213,6 +242,3 @@ format :html do
     args[:optional_toolbar] ||= :show
   end
 end
-
-
-