card 1.16.15 → 1.17.0

data/tmpsets/set/mod007-05_standard/all/rich_html/editing.rb

@@ -5,31 +5,41 @@ format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
 
   view :new, perms: :create, tags: :unknown_ok do |args|
-    frame_and_form :create, args, 'main-success'=>'REDIRECT' do
+    frame_and_form :create, args, 'main-success' => 'REDIRECT' do
       [
-        _optional_render( :name_formgroup,     args ),
-        _optional_render( :type_formgroup,     args ),
-        _optional_render( :content_formgroup, args ),
-        _optional_render( :button_formgroup,   args )
+        _optional_render(:name_formgroup, args),
+        _optional_render(:type_formgroup, args),
+        _optional_render(:content_formgroup, args),
+        _optional_render(:button_formgroup, args)
       ]
     end
   end
 
-
   def default_new_args args
     hidden = args[:hidden] ||= {}
     hidden[:success] ||= card.rule(:thanks) || '_self'
-    hidden[:card   ] ||={}
+    hidden[:card] ||= {}
 
     args[:optional_help] ||= :show
 
-    # name field / title
-    if !params[:name_prompt] and !card.cardname.blank?
+    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
     else
       # name is not ready; need generic title
-      args[:title] ||= "New #{ card.type_name unless card.type_id == Card.default_type_id }" #fixme - overrides nest args
+      args[:title] ||= if card.type_id == Card.default_type_id
+                         'New'
+                       else
+                         "New #{card.type_name}"
+                       end
+      # FIXME: - overrides nest args
       unless card.rule_card :autoname
         # prompt for name
         hidden[:name_prompt] = true unless hidden.has_key? :name_prompt
@@ -37,84 +47,95 @@ format :html do
       end
     end
     args[:optional_name_formgroup] ||= :hide
+  end
 
-
-    # type field
-    if ( !params[:type] and !args[:type] and
-        ( main? || card.simple? || card.is_template? ) and
-        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
 
+  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
 
-    cancel = if main?
-      { class: 'redirecter', href: Card.path_setting('/*previous') }
-    else
-      { class: 'slotter',    href: path( view: :missing         ) }
-    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
 
-
-
   view :edit, perms: :update, tags: :unknown_ok do |args|
     frame_and_form :update, args.merge(optional_toolbar: :show) do
       [
-        _optional_render( :content_formgroup, args ),
-        _optional_render( :button_formgroup,   args )
+        _optional_render(:content_formgroup, args),
+        _optional_render(:button_formgroup, args)
       ]
     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]
-    dependents = card.dependents
+    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? || dependents.any? }
-        <ul>
-          #{ %{<li>automatically alter #{ dependents.size } related name(s). </li>} if dependents.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
@@ -126,57 +147,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
@@ -197,10 +231,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, title: chunk.referee_name, rule_view: view,
+             optional_set_label: :hide,
+             optional_rule_navbar: :show
+      end
     end
   end
 
@@ -210,8 +247,5 @@ format :html do
 end
 
 
-
-
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/rich_html/editing.rb ~~~~~~~~~~~
 end;end;end;end;end;

data/tmpsets/set/mod007-05_standard/all/rich_html/form.rb

@@ -5,26 +5,29 @@ format :html do
   def edit_slot args={}
     # note: @mode should already be :edit here...
     if args[:structure] || card.structure
-      # multi-card editing
-
-      if args[:core_edit] #need better name
-        _render_core args
-      else
-        process_relative_tags optional_toolbar: :hide,
-                              structure: args[:structure]
-      end
+      multi_card_edit_slot args
+    else
+      single_card_edit_slot args
+    end
+  end
 
+  def multi_card_edit_slot args
+    if args[:core_edit] # need better name
+      _render_core args
     else
-      # single-card edit mode
-      field = content_field form, args
+      process_relative_tags optional_toolbar: :hide,
+                            structure: args[:structure]
+    end
+  end
 
-      if [args[:optional_type_formgroup], args[:optional_name_formgroup]]
-         .member? :show
-        # display content field in formgroup for consistency with other fields
-        formgroup '', field, editor: :content
-      else
-        editor_wrap( :content ) { field }
-      end
+  def single_card_edit_slot args
+    field = content_field form, args
+    if [args[:optional_type_formgroup], args[:optional_name_formgroup]]
+       .member? :show
+      # display content field in formgroup for consistency with other fields
+      formgroup '', field, editor: :content
+    else
+      editor_wrap(:content) { field }
     end
   end
 
