card 1.16.6 → 1.16.7

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

@@ -3,7 +3,7 @@ class Card; module Set; module All; module RichHtml; module Editing; extend Card
 format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
 
-  view :new, :perms=>:create, :tags=>:unknown_ok do |args|
+  view :new, perms: :create, tags: :unknown_ok do |args|
     frame_and_form :create, args, 'main-success'=>'REDIRECT' do
       [
         _optional_render( :name_formgroup,     args ),
@@ -41,7 +41,7 @@ format :html do
     # 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
+        Card.new( type_id: card.type_id ).ok? :create #otherwise current type won't be on menu
       )
       args[:optional_type_formgroup] = :show
     else
@@ -51,22 +51,22 @@ format :html do
 
 
     cancel = if main?
-      { :class=>'redirecter', :href=>Card.path_setting('/*previous') }
+      { class: 'redirecter', href: Card.path_setting('/*previous') }
     else
-      { :class=>'slotter',    :href=>path( :view=>:missing         ) }
+      { class: 'slotter',    href: path( view: :missing         ) }
     end
 
     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] }
+      #{ 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] }
     }
 
   end
 
 
 
-  view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
-    frame_and_form :update, args.merge(:optional_toolbar=>:show) do
+  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 )
@@ -80,15 +80,15 @@ format :html do
     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' }
+      #{ 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' }
     }
   end
 
 
-  view :edit_name, :perms=>:update do |args|
-    frame_and_form( { :action=>:update, :id=>card.id }, args, 'main-success'=>'REDIRECT' ) do
+  view :edit_name, perms: :update do |args|
+    frame_and_form( { action: :update, id: card.id }, args, 'main-success'=>'REDIRECT' ) do
       [
         _render_name_formgroup( args ),
         _optional_render( :confirm_rename, args ),
@@ -119,22 +119,22 @@ format :html do
     referers = args[:referers] = card.extended_referencers
     args[:hidden] ||= {}
     args[:hidden].reverse_merge!(
-      :success  => '_self',
-      :old_name => card.name,
-      :referers => referers.size,
-      :card     => { :update_referencers => false }
+      success:  '_self',
+      old_name: card.name,
+      referers: referers.size,
+      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 }
+      #{ 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 }
     }
 
   end
 
 
-  view :edit_type, :perms=>:update do |args|
+  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
       [
@@ -147,35 +147,35 @@ format :html do
   def default_edit_type_args args
     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' }
+      #{ button_tag 'Submit', disable_with: 'Submitting', situation: 'primary' }
+      #{ button_tag 'Cancel', href: path(view: :edit), type: 'button', class: 'slotter' }
     }
   end
 
-  view :edit_rules, :tags=>:unknown_ok do |args|
+  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
+        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
+  view :options, {view: :edit_rules, mod: All::RichHtml::Editing::HtmlFormat} # for backwards compatibility
 
   view :edit_structure do |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}}
+        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}}
       }
-    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
@@ -185,7 +185,7 @@ format :html do
   view :edit_nests do |args|
     frame args do
       with_inclusion_mode :edit do
-        process_relative_tags :optional_toolbar=>:hide
+        process_relative_tags optional_toolbar: :hide
       end
     end
   end
@@ -198,7 +198,7 @@ format :html do
     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
+         nest Card.fetch("#{chunk.referee_name}+*self"), view: :titled, rule_view: view, optional_set_label: :hide, optional_rule_navbar: :show
        end
     end
   end

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

@@ -9,7 +9,7 @@ format :html do
       if args[:core_edit] #need better name
         _render_core args
       else
-        process_relative_tags :optional_toolbar=>:hide, :structure=>args[:structure]
+        process_relative_tags optional_toolbar: :hide, structure: args[:structure]
       end
 
     else
@@ -18,7 +18,7 @@ format :html do
 
       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
+        formgroup '', field, editor: :content
       else
         editor_wrap( :content ) { field }
       end
@@ -54,7 +54,7 @@ format :html do
 
   def card_form_opts action, html={}
     url, action = case action
-      when Symbol ;  [ path(:action=>action) , 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}"
@@ -68,22 +68,22 @@ format :html do
     html[:recaptcha] ||= 'on' if card.recaptcha_on?
     html.delete :recaptcha if html[:recaptcha] == :off
 
-    { :url=>url, :remote=>true, :html=>html }
+    { url: url, remote: true, html: html }
   end
 
   def editor_wrap type=nil
