card 1.17.4 → 1.18.0

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

@@ -1,4 +1,5 @@
-# the events method is a developer's tool for visualizing the event order for a given card.
+# the events method is a developer's tool for visualizing the event order
+# for a given card.
 # For example, from a console you might run
 #
 #   puts mycard.events :update
@@ -7,17 +8,17 @@
 # The indention and arrows (^v) indicate event dependencies.
 #
 # Note: as of yet, the functionality is a bit rough.  It does not display events
-# that are called directly from within other events (like :stored), and certain event
-# requirements (like the presence of a "current_act") may prevent events from showing
-# up in the tree.
+# that are called directly from within other events,
+# and certain event requirements (like the presence of a 'current_act') may
+# prevent events from showing up in the tree.
 def events action
   @action = action
-  events = [ events_tree(:validation), events_tree(:save) ]
+  events = [events_tree(:validation), events_tree(:save)]
   @action = nil
   puts_events events
 end
 
-#private
+# private
 
 def puts_events events, prefix='', depth=0
   r = ''
@@ -25,45 +26,31 @@ def puts_events events, prefix='', depth=0
   events.each do |e|
     space = ' ' * (depth * 2)
 
-    #FIXME - this is not right.  before and around callbacks are processed in declaration order regardless of kind.
-    # not all befores then all arounds
-
-    if e[:before]
-      r += puts_events( e[:before], space+'v  ', depth)
-    end
-    if e[:around]
-      r += puts_events( e[:around], space+'vv ', depth )
-    end
-
-
-    output = "#{prefix}#{e[:name]}"
-    #warn output
-    r+= "#{output}\n"
-
-    if e[:after]
-      r += puts_events( e[:after ].reverse, space+'^  ', depth )
-    end
+    # FIXME: this is not right.  before and around callbacks are processed in
+    # declaration order regardless of kind.  not all befores then all arounds
+    e[:before] && r += puts_events(e[:before], space + 'v  ', depth)
+    e[:around] && r += puts_events(e[:around], space + 'vv ', depth)
+    r += "#{prefix}#{e[:name]}\n"
+    e[:after] && r += puts_events(e[:after].reverse, space + '^  ', depth)
   end
   r
 end
 
 def events_tree filt
-  hash = {name: filt }
+  hash = { name: filt }
   if respond_to? "_#{filt}_callbacks"
-    send( "_#{filt}_callbacks" ).each do |callback|
+    send("_#{filt}_callbacks").each do |callback|
       next unless callback.applies? self
       hash[callback.kind] ||= []
-      hash[callback.kind] << events_tree( callback.filter )
+      hash[callback.kind] << events_tree(callback.filter)
     end
   end
 
   hash
 end
 
-
 class ::ActiveSupport::Callbacks::Callback
   def applies? object
     conditions_lambdas.all? { |c| c.call(object, nil) }
   end
 end
-

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

@@ -1,5 +1,3 @@
-
-
 format do
   # link is called by web_link, card_link, and view_link
   # (and is overridden in other formats)
@@ -35,15 +33,19 @@ format do
     text = opts.delete(:text) || href
     new_class =
       case href
-      when /^https?\:/                     then 'external-link'
-      when /^mailto\:/                     then 'email-link'
-      when /^([a-zA-Z][\-+\.a-zA-Z\d]*):/  then $1 + '-link'
+      when /^https?\:/
+        opts[:target] = '_blank'
+        'external-link'
+      when /^mailto\:/
+        'email-link'
+      when /^([a-zA-Z][\-+\.a-zA-Z\d]*):/
+        Regexp.last_match(1) + '-link'
       when /^\//
-        (href = internal_url href[1..-1]) ;     'internal-link'
+        href = internal_url href[1..-1]
+        'internal-link'
       else
         return card_link href, opts
       end
-    opts[:target] = "_blank" if new_class == 'external-link'
     add_class opts, new_class
     link_to text, href, opts
   end
@@ -69,7 +71,7 @@ format do
   # link to a specific view (defaults to current card)
   # this is generally used for ajax calls
   def view_link text, view, opts={}
-    path_opts = opts.delete( :path_opts ) || {}
+    path_opts = opts.delete(:path_opts) || {}
     path_opts[:view] = view unless view == :home
     opts[:remote] = true
     opts[:rel] = 'nofollow'
@@ -84,41 +86,34 @@ format do
       when Card   then name_or_card.cardname
       else             name_or_card
       end
