card 1.16.6 → 1.16.7

data/tmpsets/set/mod007-05_standard/type/session.rb

@@ -10,12 +10,12 @@ def followable?
   false
 end
 
-event :store_in_session, :before=>:approve, :on=>:save, :changed=>:content do
+event :store_in_session, before: :approve, on: :save, changed: :content do
   Env.session[key] = db_content
   self.db_content = ''
 end
 
-event :delete_in_session, :after=>:approve, :on=>:delete do
+event :delete_in_session, after: :approve, on: :delete do
   Env.session[key] = nil
   abort :success
 end

data/tmpsets/set/mod007-05_standard/type/set.rb

@@ -25,14 +25,14 @@ format :html do
   end
 
   view :all_rules do |args|
-    with_label_and_navbars args.merge(:selected_view =>:all_rules) do
+    with_label_and_navbars args.merge(selected_view: :all_rules) do
       rules_table (card.visible_setting_codenames.sort & card.visible_setting_codenames), args
     end
   end
 
   view :grouped_rules do |args|
-    with_label_and_navbars args.merge(:selected_view =>:grouped_rules) do
-      content_tag(:div, :class=>'panel-group', :id=>'accordion', :role=>'tablist','aria-multiselectable'=>'true') do
+    with_label_and_navbars args.merge(selected_view: :grouped_rules) do
+      content_tag(:div, class: 'panel-group', id: 'accordion', role: 'tablist','aria-multiselectable'=>'true') do
          Card::Setting.groups.keys.map do |group_key|
            _optional_render(group_key, args, :show)
          end * "\n"
@@ -41,20 +41,20 @@ format :html do
   end
 
   view :recent_rules do |args|
-    with_label_and_navbars args.merge(:selected_view =>:recent_rules) do
+    with_label_and_navbars args.merge(selected_view: :recent_rules) do
       recent_settings = Card[:recent_settings].item_cards.map(&:codename)
       rules_table (recent_settings.map(&:to_sym) & card.visible_setting_codenames), args
     end
   end
 
   view :common_rules do |args|
-    with_label_and_navbars args.merge(:selected_view =>:common_rules) do
+    with_label_and_navbars args.merge(selected_view: :common_rules) do
       rules_table (card.visible_setting_codenames & [:create, :read, :update, :delete, :structure, :default, :style]), args
     end
   end
 
   view :field_related_rules do |args|
-    with_label_and_navbars args.merge(:selected_view =>:field_related_rules) do
+    with_label_and_navbars args.merge(selected_view: :field_related_rules) do
       field_settings = [:default, :help, :structure]
       field_settings +=  [:input, :options, :options_label] if card.type_id == PointerID
       rules_table (card.visible_setting_codenames & field_settings), args
@@ -62,7 +62,7 @@ format :html do
   end
 
   view :set_label do |args|
-    content_tag :h3, card.label, :class=>'set-label'
+    content_tag :h3, card.label, class: 'set-label'
   end
 
   Card::Setting.groups.keys.each do |group_key|