@@ -47,8 +50,8 @@ format :html do
     form_for card, card_form_opts(action, opts) do |form|
       @form = form
       %{
-        #{ hidden_tags hidden_args if hidden_args }
-        #{ yield form }
+        #{hidden_tags hidden_args if hidden_args}
+        #{yield form}
       }
     end
   end
@@ -64,14 +67,9 @@ format :html do
   end
 
   def card_form_opts action, html={}
-    url, action = case action
-      when Symbol ;  [ path(action: action) , action          ]
-      when Hash   ;  [ path(action)          , action[:action] ]
-      when String ;  [ card_path(action)     , nil             ] #deprecated
-      else        ;  raise Card::Error, "unsupported card_form action class: #{action.class}"
-      end
+    url, action = url_from_action(action)
 
-    klasses = Array.wrap( html[:class] )
+    klasses = Array.wrap(html[:class])
     klasses << 'card-form slotter'
     klasses << 'autosave' if action == :update
     html[:class] = klasses.join ' '
@@ -82,33 +80,51 @@ format :html do
     { url: url, remote: true, html: html }
   end
 
+  def url_from_action action
+    case action
+    when Symbol
+      [path(action: action), action]
+    when Hash
+      [path(action), action[:action]]
+    when String # deprecated
+      [card_path(action), nil]
+    else
+      raise Card::Error, "unsupported card_form action class: #{action.class}"
+    end
+  end
+
   def editor_wrap type=nil
-    content_tag( :div, class: "editor#{ " #{type}-editor" if type }" ) { yield.html_safe }
+    html_class = 'editor'
+    html_class << " #{type}-editor" if type
+    content_tag(:div, class: html_class) { yield.html_safe }
   end
 
   def formgroup title, content, opts={}
-    help_text =
-      case opts[:help]
-      when String ; _render_help help_class: 'help-block', help_text: opts[:help]
-      when true   ; _render_help help_class: 'help-block'
-      else        ; nil
-      end
-
-    div_args = { class: ['form-group', opts[:class]].compact*' ' }
-    div_args[:card_id  ] = card.id     if card.real?
-    div_args[:card_name] = h card.name if card.name.present?
-
-    wrap_with :div, div_args do
+    wrap_with :div, formgroup_div_args(opts[:class]) do
       %{
-        <label>#{ title }</label>
+        <label>#{title}</label>
         <div>
-          #{ editor_wrap( opts[:editor] ) { content } }
-          #{ help_text }
+          #{editor_wrap(opts[:editor]) { content }}
+          #{formgroup_help_text opts[:help]}
         </div>
       }
     end
   end
 
+  def formgroup_div_args html_class
+    div_args = { class: ['form-group', html_class].compact.join(' ') }
+    div_args[:card_id] = card.id if card.real?
+    div_args[:card_name] = h card.name if card.name.present?
+    div_args
+  end
+
+  def formgroup_help_text text=nil
+    case text
+    when String then _render_help help_class: 'help-block', help_text: text
+    when true   then _render_help help_class: 'help-block'
+    end
+  end
+
   def hidden_tags hash, base=nil
     # convert hash into a collection of hidden tags
     result = ''
@@ -128,7 +144,7 @@ format :html do
   # FIELDSET VIEWS
 
   view :name_formgroup do |args|
-    formgroup 'name', raw( name_field form ), editor: 'name', help: args[:help]
+    formgroup 'name', raw(name_field form), editor: 'name', help: args[:help]
   end
 
   view :type_formgroup do |args|
@@ -153,26 +169,29 @@ format :html do
     }
   end
 
-
   def name_field form=nil, options={}
     form ||= self.form