-   opts[:path_opts] ||= {view: :related}
-   opts[:path_opts][:related] = {name: "+#{name}"}
-   opts[:path_opts][:related].merge! opts[:related_opts] if opts[:related_opts]
-   view_link( opts[:text] || name, :related, opts)
+    opts[:path_opts] ||= { view: :related }
+    opts[:path_opts][:related] = { name: "+#{name}" }
+    opts[:path_opts][:related].merge! opts[:related_opts] if opts[:related_opts]
+    view_link(opts[:text] || name, :related, opts)
   end
 
-
-
   def path opts={}
-    if opts[:action] == :new && opts[:type] && !(opts[:name] || opts[:card] || opts[:id])
+    if opts[:action] == :new && opts[:type] &&
+       !(opts[:name] || opts[:card] || opts[:id])
       opts.delete(:action)
       base = "new/#{opts.delete(:type)}"
     else
       name = opts.delete(:name) || card.name
-      base = opts[:action] ? "card/#{ opts.delete :action }/" : ''
+      base = opts[:action] ? "card/#{opts.delete :action}/" : ''
 
       opts[:no_id] = true if [:new, :create].member? opts[:action]
-      #generalize. dislike hardcoding views/actions here
+      # generalize. dislike hardcoding views/actions here
 
       linkname = name.to_name.url_key
       unless name.empty? || opts.delete(:no_id)
-        base += ( opts[:id] ? "~#{ opts.delete :id }" : linkname )
+        base += (opts[:id] ? "~#{opts.delete :id}" : linkname)
       end
 
-      opts[:card] ||= {}
-      opts[:card][:name] = name if opts.delete(:known)==false && name.present? && name.to_s != linkname
-
-      if type = opts.delete(:type) and Card.known?( type )
-        opts[:card][:type] = type
-      end
-      opts.delete(:card) if opts[:card].empty?
+      process_path_card_opts opts, name, linkname
     end
 
     query = opts.empty? ? '' : "?#{opts.to_param}"
-    internal_url( base + query )
+    internal_url(base + query)
   end
 
   def internal_url relative_path
@@ -126,32 +121,38 @@ format do
   end
 
   def interpret_href href
-    Hash===href ? path(href) : href
+    href.is_a?(Hash) ? path(href) : href
   end
 
+  def process_path_card_opts opts, name, linkname
+    opts[:card] ||= {}
+    if opts.delete(:known) == false && name.present? && name.to_s != linkname
+      opts[:card][:name] = name
+    end
+
+    if (type = opts.delete(:type)) && Card.known?(type)
+      opts[:card][:type] = type
+    end
+    opts.delete(:card) if opts[:card].empty?
+  end
 end
 
 format :html do
-
-
   def link_to text, href, opts={}
     href = interpret_href href
 
     [:remote, :method].each do |key|
-      if val = opts.delete(key)
+      if (val = opts.delete(key))
         opts["data-#{key}"] = val
       end
     end
 
     content_tag :a, raw(text), opts.merge(href: href)
   end
-
 end
 
-
 format :css do
-  def link_to text, href, opts={}
+  def link_to _text, href, _opts={}
     interpret_href href
   end
-
 end

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

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-
 def list_fields
   Card.search({ left: name, type_id: Card::ListID }, 'list fields')
 end
@@ -14,8 +13,8 @@ def linker_lists
               "lists that link to #{name}")
 end
 
-event :trunk_cardtype_of_a_list_relation_changed,
-      changed: :type, after: :store, on: :update,
+event :trunk_cardtype_of_a_list_relation_changed, :finalize,
+      changed: :type, on: :update,
       when: proc { Codename[:list] } do
   type_key_was = (tk = Card.quick_fetch(type_id_was)) && tk.key
 
@@ -26,8 +25,8 @@ event :trunk_cardtype_of_a_list_relation_changed,
   listed_by_fields.each &:update_cached_list
 end
 
-event :trunk_name_of_a_list_relation_changed,
-      changed: :name, after: :store, on: :update,
+event :trunk_name_of_a_list_relation_changed, :finalize,
+      changed: :name,  on: :update,
       when: proc { Codename[:list] } do
   list_fields.each do |card|
     card.update_listed_by_cache_for card.item_keys
@@ -35,14 +34,13 @@ event :trunk_name_of_a_list_relation_changed,
   listed_by_fields.each &:update_cached_list
 end
 