-    content_tag( :div, :class=>"editor#{ " #{type}-editor" if type }" ) { yield.html_safe }
+    content_tag( :div, class: "editor#{ " #{type}-editor" if type }" ) { 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'
+      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 = { 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?
 
@@ -117,16 +117,16 @@ 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|
     field = if args[:variety] == :edit #FIXME dislike this api -ef
-      type_field :class=>'type-field edit-type-field'
+      type_field class: 'type-field edit-type-field'
     else
-      type_field :class=>"type-field live-type-field", :href=>path(:view=>:new), 'data-remote'=>true
+      type_field class: "type-field live-type-field", href: path(view: :new), 'data-remote'=>true
     end
-    formgroup 'type', field, :editor => 'type', :class=>'type-formgroup'
+    formgroup 'type', field, editor: 'type', class: 'type-formgroup'
   end
 
 
@@ -146,8 +146,8 @@ format :html do
   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
-      :autocomplete=>'off'
+      value: card.name, #needed because otherwise gets wrong value if there are updates
+      autocomplete: 'off'
     }.merge(options))
   end
 
@@ -170,8 +170,8 @@ format :html do
     @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'
+      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
@@ -184,14 +184,14 @@ format :html do
 # FIELD VIEWS
 
   view :editor do |args|
-    text_area :content, :rows=>3, :class=>'tinymce-textarea card-content', :id=>unique_id
+    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|
+  view :edit_in_form, perms: :update, tags: :unknown_ok do |args|
     eform = form_for_multi
 
-    content = content_field eform, args.merge( :nested=>true )
-    opts = { :editor=>'content', :help=>true, :class=>'card-editor' }
+    content = content_field eform, args.merge( nested: true )
+    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?

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

@@ -20,7 +20,7 @@ format :html do
     if @slot_view == :open && toolbar_pinned?
       args[:optional_toolbar] ||= :show
     end
-    if show_view?(:toolbar,args.merge(:default_visibility=>:hide)) && card.type_code != :basic
+    if show_view?(:toolbar,args.merge(default_visibility: :hide)) && card.type_code != :basic
       args[:optional_type_info] ||= :show
     end
   end
@@ -40,14 +40,14 @@ format :html do
     verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open expand } : %w{ close closed collapse-down } )
 
     link_to  glyphicon(direction),
-             path( :view=>adjective ),
-             :remote => true,
-             :title => "#{verb} #{card.name}",
-             :class => "#{verb}-icon toggler slotter nodblclick"
+             path( view: adjective ),
+             remote: true,
+             title: "#{verb} #{card.name}",
+             class: "#{verb}-icon toggler slotter nodblclick"
   end
 
   view :link_list do |args|
-    content_tag :ul, :class=>args[:class] do
+    content_tag :ul, class: args[:class] do
       item_links(args).map do |al|
         content_tag :li, raw(al)
       end.join "\n"
@@ -55,11 +55,11 @@ format :html do
   end
 
   view :navbar_right do |args|
-    render_link_list args.merge(:class=>"nav navbar-nav navbar-right")
+    render_link_list args.merge(class: "nav navbar-nav navbar-right")
   end
 
   view :navbar_left do |args|
-    render_link_list args.merge(:class=>"nav navbar-nav navbar-left")
+    render_link_list args.merge(class: "nav navbar-nav navbar-left")
   end
 
   def show_follow?

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

@@ -1,47 +1,47 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module RichHtml; module Menu; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/rich_html/menu.rb ~~~~~~~~~~~
 format :html do
-  view :menu, :denial=>:blank, :tags=>:unknown_ok do |args|
+  view :menu, denial: :blank, tags: :unknown_ok do |args|
     return _render_template_closer if args[:menu_hack] == :template_closer
     return '' if card.unknown?
-    wrap_with :div, :class=>'menu-slot nodblclick' do
+    wrap_with :div, class: 'menu-slot nodblclick' do
       [
         _optional_render(:horizontal_menu, args, :hide),
         _render_menu_link(args),
-        _render_modal_slot(args.merge(:modal_id=>card.cardname.safe_key))
+        _render_modal_slot(args.merge(modal_id: card.cardname.safe_key))
       ]
     end
   end
 
   view :menu_link do |args|
-    path_opts = {:slot => {:home_view=>args[:home_view]}}
+    path_opts = {slot: {home_view: args[:home_view]}}
     path_opts[:is_main] = true if main?
-    css_class = if show_view?(:horizontal_menu,args.merge(:default_visibility=>:hide, :optional=>true))
+    css_class = if show_view?(:horizontal_menu,args.merge(default_visibility: :hide, optional: true))
                   'visible-xs'
                 else
                   'show-on-hover'
                 end
-    wrap_with :div, :class=>"vertical-card-menu card-menu #{css_class}" do
-        content_tag :div, :class=>'btn-group slotter card-slot pull-right' do
-          view_link(glyphicon(args[:menu_icon]), :vertical_menu, :path_opts=>path_opts).html_safe
+    wrap_with :div, class: "vertical-card-menu card-menu #{css_class}" do
+        content_tag :div, class: 'btn-group slotter card-slot pull-right' do
+          view_link(glyphicon(args[:menu_icon]), :vertical_menu, path_opts: path_opts).html_safe
         end
     end
   end
 
-  view :vertical_menu, :tags=>:unknown_ok do |args|
+  view :vertical_menu, tags: :unknown_ok do |args|
     items = menu_item_list(args).map {|item| "<li class='#{args[:item_class]}'>#{item}</li>"}.join "\n"