@@ -73,14 +73,14 @@ format :html do
         heading_id = "heading-#{group_key}"
         collapse_id = "collapse-#{card.cardname.safe_key}-#{group_key}"
         output [
-          (content_tag :div, :class=>'panel panel-default' do
-            content_tag :div, :class=>'panel-heading', :role=>'tab', :id=>heading_id do
-              content_tag :h4, :class=>'panel-title' do
-                content_tag :a, group_name, 'data-toggle'=>'collapse', 'data-parent'=>'#accordion', :href=>"##{collapse_id}", 'aria-expanded'=>'false', 'aria-controls'=>collapse_id
+          (content_tag :div, class: 'panel panel-default' do
+            content_tag :div, class: 'panel-heading', role: 'tab', id: heading_id do
+              content_tag :h4, class: 'panel-title' do
+                content_tag :a, group_name, 'data-toggle'=>'collapse', 'data-parent'=>'#accordion', href: "##{collapse_id}", 'aria-expanded'=>'false', 'aria-controls'=>collapse_id
               end
             end
           end),
-          (content_tag :div, :id=>collapse_id, :class=>'panel-collapse collapse', :role=>'tabpanel', 'aria-labelledby'=>heading_id do
+          (content_tag :div, id: collapse_id, class: 'panel-collapse collapse', role: 'tabpanel', 'aria-labelledby'=>heading_id do
             rules_table settings.map(&:codename), args
           end)
         ]
@@ -89,15 +89,15 @@ format :html do
   end
 
   def rules_table settings, args={}
-    wrap_with :table, :class=>'set-rules table' do
+    wrap_with :table, class: 'set-rules table' do
       [
-        (content_tag(:tr, :class=>"rule-group") do
-          wrap_each_with :th, %w(Trait Content Set), :class=>'rule-heading'
+        (content_tag(:tr, class: "rule-group") do
+          wrap_each_with :th, %w(Trait Content Set), class: 'rule-heading'
         end),
         (settings.map do |setting|
           if show_view? setting, args
-            rule_card = card.fetch(:trait=>setting, :new=>{})
-            nest(rule_card, :view=>:closed_rule).html_safe
+            rule_card = card.fetch(trait: setting, new: {})
+            nest(rule_card, view: :closed_rule).html_safe
           end
         end * "\n")
       ]
@@ -111,13 +111,13 @@ format :html do
   view :template_link do |args|
     args.delete :style
     wrap args do
-      link = view_link args[:inc_syntax], :template_editor, :class=>'slotter' #, 'slot-include'=>include_syntax
+      link = view_link args[:inc_syntax], :template_editor, class: 'slotter' #, 'slot-include'=>include_syntax
       "{{#{link}}}"
     end
   end
 
   view :template_closer do |args|
-    view_link '', :template_link, :class=>'slotter glyphicon glyphicon-remove template-editor-close'
+    view_link '', :template_link, class: 'slotter glyphicon glyphicon-remove template-editor-close'
   end
 
   view :template_editor do |args|
@@ -133,8 +133,8 @@ format :html do
   end
 
   view :template_editor_frame do |args|
-    frame :no_slot=>true, :title=>card.label, :menu_hack=>:template_closer do
-      _render_core args.merge(:hide=>'set_label')
+    frame no_slot: true, title: card.label, menu_hack: :template_closer do
+      _render_core args.merge(hide: 'set_label')
     end
   end
 
@@ -147,16 +147,16 @@ format :html do
     id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
     related_sets =  card.related_sets(true)
     return '' if related_sets.size <= 1
-    navbar id, :toggle=>'Rules<span class="caret"></span>', :toggle_align=>:left,
-               :class=>'slotter toolbar', :navbar_type=>'inverse', :collapsed_content=>close_link(:class=>'pull-right visible-xs') do
+    navbar id, toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
+               class: 'slotter toolbar', navbar_type: 'inverse', collapsed_content: close_link(class: 'pull-right visible-xs') do
       [
-        content_tag(:span, 'Set:', :class=>"navbar-text hidden-xs"),
-        (wrap_with :ul, :class=>'nav navbar-nav nav-pills' do
+        content_tag(:span, 'Set:', class: "navbar-text hidden-xs"),
+        (wrap_with :ul, class: 'nav navbar-nav nav-pills' do
           related_sets.map do |name, label|
-            link = card_link name, :text=>label, :remote=>true,
-              :path_opts => {
-                :view => @slot_view,
-                :slot => {:subheader=>showname(name), :subframe=>true, :hide=>'header set_label rule_navbar', :show=>'subheader set_navbar'}
+            link = card_link name, text: label, remote: true,
+              path_opts: {
+                view: @slot_view,
+                slot: {subheader: showname(name), subframe: true, hide: 'header set_label rule_navbar', show: 'subheader set_navbar'}
               }
             li_pill link, name == card.name
           end
@@ -171,12 +171,12 @@ format :html do
 
   view :rule_navbar do |args|
     id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
-    args.merge!(:path_opts=>{:slot=>{:show=>:rule_navbar}})
-    navbar id, :toggle=>'Rules<span class="caret"></span>', :toggle_align=>:left,
-               :class=>'slotter toolbar', :navbar_type=>'inverse', :collapsed_content=>close_link(:class=>'pull-right visible-xs') do
+    args.merge!(path_opts: {slot: {show: :rule_navbar}})
+    navbar id, toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
+               class: 'slotter toolbar', navbar_type: 'inverse', collapsed_content: close_link(class: 'pull-right visible-xs') do
       [
-        content_tag(:span, 'Rules:', :class=>"navbar-text hidden-xs"),
-        (wrap_with :ul, :class=>'nav navbar-nav nav-pills' do
+        content_tag(:span, 'Rules:', class: "navbar-text hidden-xs"),
+        (wrap_with :ul, class: 'nav navbar-nav nav-pills' do
           [
             (view_link_pill( 'field', :field_related_rules, args) if card.junction?),
             view_link_pill( 'common', :common_rules, args),
@@ -191,7 +191,7 @@ format :html do
 
   def view_link_pill name, view, args
     selected_view = args[:selected_view] || @slot_view || args[:home_view]
-    opts = {:class=>'slotter', :role=>'pill', :path_opts=>args[:path_opts]}
+    opts = {class: 'slotter', role: 'pill', path_opts: args[:path_opts]}
     li_pill view_link(name, view, opts), selected_view == view
   end
 end
@@ -337,14 +337,14 @@ end
 
 def prototype
   opts = subclass_for_set.prototype_args self.cardname.trunk_name
-  Card.fetch opts[:name], :new=>opts
+  Card.fetch opts[:name], new: opts
 end
 
 def related_sets with_self = false
   if subclass_for_set.anchorless?
     prototype.related_sets with_self
   else
-    left(:new=>{}).related_sets with_self
+    left(new: {}).related_sets with_self
   end
 end
 

data/tmpsets/set/mod007-05_standard/type/signup.rb

@@ -2,33 +2,33 @@
 class Card; module Set; module Type; module Signup; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/signup.rb ~~~~~~~~~~~
 
 format :html do
-  
+
   def default_new_args args
     super args
     args.merge!(
-      :optional_help => :show, #, :optional_menu=>:never
-      :buttons => button_tag( 'Submit', :disable_with=>'Submitting', :situation=>'primary' ),
-      :account => card.fetch( :trait=>:account, :new=>{} ),
-      :title   => 'Sign up',
-      :hidden  => {
-        :success => (card.rule(:thanks) || '_self'),
+      optional_help: :show, #, optional_menu: :never
+      buttons: button_tag( 'Submit', disable_with: 'Submitting', situation: 'primary' ),
+      account: card.fetch( trait: :account, new: {} ),
+      title:   'Sign up',
+      hidden:  {
+        success: (card.rule(:thanks) || '_self'),
         'card[type_id]' => card.type_id
       }
     )
-    
+
     if Auth.signed_in? and args[:account].confirm_ok?
       args[:title] = 'Invite'
-      args[:buttons] = button_tag 'Send Invitation', :situation=>'primary'
+      args[:buttons] = button_tag 'Send Invitation', situation: 'primary'
       args[:hidden][:success] = '_self'
     end
   end
-  
+
   view :new do |args|
     #FIXME - make more use of standard new view?
-    
+
     frame_and_form :create, args, 'main-success'=>"REDIRECT" do
       [
-        _render_name_formgroup( :help=>'usually first and last name' ),
+        _render_name_formgroup( help: 'usually first and last name' ),
         _optional_render( :account_formgroups, args),
         ( card.structure ? edit_slot : ''),
         _optional_render( :button_formgroup, args )
@@ -38,7 +38,7 @@ format :html do
 
 
   view :account_formgroups do |args|
-    sub_args = { :structure => true }
+    sub_args = { structure: true }
     sub_args[:no_password] = true if Auth.signed_in?
     Auth.as_bot { subformat( args[:account] )._render :content_formgroup, sub_args }  #YUCK!!!!
   end
@@ -70,16 +70,16 @@ format :html do
     %{<div class="invite-links">
         #{ headings.map { |h| "<div>#{h}</div>"} * "\n" }
       </div>
-      #{ process_content render_raw }    
+      #{ process_content render_raw }
     }
   end
 end
 
-event :activate_by_token, :before=>:approve, :on=>:update, :when=>proc{ |c| c.has_token? } do
+event :activate_by_token, before: :approve, on: :update, when: proc{ |c| c.has_token? } do
   result = account ? account.authenticate_by_token( @env_token ) : "no account associated with #{name}"
   case result
   when Integer
-    abort :failure, 'no field manipulation mid-activation' if subcards.present? 
+    abort :failure, 'no field manipulation mid-activation' if subcards.present?
     # necessary because the rest of the action is performed as Wagn Bot
     activate_account
     Auth.signin id
@@ -103,13 +103,13 @@ event :activate_account do
   account.send_welcome_email
 end
 
-event :approve_with_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_with_token] } do
+event :approve_with_token, on: :update, before: :approve, when: proc {|c| Env.params[:approve_with_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   account.reset_token
   account.send_account_verification_email
 end
 
-event :approve_without_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_without_token] } do
+event :approve_without_token, on: :update, before: :approve, when: proc {|c| Env.params[:approve_without_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   activate_account
 end
@@ -118,9 +118,9 @@ event :resend_activation_token do
   account.reset_token
   account.send_account_verification_email
   Env.params[: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."
   }
 end
 
@@ -128,11 +128,11 @@ def signed_in_as_me_without_password?
   Auth.signed_in? && Auth.current_id==id && account.password.blank?
 end
 
-event :redirect_to_edit_password, :on=>:update, :after=>:store, :when=>proc {|c| c.signed_in_as_me_without_password? } do
-  Env.params[:success] = account.edit_password_success_args  
+event :redirect_to_edit_password, on: :update, after: :store, when: proc {|c| c.signed_in_as_me_without_password? } do
+  Env.params[:success] = account.edit_password_success_args
 end
 
-event :preprocess_account_subcards, :before=>:process_subcards, :on=>:create do
+event :preprocess_account_subcards, before: :process_subcards, on: :create do
   #FIXME: use codenames!
   email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')
   subcards['+*account'] ||={}
@@ -140,7 +140,7 @@ event :preprocess_account_subcards, :before=>:process_subcards, :on=>:create do
   subcards['+*account']['+*password' ]=password if password
 end
 
-event :act_as_current_for_extend_phase, :before=>:extend, :on=>:create do
+event :act_as_current_for_extend_phase, before: :extend, on: :create do
   Auth.current_id = self.id
 end
 

data/tmpsets/set/mod007-05_standard/type/uri.rb

@@ -4,7 +4,7 @@ format do
   include Phrase::Format
 
   view :core do |args|
-    web_link _render_raw(args), :text=> render_title(args)
+    web_link _render_raw(args), text: render_title(args)
   end
 
   view :url_link do |args|

data/tmpsets/set/mod007-05_standard/type/user.rb

@@ -7,31 +7,31 @@ attr_accessor :email
 
 format :html do
 
-  view :setup, :tags=>:unknown_ok, :perms=>lambda { |r| Auth.needs_setup? } do |args|
+  view :setup, tags: :unknown_ok, perms: lambda { |r| Auth.needs_setup? } do |args|
     help_text = '<h3>To get started, set up an account.</h3>'
-    if Card.config.action_mailer.perform_deliveries == false 
+    if Card.config.action_mailer.perform_deliveries == false
       help_text += '<br>WARNING: Email delivery is turned off. Change settings in config/application.rb to send sign up notifications.'
     end
     args.merge!( {
-      :title=>'Welcome, Wagneer!',
-      :optional_help=>:show,
-      :optional_menu=>:never, 
-      :help_text=>help_text,
-      :buttons => button_tag( 'Set up', :disable_with=>'Setting up', :situation=>'primary' ),
-      :hidden => { 
-        :success => "REDIRECT: #{ Card.path_setting '/' }",
+      title: 'Welcome, Wagneer!',
+      optional_help: :show,
+      optional_menu: :never,
+      help_text: help_text,
+      buttons: button_tag( 'Set up', disable_with: 'Setting up', situation: 'primary' ),
+      hidden: {
+        success: "REDIRECT: #{ Card.path_setting '/' }",
         'card[type_id]' => Card.default_accounted_type_id,
         'setup'=>true
       }
     } )
 
-    account = card.fetch :trait=>:account, :new=>{}
+    account = card.fetch trait: :account, new: {}
 
     Auth.as_bot do
       frame_and_form :create, args do
         [
-          _render_name_formgroup( :help=>'usually first and last name' ),
-          subformat(account)._render( :content_formgroup, :structure=>true ), 
+          _render_name_formgroup( help: 'usually first and last name' ),
+          subformat(account)._render( :content_formgroup, structure: true ),
           _render_button_formgroup( args )
         ]
       end
@@ -40,30 +40,30 @@ format :html do
 end
 
 
-event :setup_as_bot, :before=>:check_permissions, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
-  abort :failure unless Auth.needs_setup? 
+event :setup_as_bot, before: :check_permissions, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
+  abort :failure unless Auth.needs_setup?
   Auth.as_bot
   # we need bot authority to set the initial administrator roles
-  # this is granted and inspected here as a separate event for 
+  # this is granted and inspected here as a separate event for
   # flexibility and security when configuring initial setups
-end  
+end
 
-event :setup_first_user, :before=>:process_subcards, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
+event :setup_first_user, before: :process_subcards, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
   subcards['signup alert email+*to'] = name
-  subcards['+*roles'] = { :content => Card[:administrator].name }
-  
+  subcards['+*roles'] = { content: Card[:administrator].name }
+
   email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')
   subcards['+*account'] = { '+*email'=>email, '+*password'=>password }
 end
 
-event :signin_after_setup, :before=>:extend, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
+event :signin_after_setup, before: :extend, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
   Card.cache.delete Auth::NEED_SETUP_KEY
   Auth.signin id
 end
 
 def follow follow_name, option = '*always'
   if (card = Card.fetch(follow_name)) && (set_card = card.default_follow_set_card)
-    if (follow_rule = Card.fetch(set_card.follow_rule_name(name), :new=>{}))
+    if (follow_rule = Card.fetch(set_card.follow_rule_name(name), new: {}))
       follow_rule.drop_item "*never"
       follow_rule.add_item option
       follow_rule.save!

data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/helper.rb

@@ -2,14 +2,14 @@
 class Card; module Set; module All; module Bootstrap; module Helper; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/bootstrap/helper.rb ~~~~~~~~~~~
 format :html do
   def glyphicon icon_type, extra_class=''
-    content_tag(:span, '', :class=>"glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)
+    content_tag(:span, '', class: "glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)
   end
 
   def button_link link_text, target, html_args={}
     html_args[:class] ||= ''
     btn_type = html_args[:btn_type] || 'primary'
     html_args[:class] +=  " btn btn-#{btn_type}"
-    smart_link link_text, target, html_args.merge(:type=>'button')
+    smart_link link_text, target, html_args.merge(type: 'button')
   end
 
   def dropdown_button name, opts={}
@@ -54,7 +54,7 @@ format :html do
   end
 
   def breadcrumb items
-    content_tag :ol, :class=>'breadcrumb' do
+    content_tag :ol, class: 'breadcrumb' do
       items.map do |item|
         content_tag :li, item
       end
@@ -62,7 +62,7 @@ format :html do
   end
 
   # Options
-  # :header => { :content=>String, :brand=>( String | {:name=>, :href=>} ) }
+  # header: { content: String, brand: ( String | {name: , href: } ) }
   def navbar id, opts={}
     nav_opts = opts[:navbar_opts] || {}
     nav_opts[:class] ||= (opts[:class] || '')
@@ -75,9 +75,9 @@ format :html do
     end
     wrap_with :nav, nav_opts do
       [
-        navbar_header(id, header_opts.delete(:content), header_opts.reverse_merge(:toggle=>opts[:toggle])),
-        (content_tag(:div, opts[:collapsed_content].html_safe, :class=>'container-fluid') if opts[:collapsed_content]),
-        content_tag(:div, output(yield).html_safe, :class=>"collapse navbar-collapse", :id=>"navbar-collapse-#{id}"),
+        navbar_header(id, header_opts.delete(:content), header_opts.reverse_merge(toggle: opts[:toggle])),
+        (content_tag(:div, opts[:collapsed_content].html_safe, class: 'container-fluid') if opts[:collapsed_content]),
+        content_tag(:div, output(yield).html_safe, class: "collapse navbar-collapse", id: "navbar-collapse-#{id}"),
       ]
     end
   end
@@ -91,7 +91,7 @@ format :html do
                 "<a class='navbar-brand' href='#{link}#'>#{opts[:brand][:name]}</a>"
               end
             end
-    wrap_with :div, :class=>'navbar-header' do
+    wrap_with :div, class: 'navbar-header' do
       [
         (navbar_toggle(id, opts[:toggle]) unless opts[:toggle] == :hide),
         brand,
@@ -118,10 +118,10 @@ format :html do
     items = yield
     args[:situation] ||= 'primary'
 
-    wrap_with :div, :class=>'btn-group' do
+    wrap_with :div, class: 'btn-group' do
       [
         button,
-        button_tag(:situation=>args[:situation], :class=>'dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-haspopup'=>'true', 'aria-expanded'=>'false') do
+        button_tag(situation: args[:situation], class: 'dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-haspopup'=>'true', 'aria-expanded'=>'false') do
           %{
             <span class="caret"></span>
             <span class="sr-only">Toggle Dropdown</span>