-event :cardtype_of_list_item_changed,
-      changed: :type, before: :approve, on: :save,
+event :cardtype_of_list_item_changed, :validate,
+      changed: :type, on: :save,
       when: proc { Codename[:list] } do
   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}")
-    end
+    next unless card.item_type_id != type_id
+    errors.add(:type,
+               "can't be changed because #{name} " \
+               "is referenced by list card #{card.name}")
   end
 end

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

@@ -5,12 +5,12 @@ end
 format :html do
   def show view, args
     if show_layout?
-      args.merge! view: view if view
+      args[:view] = view if view
       @main_opts = args
       render :layout
     else
       view ||= args[:home_view] || :open
-      @inclusion_opts = (args[:items] || {}).clone
+      @nest_opts = (args[:items] || {}).clone
       render view, args
     end
   end
@@ -42,7 +42,7 @@ format :html do
         [
           _optional_render(:menu, args, :hide),
           _render_core(args)
-        ] * "\n"
+        ].join("\n")
       end
     end
   end
@@ -86,9 +86,9 @@ format :html do
   end
 
   view :type_info do
-    link_args = { text: "#{card.type_name}", class: 'navbar-link' }
+    link_args = { text: card.type_name.to_s, class: 'navbar-link' }
     link = card_link card.type_name, link_args