-    wrap_with :ul, :class=>'btn-group pull-right slotter' do
+    wrap_with :ul, class: 'btn-group pull-right slotter' do
       [
         content_tag( :span, "<a href='#'>#{ glyphicon args[:menu_icon] }</a>".html_safe,
-                     :class=>'open-menu dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-expanded'=>'false'),
-        content_tag( :ul, items.html_safe, :class=>'dropdown-menu', :role=>'menu'),
+                     class: 'open-menu dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-expanded'=>'false'),
+        content_tag( :ul, items.html_safe, class: 'dropdown-menu', role: 'menu'),
       ]
     end
   end
 
   view :horizontal_menu do |args|
-    content_tag :div, :class=>'btn-group slotter pull-right card-menu horizontal-card-menu hidden-xs' do
-      menu_item_list(args.merge(:html_args=>{:class=>'btn btn-default'})).join("\n").html_safe
+    content_tag :div, class: 'btn-group slotter pull-right card-menu horizontal-card-menu hidden-xs' do
+      menu_item_list(args.merge(html_args: {class: 'btn btn-default'})).join("\n").html_safe
     end
   end
 
@@ -49,7 +49,7 @@ format :html do
     menu_items = []
     menu_items << menu_edit_link(args)            if args[:show_menu_item][:edit]
     menu_items << menu_discuss_link(args)         if args[:show_menu_item][:discuss]
-    menu_items << _render_follow_link(args.merge(:icon=>true)) if args[:show_menu_item][:follow]
+    menu_items << _render_follow_link(args.merge(icon: true)) if args[:show_menu_item][:follow]
     menu_items << menu_page_link(args)            if args[:show_menu_item][:page]
     menu_items << menu_rules_link(args)           if args[:show_menu_item][:rules]
     menu_items << menu_account_link(args)         if args[:show_menu_item][:account]
@@ -58,31 +58,31 @@ format :html do
   end
 
   def menu_edit_link args
-    path_opts = { :view=>:edit }
+    path_opts = { view: :edit }
     menu_item('edit', 'edit', path_opts, args[:html_args] )
   end
 
   def menu_discuss_link args
-    menu_item('discuss', 'comment', { :related=>Card[:discussion].key }, args[:html_args])
+    menu_item('discuss', 'comment', { related: Card[:discussion].key }, args[:html_args])
   end
 
   def menu_page_link args
-    menu_item('page', 'new-window', {:card=>card}, args[:html_args])
+    menu_item('page', 'new-window', {card: card}, args[:html_args])
   end
 
   def menu_rules_link args
-    menu_item('rules', 'wrench', {:view=>:options}, args[:html_args])
+    menu_item('rules', 'wrench', {view: :options}, args[:html_args])
   end
 
   def menu_account_link args
-    path_opts = { :related=>{:name=>'+*account',:view=>:edit} }
+    path_opts = { related: {name: '+*account',view: :edit} }
     menu_item('account', 'user', path_opts, args[:html_args])
   end
 
   def menu_more_link args
     path_opts = {
-        :view=>args[:home_view] || :open,
-        :slot=>{:show=>:toolbar}
+        view: args[:home_view] || :open,
+        slot: {show: :toolbar}
       }
     menu_item('', 'option-horizontal', path_opts, args[:html_args])
   end
@@ -100,30 +100,30 @@ format :html do
 
   def default_vertical_menu_args args
     default_menu_link_args args
-    args.merge! :show_menu_item=>show_menu_items
+    args.merge! show_menu_item: show_menu_items
   end
 
   def default_horizontal_menu_args args
-    args.merge! :show_menu_item=>show_menu_items
+    args.merge! show_menu_item: show_menu_items
   end
 
   def show_menu_items
-    disc_tagname = Card.fetch(:discussion, :skip_modules=>true).cardname
+    disc_tagname = Card.fetch(:discussion, skip_modules: true).cardname
     disc_card = unless card.new_card? or card.junction? && card.cardname.tag_name.key == disc_tagname.key
-      Card.fetch "#{card.name}+#{disc_tagname}", :skip_virtual=>true, :skip_modules=>true, :new=>{}
+      Card.fetch "#{card.name}+#{disc_tagname}", skip_virtual: true, skip_modules: true, new: {}
     end
 
     res = {
-      :discuss    => disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
-      :page       => card.name.present? && !main?,
-      :rules      => card.virtual?
+      discuss:    disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
+      page:       card.name.present? && !main?,
+      rules:      card.virtual?
     }
     if card.real?
       res.merge!(
-        :edit      => card.ok?(:update) || structure_editable?,
-        :account   => card.account && card.ok?(:update),
-        :follow    => show_follow?,
-        :more      => true
+        edit:      card.ok?(:update) || structure_editable?,
+        account:   card.account && card.ok?(:update),
+        follow:    show_follow?,
+        more:      true
       )
     end
     res