-    text_field( :name, {
-      value: card.name, #needed because otherwise gets wrong value if there are updates
+    text_field(:name, {
+      # needed because otherwise gets wrong value if there are updates
+      value: card.name,
       autocomplete: 'off'
     }.merge(options))
   end
 
   def type_field args={}
     typelist = Auth.createable_types
-    current_type = unless args.delete :no_current_type
-        unless card.new_card? || typelist.include?( card.type_name )
-          # current type should be an option on existing cards, regardless of create perms
-          typelist = (typelist << card.type_name).sort
+    current_type =
+      unless args.delete :no_current_type
+        if !card.new_card? && !typelist.include?(card.type_name)
+          # current type should be an option on existing cards,
+          # regardless of create perms
+          typelist.push(card.type_name).sort!
         end
-        Card[ card ? card.type_id : Card.default_type_id ].name
+        card.type_name_or_default
       end
 
-    options = options_from_collection_for_select typelist, :to_s, :to_s, current_type
+    options = options_from_collection_for_select typelist, :to_s, :to_s,
+                                                 current_type
     template.select_tag 'card[type]', options, args
   end
 
@@ -180,34 +199,36 @@ format :html do
     @form = form
     @nested = options[:nested]
     card.last_action_id_before_edit = card.last_action_id
-    revision_tracking = if card && !card.new_card? && !options[:skip_rev_id]
-      hidden_field :last_action_id_before_edit, class: 'current_revision_id'
-      #hidden_field_tag 'card[last_action_id_before_edit]', card.last_action_id, class: 'current_revision_id'
-    end
+    revision_tracking =
+      if card && !card.new_card? && !options[:skip_rev_id]
+        hidden_field :last_action_id_before_edit, class: 'current_revision_id'
+        # hidden_field_tag 'card[last_action_id_before_edit]',
+        # card.last_action_id, class: 'current_revision_id'
+      end
     %{
-      #{ revision_tracking
-       }
-      #{ _render_editor options }
+      #{revision_tracking}
+      #{_render_editor options}
     }
   end
 
+  # FIELD VIEWS
 
-# FIELD VIEWS
-
-  view :editor do |args|
-    text_area :content, rows: 3, class: 'tinymce-textarea card-content', id: unique_id
+  view :editor do |_args|
+    text_area :content, rows: 3, class: 'tinymce-textarea card-content',
+                        id: unique_id
   end
 
   view :edit_in_form, perms: :update, tags: :unknown_ok do |args|
     eform = form_for_multi
-
-    content = content_field eform, args.merge( nested: true )
+    content = content_field eform, args.merge(nested: true)
+    if card.new_card?
+      content += raw("\n #{ eform.hidden_field :type_id }")
+    end
     opts = { editor: 'content', help: true, class: 'card-editor' }
-
-    content      += raw( "\n #{ eform.hidden_field :type_id }" )  if card.new_card?
-    opts[:class] += " RIGHT-#{ card.cardname.tag_name.safe_key }" if card.cardname.junction?
-
-    formgroup fancy_title( args[:title] ), content, opts
+    if card.cardname.junction?
+      opts[:class] += " RIGHT-#{ card.cardname.tag_name.safe_key }"
+    end
+    formgroup fancy_title(args[:title]), content, opts
   end
 
   def process_relative_tags args
@@ -215,33 +236,54 @@ format :html do
       nested_card = fetch_nested_card chunk.options
       nest nested_card, chunk.options.reverse_merge(args)
     end.join "\n"
-    # _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
-    #   process_content( inc ).strip
-    # end.join
   end
 
   # form helpers
 
-  FIELD_HELPERS = %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}
-
+  FIELD_HELPERS =
+    %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
+    }
 
   FIELD_HELPERS.each do |method_name|
-    define_method(method_name) do |name, options = {}|
+    define_method(method_name) do |name, options={}|
       form.send(method_name, name, options)
     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
 
-  def radio_button method, tag_value, options = {}
+  def radio_button method, tag_value, options={}
     form.radio_button method, tag_value, options
   end
 
+  def submit_button args={}
+    args.reverse_merge!(
+      situation: 'primary',
+      data: {}
+    )
+    text = args.delete(:text) || 'Submit'
+    args[:data][:disable_with] ||= args.delete(:disable_with) || 'Submitting'
+    button_tag text, args
+  end
+
+  # redirect to *previous if no :href is given
+  def cancel_button args={}
+    args.reverse_merge! type: 'button'
+    if args[:href]
+      add_class args, 'slotter'
+    else
+      add_class args, 'redirecter'
+      args[:href] = Card.path_setting('/*previous')
+    end
+    text = args.delete(:text) || 'Cancel'
+    button_tag text, args
+  end
 end