-    %{<span class="type-info pull-right">#{link}</span>}.html_safe
+    %(<span class="type-info pull-right">#{link}</span>).html_safe
   end
 
   view :title_editable do |args|
@@ -179,7 +179,7 @@ format :html do
       Card.fetch rcardname, new: {}
     end
 
-    subheader =  with_name_context(card.name) do
+    subheader = with_name_context(card.name) do
       subformat(rcard)._render_title(args)
     end
     add_name_context card.name
@@ -206,17 +206,17 @@ format :html do
       setting = card.new_card? ? [:add_help, { fallback: :help }] : :help
       help_card = card.rule_card(*setting)
       if help_card && help_card.ok?(:read)
-        with_inclusion_mode :normal do
+        with_nest_mode :normal do
           raw_help_content = _render_raw args.merge(structure: help_card.name)
           process_content raw_help_content, content_opts:
             { chunk_list: :references }
           # render help card with current card's format
-          # so current card's context is used in help card inclusions
+          # so current card's context is used in help card nests
         end
       end
     end
     klass = [args[:help_class], 'help-text'].compact * ' '
-    %{<div class="#{klass}">#{raw text}</div>} if text
+    %(<div class="#{klass}">#{raw text}</div>) if text
   end
 
   view :last_action do
@@ -236,19 +236,19 @@ format :html do
         )
       end
 
-    %{
+    %(
       <span class="last-update">
         #{action_verb} #{_render_acted_at} ago by
         #{subformat(card.last_actor)._render_link}
       </span>
-    }
+    )
   end
 
   private
 
   def fancy_title title=nil, title_class=nil
     klasses = ['card-title', title_class].compact * ' '
-    title = showname(title).to_name.parts.join %{<span class="joint">+</span>}
-    raw %{<span class="#{klasses}">#{title}</span>}
+    title = showname(title).to_name.parts.join %(<span class="joint">+</span>)
+    raw %(<span class="#{klasses}">#{title}</span>)
   end
 end

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

@@ -85,12 +85,12 @@ format :html do
     args[:optional_help] ||= :show
     args[:optional_toolbar] ||= :show
 
-    args[:buttons] ||= %{
+    args[:buttons] ||= %(
       #{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|
@@ -127,7 +127,7 @@ format :html do
       effects << "affect at least #{count} #{refs} to \"#{card.name}\""
       options = 'You may choose to <em>update or ignore</em> the referers.'
     end
-    effects = effects.map { |effect| "<li>#{effect}</li>" }
+    effects = effects.map { |effect| "<li>#{effect}</li>" }.join('')
     "<h6>This change will...</h6><ul>#{effects}</ul><p>#{options}</p>"
   end
 
@@ -213,7 +213,7 @@ format :html do
 
   view :edit_nests do |args|
     frame args do
-      with_inclusion_mode :edit do
+      with_nest_mode :edit do
         process_relative_tags optional_toolbar: :hide
       end
     end
@@ -225,7 +225,7 @@ format :html do
   view :edit_nest_rules do |args|
     view = args[:rule_view] || :field_related_rules
     frame args do
-      # with_inclusion_mode :edit do
+      # with_nest_mode :edit do
       nested_fields(args).map do |chunk|
         nest Card.fetch("#{chunk.referee_name}+*self"),
              view: :titled, title: chunk.referee_name, rule_view: view,

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

@@ -46,10 +46,10 @@ format :html do
     hidden_args = opts.delete :hidden
     form_for card, card_form_opts(action, opts) do |form|
       @form = form
-      %{
+      %(
         #{hidden_tags hidden_args if hidden_args}
         #{yield form}
-      }
+      )
     end
   end
 
@@ -98,13 +98,13 @@ format :html do
 
   def formgroup title, content, opts={}
     wrap_with :div, formgroup_div_args(opts[:class]) do
-      %{
+      %(
         <label>#{title}</label>
         <div>
           #{editor_wrap(opts[:editor]) { content }}
           #{formgroup_help_text opts[:help]}
         </div>
-      }
+      )
     end
   end
 
@@ -128,16 +128,15 @@ format :html do
     hash ||= {}
     hash.each do |key, val|
       result += if Hash === val
-        hidden_tags val, key
-      else
-        name = base ? "#{base}[#{key}]" : key
+                  hidden_tags val, key
+                else
+                  name = base ? "#{base}[#{key}]" : key
         hidden_field_tag name, val
       end
     end
     result
   end
 
-
   # FIELDSET VIEWS
 
   view :name_formgroup do |args|
@@ -145,25 +144,24 @@ format :html do
   end
 
   view :type_formgroup do |args|
-    field = if args[:variety] == :edit #FIXME dislike this api -ef
-      type_field class: 'type-field edit-type-field'
-    else
-      type_field class: "type-field live-type-field", href: path(view: :new), 'data-remote'=>true
+    field = if args[:variety] == :edit # FIXME: dislike this api -ef
+              type_field class: 'type-field edit-type-field'
+            else
+              type_field class: 'type-field live-type-field', href: path(view: :new), 'data-remote' => true
     end
     formgroup 'type', field, editor: 'type', class: 'type-formgroup'
   end
 
-
   view :button_formgroup do |args|
-    %{<div class="form-group"><div>#{ args[:buttons] }</div></div>}
+    %(<div class="form-group"><div>#{args[:buttons]}</div></div>)
   end
 
   view :content_formgroup do |args|
-    raw %{
+    raw %(
       <fieldset class="card-editor editor">
-        #{ edit_slot args }
+        #{edit_slot args}
       </fieldset>
-    }
+    )
   end
 
   def name_field form=nil, options={}
@@ -202,10 +200,10 @@ format :html do
         # hidden_field_tag 'card[last_action_id_before_edit]',
         # card.last_action_id, class: 'current_revision_id'
       end
-    %{
+    %(
       #{revision_tracking}
       #{_render_editor options}
-    }
+    )
   end
 
   # FIELD VIEWS
@@ -218,12 +216,10 @@ format :html do
   view :edit_in_form, perms: :update, tags: :unknown_ok do |args|
     eform = form_for_multi
     content = content_field eform, args.merge(nested: true)
-    if card.new_card?
-      content += raw("\n #{ eform.hidden_field :type_id }")
-    end
+    content += raw("\n #{eform.hidden_field :type_id}") if card.new_card?
     opts = { editor: 'content', help: true, class: 'card-editor' }
     if card.cardname.junction?
-      opts[:class] += " RIGHT-#{ card.cardname.tag_name.safe_key }"
+      opts[:class] += " RIGHT-#{card.cardname.tag_name.safe_key}"
     end
     formgroup fancy_title(args[:title]), content, opts
   end
@@ -238,12 +234,12 @@ format :html do
   # form helpers
 
   FIELD_HELPERS =
-    %w{
+    %w(
       hidden_field color_field date_field datetime_field datetime_local_field
       email_field month_field number_field password_field phone_field
       range_field search_field telephone_field text_area text_field time_field
       url_field week_field file_field
-    }
+    ).freeze
 
   FIELD_HELPERS.each do |method_name|
     define_method(method_name) do |name, options={}|
@@ -251,7 +247,7 @@ format :html do
     end
   end
 
-  def check_box method, options={}, checked_value = '1', unchecked_value = '0'
+  def check_box method, options={}, checked_value='1', unchecked_value='0'
     form.check_box method, options, checked_value, unchecked_value
   end