card 1.16.6 → 1.16.7

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

@@ -7,7 +7,7 @@ format :html do
 
   view :modal_link do |args|
     path_opts = args[:path_opts] || {}
-    path_opts.merge!(:layout=>:modal)
+    path_opts.merge!(layout: :modal)
     html_args = args[:html_args] || {}
     #html_args.merge!('data-target'=>"#modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}",
     html_args.merge!('data-target'=>"#modal-main-slot",
@@ -16,12 +16,12 @@ format :html do
   end
 
   view :modal_slot do |args|
-    #wrap_with(:div, :class=>'modal fade', :role=>'dialog', :id=>"modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
+    #wrap_with(:div, class: 'modal fade', role: 'dialog', id: "modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
     id = "modal-"
     id += (args[:modal_id] || 'main-slot')
-    wrap_with(:div, :class=>'modal fade', :role=>'dialog', :id=>id) do
-      wrap_with(:div, :class=>'modal-dialog') do
-        content_tag :div, :class=>'modal-content' do
+    wrap_with(:div, class: 'modal fade', role: 'dialog', id: id) do
+      wrap_with(:div, class: 'modal-dialog') do
+        content_tag :div, class: 'modal-content' do
           ''
         end
       end
@@ -29,25 +29,25 @@ format :html do
   end
 
 
-  view :modal_menu, :tags=>:unknown_ok do |args|
+  view :modal_menu, tags: :unknown_ok do |args|
     popout_params = {}
     popout_params[:view] = params[:view] if params[:view]
     # we probably want to pass on a lot more params than just view, but not all of them
     # (eg we don't want layout, id, controller...)
-    wrap_with :div, :class=>'modal-menu' do
+    wrap_with :div, class: 'modal-menu' do
       [
-        link_to( glyphicon('remove'), '', :class=>'close-modal pull-right close', 'data-dismiss'=>'modal'),
-        link_to( glyphicon('new-window'), popout_params, :class=>'pop-out-modal pull-right close ' )
+        link_to( glyphicon('remove'), '', class: 'close-modal pull-right close', 'data-dismiss'=>'modal'),
+        link_to( glyphicon('new-window'), popout_params, class: 'pop-out-modal pull-right close ' )
       ]
     end
   end
 
-  view :modal_footer, :tags=>:unknown_ok do |args|
+  view :modal_footer, tags: :unknown_ok do |args|
     args[:buttons] || ''
   end
 
   def default_modal_footer_args args
-    args[:buttons] ||=  button_tag 'Close', :class=>'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
+    args[:buttons] ||=  button_tag 'Close', class: 'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
   end
 
 =begin
@@ -64,9 +64,9 @@ format :html do
   # use modal_content for ajax calls to fill a modal_slot with content
   view :modal_content do |args|
     output [
-      wrap_with( :div, _render_modal_header(args), :class=>'modal-header' ),
-      wrap_with( :div, _render_modal_body(args),   :class=>'modal-body' ),
-      wrap_with( :div, _render_modal_footer(args), :class=>'modal-footer' ),
+      wrap_with( :div, _render_modal_header(args), class: 'modal-header' ),
+      wrap_with( :div, _render_modal_body(args),   class: 'modal-body' ),
+      wrap_with( :div, _render_modal_footer(args), class: 'modal-footer' ),
     ]
   end
 
@@ -83,11 +83,11 @@ format :html do
   end
 
   view :modal_title do |args|
-    "<h4>#{_render_title args.merge(:title_class=>'modal-title')}</h4>"
+    "<h4>#{_render_title args.merge(title_class: 'modal-title')}</h4>"
   end
 
   view :modal do |args|
-    _render_modal_slot args.merge(:optional_modal_content=>:show)
+    _render_modal_slot args.merge(optional_modal_content: :show)
   end
 =end
 

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

@@ -7,11 +7,11 @@ format :html do
   end
 
   view :toolbar do |args|
-    navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", :toggle_align=>:left, :class=>"slotter toolbar", :navbar_type=>'inverse',
-          :collapsed_content=>close_link(args.merge(:class=>'pull-right visible-xs')) do
+    navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", toggle_align: :left, class: "slotter toolbar", navbar_type: 'inverse',
+          collapsed_content: close_link(args.merge(class: 'pull-right visible-xs')) do
       [
-        close_link(args.merge(:class=>'hidden-xs navbar-right')),
-        (wrap_with(:form, :class=>'navbar-form navbar-left') do
+        close_link(args.merge(class: 'hidden-xs navbar-right')),
+        (wrap_with(:form, class: 'navbar-form navbar-left') do
           [
             (account_split_button(args) if card.accountable?),
             activity_split_button(args),
@@ -19,8 +19,8 @@ format :html do
             edit_split_button(args),
           ]
         end),
-        (wrap_with(:form, :class=>'navbar-form navbar-right') do
-          content_tag :div, :class=>'form-group' do
+        (wrap_with(:form, class: 'navbar-form navbar-right') do
+          content_tag :div, class: 'form-group' do
             _optional_render(:toolbar_buttons, args, :show)
           end
         end)
@@ -61,65 +61,65 @@ format :html do
     if view  == :edit_rules
       current_set_card.name
     else
-      {:edit=>'content', :edit_name=>'name', :edit_type=>'type', :edit_structure=>'structure', :edit_nests=>'nests', :history=>'history', :common_rules=>'common', :recent_rules=>'recent', :grouped_rules=>'all', :edit_nest_rules=>'nests'}[view]
+      {edit: 'content', edit_name: 'name', edit_type: 'type', edit_structure: 'structure', edit_nests: 'nests', history: 'history', common_rules: 'common', recent_rules: 'recent', grouped_rules: 'all', edit_nest_rules: 'nests'}[view]
     end
   end
 
   def activity_split_button args
-    discuss = smart_link 'discuss',  { :related=>Card[:discussion].key }
-    editors = smart_link 'editors',  { :related=>Card[:editors].key }
-    toolbar_split_button 'activity', { :view=>:history }, args do
+    discuss = smart_link 'discuss',  { related: Card[:discussion].key }
+    editors = smart_link 'editors',  { related: Card[:editors].key }
+    toolbar_split_button 'activity', { view: :history }, args do
       {
-        :history    => (_render_history_link if card.history?),
-        :discuss => discuss,
-        :follow  =>_render_follow_link(args),
-        :editors => editors
+        history:    (_render_history_link if card.history?),
+        discuss: discuss,
+        follow:  _render_follow_link(args),
+        editors: editors
       }
     end
   end
   def rules_split_button args
-    recent = smart_link 'recent',   {:view => :edit_rules, :slot=>{:rule_view=>:recent_rules}}
-    common = smart_link 'common',   {:view => :edit_rules, :slot=>{:rule_view=>:common_rules}}
-    group  = smart_link 'by group', {:view => :edit_rules, :slot=>{:rule_view=>:grouped_rules}}
-    all    = smart_link 'by name',  {:view => :edit_rules, :slot=>{:rule_view=>:all_rules}}
-    nests  = smart_link 'nests',    {:view => :edit_nest_rules, :slot=>{:rule_view=>:field_related_rules}}
-    toolbar_split_button 'rules',   {:view => :edit_rules }, args do
+    recent = smart_link 'recent',   {view: :edit_rules, slot: {rule_view: :recent_rules}}
+    common = smart_link 'common',   {view: :edit_rules, slot: {rule_view: :common_rules}}
+    group  = smart_link 'by group', {view: :edit_rules, slot: {rule_view: :grouped_rules}}
+    all    = smart_link 'by name',  {view: :edit_rules, slot: {rule_view: :all_rules}}
+    nests  = smart_link 'nests',    {view: :edit_nest_rules, slot: {rule_view: :field_related_rules}}
+    toolbar_split_button 'rules',   {view: :edit_rules }, args do
       {
-        :common_rules    => common,
-        :grouped_rules   => group,
-        :all_rules       => all,
-        :separator       => (separator if args[:nested_fields].present?),
-        :recent_rules    => (recent if recently_edited_settings?),
-        :edit_nest_rules => (nests if args[:nested_fields].present?)
+        common_rules:    common,
+        grouped_rules:   group,
+        all_rules:       all,
+        separator:       (separator if args[:nested_fields].present?),
+        recent_rules:    (recent if recently_edited_settings?),
+        edit_nest_rules: (nests if args[:nested_fields].present?)
       }
     end
   end
   def edit_split_button args
-    toolbar_split_button 'edit', {:view=>:edit}, args do
+    toolbar_split_button 'edit', {view: :edit}, args do
       {
-        :edit       => _render_edit_content_link(args),
-        :edit_nests => (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
-        :structure  => (smart_link 'structure', {:view => :edit_structure} if structure_editable?),
-        :edit_name  => _render_edit_name_link,
-        :edit_type  => _render_edit_type_link,
+        edit:       _render_edit_content_link(args),
+        edit_nests: (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
+        structure:  (smart_link 'structure', {view: :edit_structure} if structure_editable?),
+        edit_name:  _render_edit_name_link,
+        edit_type:  _render_edit_type_link,
       }
     end
   end
   def account_split_button args
-    toolbar_split_button 'account', {:related=>Card[:account].key}, args do
+    toolbar_split_button 'account', {related: Card[:account].key}, args do
       {
-        :account => smart_link('details',{:related=>{:name=>"#{card.name}+#{Card[:account].key}", :view=>:edit}}),
-        :roles   => smart_link('roles',  {:related=>Card[:roles].key}),
-        :created => smart_link('created',{:related=>Card[:created].key}),
-        :edited  => smart_link('edited', {:related=>Card[:edited].key}),
-        :follow  => smart_link('follow', {:related=>Card[:follow].key})
+        account: smart_link('details',{related: {name: "#{card.name}+#{Card[:account].key}", view: :edit}}),
+        roles:   smart_link('roles',  {related: Card[:roles].key}),
+        created: smart_link('created',{related: Card[:created].key}),
+        edited:  smart_link('edited', {related: Card[:edited].key}),
+        follow:  smart_link('follow', {related: Card[:follow].key})
       }
     end
   end
 
 
   def toolbar_split_button name, button_args, args
-    button = button_link name, button_args, :class=>('active' if args[:active_toolbar_button] == name)
+    button = button_link name, button_args, class: ('active' if args[:active_toolbar_button] == name)
     active_item =
       if @slot_view == :related
         if args[:rule_view]
@@ -130,34 +130,34 @@ format :html do
       else
         @slot_view
       end
-    split_button button, args.merge(:active_item=>active_item) do
+    split_button button, args.merge(active_item: active_item) do
         yield
     end
   end
 
 
   def close_link args
-    link_opts = {:title=>'cancel'}
+    link_opts = {title: 'cancel'}
     if args[:subslot]
-      link_opts[:path_opts] = {:slot=>{:subframe=>true}}
+      link_opts[:path_opts] = {slot: {subframe: true}}
     end
 
-    link = view_link glyphicon('remove'), :home, link_opts.merge(:class=>'btn-toolbar-control btn btn-primary')
+    link = view_link glyphicon('remove'), :home, link_opts.merge(class: 'btn-toolbar-control btn btn-primary')
     css_class = ['nav navbar-nav', args[:class]].compact.join "\n"
-    wrap_with :div, :class=>css_class do
+    wrap_with :div, class: css_class do
       [
         toolbar_pin_button,
         link
       ]
     end
-    #list_tag link, :class=>css_class
+    #list_tag link, class: css_class
   end
   def toolbar_pin_button
-    button_tag glyphicon('pushpin'), :situation=>:primary, :remote=>true, :title=>"#{'un' if toolbar_pinned?}pin", :class=>"btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
+    button_tag glyphicon('pushpin'), situation: :primary, remote: true, title: "#{'un' if toolbar_pinned?}pin", class: "btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
   end
 
   view :toolbar_buttons do |args|
-    wrap_with(:div, :class=>'btn-group') do
+    wrap_with(:div, class: 'btn-group') do
       [
         _optional_render(:delete_button,  args, (card.ok?(:delete) ? :show : :hide)),
         _optional_render(:refresh_button, args, :show),
@@ -171,29 +171,29 @@ format :html do
 
 
   view :related_button do |args|
-    path_opts = {:slot=>{:show=>:toolbar}}
-    dropdown_button '', :icon=>'education', :class=>'related' do #, :icon=>'eye-open' do
+    path_opts = {slot: {show: :toolbar}}
+    dropdown_button '', icon: 'education', class: 'related' do #, icon: 'eye-open' do
       [
-        menu_item(' children',       'baby-formula', path_opts.merge(:related=>'*children')),
-        menu_item(' mates',          'bed',          path_opts.merge(:related=>'*mates')),
-        menu_item(' references out', 'log-out',      path_opts.merge(:related=>'*refers_to')),
-        menu_item(' references in',  'log-in',       path_opts.merge(:related=>'*referred_to_by'))
+        menu_item(' children',       'baby-formula', path_opts.merge(related: '*children')),
+        menu_item(' mates',          'bed',          path_opts.merge(related: '*mates')),
+        menu_item(' references out', 'log-out',      path_opts.merge(related: '*refers_to')),
+        menu_item(' references in',  'log-in',       path_opts.merge(related: '*referred_to_by'))
       ]
     end
   end
   view :refresh_button do |args|
-    path_opts = {:slot=>{:show=>:toolbar},:page=>card}
+    path_opts = {slot: {show: :toolbar},page: card}
     icon = main? ? 'refresh' : 'new-window'
-    toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', :path_opts=>path_opts)
+    toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', path_opts: path_opts)
   end
 
 
   view :delete_button do |args|
     toolbar_button('delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
-                    :action=>:delete,
-                    :class => 'slotter',
-                    :remote => true,
-                    :path_opts=> {:success => main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted"},
+                    action: :delete,
+                    class: 'slotter',
+                    remote: true,
+                    path_opts: {success: main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted"},
                     :'data-confirm' => "Are you sure you want to delete #{card.name}?"
                   )
   end
@@ -207,19 +207,19 @@ format :html do
     link_text = "#{glyphicon symbol}<span class='menu-item-label #{hide}'>#{text}</span>"
 
     if cardname = tag_args.delete(:page)
-      card_link cardname, :class=>klass, :text=>link_text
+      card_link cardname, class: klass, text: link_text
     elsif viewname = tag_args.delete(:view)
-      tag_args[:path_opts] ||= {:slot=>{:show=>:toolbar}}
+      tag_args[:path_opts] ||= {slot: {show: :toolbar}}
       view_link link_text, viewname, tag_args
     else
       path_opts = tag_args.delete(:path_opts) || {}
-      path_opts.merge! :action=>tag_args.delete(:action) if tag_args[:action]
+      path_opts.merge! action: tag_args.delete(:action) if tag_args[:action]
       link_to link_text, path_opts, tag_args
     end
   end
 
   def autosaved_draft_link
-    view_link('autosaved draft', :edit, :path_opts=>{:edit_draft=>true, :slot=>{:show=>:toolbar}}, :class=>'navbar-link slotter pull-right')
+    view_link('autosaved draft', :edit, path_opts: {edit_draft: true, slot: {show: :toolbar}}, class: 'navbar-link slotter pull-right')
   end
 
 

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

@@ -35,7 +35,7 @@ format :html do
       }
     div =
       content_tag :div, output(yield).html_safe,
-      :id=>card.cardname.url_key, :data=>data, :style=>h(args[:style]), :class=>classes
+      id: card.cardname.url_key, data: data, style: h(args[:style]), class: classes
 
     if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
       name = h card.name
@@ -50,13 +50,13 @@ format :html do
     css_classes = [ 'card-body' ]
     css_classes << args[:body_class]                      if args[:body_class]
     css_classes += [ 'card-content', card.safe_set_keys ] if args[:content]
-    content_tag :div, :class=>css_classes.compact*' ' do
+    content_tag :div, class: css_classes.compact*' ' do
       yield args
     end
   end
 
   def panel args={}
-    wrap_with :div, :class=>"card-frame #{args[:panel_class]}" do
+    wrap_with :div, class: "card-frame #{args[:panel_class]}" do
       output(yield)
     end
   end
@@ -66,7 +66,7 @@ format :html do
       args.delete(:panel_class)
       subframe args, &block
     else
-      show_subheader = show_view?(:toolbar, args.merge(:default_visibility=>:hide)) && @current_view != :related && @current_view != :open
+      show_subheader = show_view?(:toolbar, args.merge(default_visibility: :hide)) && @current_view != :related && @current_view != :open
       wrap args do
         [
           _optional_render( :menu, args ),
@@ -74,7 +74,7 @@ format :html do
             [
               _optional_render( :header, args, :show),
               _optional_render( :subheader, args,(show_subheader ? :show : :hide)),
-              _optional_render( :help, args.merge(:help_class=>'alert alert-info'), :hide),
+              _optional_render( :help, args.merge(help_class: 'alert alert-info'), :hide),
               wrap_body(args) { output( block.call(args) ) } ,
             ]
           end
@@ -86,9 +86,9 @@ format :html do
   def subframe args={}
     wrap args do
       [
-        _optional_render( :menu, args.merge(:optional_horizontal_menu=>:hide) ),
+        _optional_render( :menu, args.merge(optional_horizontal_menu: :hide) ),
         _optional_render( :subheader, args, :show),
-        _optional_render( :help, args.merge(:help_class=>'alert alert-info'), :hide),
+        _optional_render( :help, args.merge(help_class: 'alert alert-info'), :hide),
         panel(args) do
           [
             _optional_render( :header, args, :hide),
@@ -120,7 +120,7 @@ format :html do
           <span aria-hidden="true">&times;</span>
         </button>
       } : ''
-    content_tag :div, :class=>css_class, :role=>'alert' do
+    content_tag :div, class: css_class, role: 'alert' do
       close_button + output( yield args)
     end
   end

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

@@ -60,39 +60,39 @@ format :html do
 end
 
 
-event :validate_accountability, :on=>:create, :before=>:approve do
+event :validate_accountability, on: :create, before: :approve do
   unless left and left.accountable?
     errors.add :content, "not allowed on this card"
   end
 end
 
-event :require_email, :on=>:create, :after=>:approve do
+event :require_email, on: :create, after: :approve do
   unless subcards["+#{Card[:email].name}"]
     errors.add :email, 'required'
   end
 end
 
 
-event :set_default_salt, :on=>:create, :before=>:process_subcards do
+event :set_default_salt, on: :create, before: :process_subcards do
   salt = Digest::SHA1.hexdigest "--#{Time.now.to_s}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
-  subcards["+#{Card[:salt].name}"] ||= { :content => salt }
+  subcards["+#{Card[:salt].name}"] ||= { content: salt }
 end
 
-event :set_default_status, :on=>:create, :before=>:process_subcards do
+event :set_default_status, on: :create, before: :process_subcards do
   default_status = ( Auth.needs_setup? ? 'active' : 'pending' )
-  subcards["+#{Card[:status].name}"] = { :content => default_status }
+  subcards["+#{Card[:status].name}"] = { content: default_status }
 end
 
 def confirm_ok?
-  Card.new( :type_id=>Card.default_accounted_type_id ).ok? :create
+  Card.new( type_id: Card.default_accounted_type_id ).ok? :create
 end
 
-event :generate_confirmation_token, :on=>:create, :before=>:process_subcards, :when=>proc{ |c| c.confirm_ok? } do
-  subcards["+#{Card[:token].name}"] = {:content => generate_token }
+event :generate_confirmation_token, on: :create, before: :process_subcards, when: proc{ |c| c.confirm_ok? } do
+  subcards["+#{Card[:token].name}"] = {content: generate_token }
 end
 
-event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_reset_token? } do
+event :reset_password, on: :update, before: :approve, when: proc{ |c| c.has_reset_token? } do
   case ( result = authenticate_by_token @env_token )
   when Integer
     Auth.signin result
@@ -101,9 +101,9 @@ event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_r
   when :token_expired
     send_reset_password_token
     success << {
-      :id => '_self',
-      :view => 'message',
-      :message => "Sorry, this token has expired. Please check your email for a new password reset link."
+      id: '_self',
+      view: 'message',
+      message: "Sorry, this token has expired. Please check your email for a new password reset link."
     }
     abort :success
   else
@@ -113,9 +113,9 @@ end
 
 def edit_password_success_args
   {
-    :id=>left.name,
-    :view=>:related,
-    :related=>{ :name=>"+#{Card[:account].name}", :view=>'edit' }
+    id: left.name,
+    view: :related,
+    related: { name: "+#{Card[:account].name}", view: 'edit' }
   }
 end
 
@@ -125,26 +125,26 @@ end
 
 event :reset_token do
   Auth.as_bot do
-    token_card.update_attributes! :content => generate_token
+    token_card.update_attributes! content: generate_token
   end
 end
 
 
 event :send_welcome_email do
   if ((welcome = Card['welcome email']) && welcome.type_code == :email_template)
-    welcome.deliver(:context=>left, :to=>self.email)
+    welcome.deliver(context: left, to: self.email)
   end
 end
 
-event :send_account_verification_email, :on=>:create, :after=>:extend, :when=>proc{ |c| c.token.present? } do
-  Card[:verification_email].deliver( :context => self, :to => self.email )
+event :send_account_verification_email, on: :create, after: :extend, when: proc{ |c| c.token.present? } do
+  Card[:verification_email].deliver( context: self, to: self.email )
 end
 
 event :send_reset_password_token do
   Auth.as_bot do
-    token_card.update_attributes! :content => generate_token
+    token_card.update_attributes! content: generate_token
   end
-  Card[:password_reset_email].deliver( :context => self, :to => self.email )
+  Card[:password_reset_email].deliver( context: self, to: self.email )
 end
 
 def ok_to_read
@@ -163,11 +163,11 @@ def send_change_notice act, followed_set, follow_option
   if changes_visible?(act)
     Auth.as(left.id) do
       Card[:follower_notification_email].deliver(
-        :context       => act.card,
-        :to            => email,
-        :follower      => left.name,
-        :followed_set  => followed_set,
-        :follow_option => follow_option
+        context:       act.card,
+        to:            email,
+        follower:      left.name,
+        followed_set:  followed_set,
+        follow_option: follow_option
       )
     end
   end