card 1.16.15 → 1.17.0

data/tmpsets/set/mod007-05_standard/all/account.rb

@@ -12,11 +12,11 @@ def account
 end
 
 def accountable?
-  Card.toggle( rule :accountable )
+  Card.toggle(rule :accountable)
 end
 
 def parties
-  @parties ||= (all_roles << self.id).flatten.reject(&:blank?)
+  @parties ||= (all_roles << id).flatten.reject(&:blank?)
 end
 
 def among? ok_ids
@@ -26,18 +26,18 @@ def among? ok_ids
   ok_ids.member? Card::AnyoneID
 end
 
-def is_own_account?
+def own_account?
   # card is +*account card of signed_in user.
-  cardname.part_names[0].key == Auth.as_card.key and
-  cardname.part_names[1].key == Card[:account].key
+  cardname.part_names[0].key == Auth.as_card.key &&
+    cardname.part_names[1].key == Card[:account].key
 end
 
 def read_rules
   @read_rules ||= begin
     rule_ids = []
-    unless id==Card::WagnBotID # always_ok, so not needed
-      ( [ Card::AnyoneID ] + parties ).each do |party_id|
-        if rule_ids_for_party = self.class.read_rule_cache[ party_id ]
+    unless id == Card::WagnBotID # always_ok, so not needed
+      ([Card::AnyoneID] + parties).each do |party_id|
+        if rule_ids_for_party = self.class.read_rule_cache[party_id]
           rule_ids += rule_ids_for_party
         end
       end
@@ -47,28 +47,26 @@ def read_rules
 end
 
 def all_roles
-  @all_roles ||=
-    if id == Card::AnonymousID
-      []
-    else
-      Auth.as_bot do
-        role_trait = fetch trait: :roles
-        [ Card::AnyoneSignedInID ] + ( role_trait ? role_trait.item_ids : [] )
-      end
-    end
+  @all_roles ||= (id == Card::AnonymousID ? [] : fetch_roles)
 end
 
+def fetch_roles
+  Auth.as_bot do
+    role_trait = fetch trait: :roles
+    next [Card::AnyoneSignedInID] unless role_trait
+    [Card::AnyoneSignedInID] + (role_trait.item_ids)
+  end
+end
 
 event :generate_token do
-  Digest::SHA1.hexdigest "--#{Time.now.to_f}--#{rand 10}--"
+  Digest::SHA1.hexdigest "--#{Time.zone.now.to_f}--#{rand 10}--"
 end
 
 event :set_stamper, before: :approve do
   self.updater_id = Auth.current_id
-  self.creator_id = self.updater_id if new_card?
+  self.creator_id = updater_id if new_card?
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/account.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod007-05_standard/all/comment.rb

@@ -1,44 +1,66 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module Comment; extend Card::Set
 # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/comment.rb ~~~~~~~~~~~
-event :add_comment, after: :approve, on: :save, when: proc {|c| c.comment } do
+event :add_comment, after: :approve, on: :save, when: proc { |c| c.comment } do
+  cleaned_comment =
+    comment.split(/\n/).map do |line|
+      "<p>#{line.strip.empty? ? '&nbsp;' : line}</p>"
+    end * "\n"
+
+  signature =
+    if Auth.signed_in?
+      "[[#{Auth.current.name}]]"
+    else
+      Env.session[:comment_author] = comment_author if Env.session
+      "#{comment_author} (Not signed in)"
+    end
+
   self.content = %{
-    #{ content }
-    #{ '<hr>' unless content.blank? }
-    #{ comment.split(/\n/).map {|line| "<p>#{line.strip.empty? ? '&nbsp;' : line}</p>"} * "\n" }
-    <div class="w-comment-author">--#{
-      if Auth.signed_in?
-        "[[#{Auth.current.name}]]"
-      else
-        Env.session[:comment_author] = comment_author if Env.session
-        "#{ comment_author } (Not signed in)"
-      end
-    }.....#{Time.now}</div>
+    #{content}
+    #{'<hr>' unless content.blank?}
+    #{cleaned_comment}
+    <div class="w-comment-author">--#{signature}.....#{Time.zone.now}</div>
   }
 end
 
-view( :comment_box, denial: :blank, tags: :unknown_ok, perms: lambda { |r| r.card.ok? :comment } ) do |args|
-
+format do
+  view :comment_box,
+       denial: :blank, tags: :unknown_ok,
+       perms: lambda { |r| r.card.ok? :comment } do |_args|
+    <<-HTML
+      <div class="comment-box nodblclick">#{comment_form}</div>
+    HTML
+  end
 
-  %{<div class="comment-box nodblclick"> #{
+  def comment_form
     card_form :update do
       %{
-        #{ hidden_field_tag( 'card[name]', card.name ) if card.new_card?
-        # FIXME wish we had more generalized solution for names.  without this, nonexistent cards will often take left's linkname.  (needs test)
+        #{hidden_field_tag('card[name]', card.name) if card.new_card?
+          # FIXME: wish we had more generalized solution for names.
+          # without this, nonexistent cards will often take left's linkname.
+          # (needs test)
         }
-        #{ text_area :comment, rows: 3 }
-        <div class="comment-buttons">
-          #{
-            unless Auth.signed_in?
-              card.comment_author= (session[:comment_author] || params[:comment_author] || "Anonymous") #ENGLISH
-              %{<label>My Name is:</label> #{ text_field :comment_author }}
-            end
-          }
-          #{ button_tag 'Comment', type: :submit, disable_with: "Commenting" }
-        </div>
+        #{text_area :comment, rows: 3}
+        #{comment_buttons}
       }
-    end}
-  </div>}
+    end
+  end
+
+  def comment_buttons
+    <<-HTML
+      <div class="comment-buttons">
+        #{
+          unless Auth.signed_in?
+            card.comment_author = session[:comment_author] ||
+                                  params[:comment_author] || 'Anonymous' # ENGLISH
+            %{<label>My Name is:</label> #{text_field :comment_author}}
+          end
+        }
+        #{submit_button text: 'Comment', type: :submit,
+                        disable_with: 'Commenting'}
+      </div>
+    HTML
+  end
 end
 
 

data/tmpsets/set/mod007-05_standard/all/error.rb

@@ -1,84 +1,100 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module Error; extend Card::Set
 # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/error.rb ~~~~~~~~~~~
-
+def copy_errors card
+  card.errors.each do |att, msg|
+    errors.add att, msg
+  end
+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 unsupported_view view
-    "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
+  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
+
+  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|
@@ -87,46 +103,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
@@ -135,63 +158,70 @@ 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