card 1.16.6 → 1.16.7

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

@@ -13,17 +13,17 @@ end
 
 view :core, :raw
 
-event :validate_email, :after=>:approve, :on=>:save do
+event :validate_email, after: :approve, on: :save do
   if content.present? && content !~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
     errors.add :content, 'must be valid address'
   end
 end
 
-event :validate_unique_email, :after=>:validate_email, :on=>:save do
+event :validate_unique_email, after: :validate_email, on: :save do
   if content.present?
     Auth.as_bot do
-      wql = { :right_id=>Card::EmailID, :eq=>content }
-      wql[:not] = { :id => id } if id
+      wql = { right_id: Card::EmailID, eq: content }
+      wql[:not] = { id: id } if id
       if Card.search( wql ).first
         errors.add :content, 'must be unique'
       end
@@ -31,7 +31,7 @@ event :validate_unique_email, :after=>:validate_email, :on=>:save do
   end
 end
 
-event :downcase_email, :before=>:approve, :on=>:save do
+event :downcase_email, before: :approve, on: :save do
   if content and content != content.downcase
     self.content = content.downcase
   end

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

@@ -6,15 +6,15 @@ include All::Permissions::Accounts
 view :editor do |args|
   card.content = ''
   autocomplete = (@parent && @parent.card.name=='*signin+*account') ? 'on' : 'off' #hack
-  password_field :content, :class=>'card-content', :autocomplete=>autocomplete
+  password_field :content, class: 'card-content', autocomplete: autocomplete
 end
 
 view :raw do |args|
   '<em>encrypted</em>'
 end
 
-event :encrypt_password, :on=>:save, :after=>:process_subcards, :changed=>:content,
-    :when => proc{ |c| !Card::Env[:no_password_encryptions] } do
+event :encrypt_password, on: :save, after: :process_subcards, changed: :content,
+    when: proc{ |c| !Card::Env[:no_password_encryptions] } do
       # no_password_encryptions = hack for import - fix with api for ignoring events
 
   salt = (left && left.salt)
@@ -25,13 +25,13 @@ event :encrypt_password, :on=>:save, :after=>:process_subcards, :changed=>:conte
   #  turns out we have a lot of existing account without a salt.  not sure when that broke??
 end
 
-event :validate_password, :on=>:save, :before=>:approve do
+event :validate_password, on: :save, before: :approve do
   unless content.length > 3
     errors.add :password, 'must be at least 4 characters'
   end
 end
 
-event :validate_password_present, :on=>:update, :before=>:approve do
+event :validate_password_present, on: :update, before: :approve do
   abort :success if content.blank?
 end
 

data/tmpsets/set/mod007-05_standard/rstar/rules.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Rstar; module Rules; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/rstar/rules.rb ~~~~~~~~~~~
-event :save_recently_edited_settings, :before=>:extend, :on=>:save, :when=>proc{|c| c.is_rule? } do
+event :save_recently_edited_settings, before: :extend, on: :save, when: proc{|c| c.is_rule? } do
   if (recent = Card[:recent_settings])
     recent.insert_item 0, cardname.right
     recent.save
@@ -9,19 +9,19 @@ end
 
 format :html do
 
-  view :closed_rule, :tags=>:unknown_ok do |args|
+  view :closed_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule? #these are helpful for handling non-rule rstar cards until we have real rule sets
 
     rule_card = find_current_rule_card
 
     rule_content = !rule_card ? '' : begin
-      subformat(rule_card)._render_closed_content :set_context=>card.cardname.trunk_name
+      subformat(rule_card)._render_closed_content set_context: card.cardname.trunk_name
     end
 
     cells = [
       ["rule-setting",
-        link_to( card.cardname.tag.sub(/^\*/,''), path(:view=>:open_rule),
-          :class => 'edit-rule-link slotter', :remote => true, :rel=>'nofollow' )
+        link_to( card.cardname.tag.sub(/^\*/,''), path(view: :open_rule),
+          class: 'edit-rule-link slotter', remote: true, rel: 'nofollow' )
       ],
       ["rule-content",
         %{<div class="rule-content-container">
@@ -40,7 +40,7 @@ format :html do
   end
 
 
-  view :open_rule, :tags=>:unknown_ok do |args|
+  view :open_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
     current_rule = args[:current_rule]
     setting_name = args[:setting_name]
@@ -59,8 +59,8 @@ format :html do
     end
 
     opts = {
-      :rule_context => card,   # determines the set options and the success view
-      :set_context  => card.rule_set_name,
+      rule_context: card,   # determines the set options and the success view
+      set_context:  card.rule_set_name,
     }
     rule_view = edit_mode ? :edit_rule : :show_rule
 
@@ -68,8 +68,8 @@ format :html do
       <tr class="card-slot open-rule #{rule_view.to_s.sub '_', '-'}">
         <td class="rule-cell" colspan="3">
           <div class="rule-setting">
-            #{ view_link setting_name.sub(/^\*/,''), :closed_rule, :class=>'close-rule-link slotter' }
-            #{ card_link setting_name, :text=>"all #{setting_name} rules", :class=>'setting-link', :target=>'wagn_setting' }
+            #{ view_link setting_name.sub(/^\*/,''), :closed_rule, class: 'close-rule-link slotter' }
+            #{ card_link setting_name, text: "all #{setting_name} rules", class: 'setting-link', target: 'wagn_setting' }
           </div>
 
           <div class="alert alert-info rule-instruction">
@@ -86,13 +86,13 @@ format :html do
 
   def default_open_rule_args args
     current_rule_card = find_current_rule_card || begin
-      Card.new :name=> "#{Card[:all].name}+#{card.rule_user_setting_name}"
+      Card.new name: "#{Card[:all].name}+#{card.rule_user_setting_name}"
     end
 
-    args.reverse_merge! :current_rule => current_rule_card, :setting_name => card.rule_setting_name
+    args.reverse_merge! current_rule: current_rule_card, setting_name: card.rule_setting_name
   end
 
-  view :show_rule, :tags=>:unknown_ok do |args|
+  view :show_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
 
     if !card.new_card?
@@ -100,7 +100,7 @@ format :html do
       args[:item] ||= :link
       %{
         <div class="rule-set">
-          <label>Applies to</label> #{ card_link set.cardname, :text=>set.label }:
+          <label>Applies to</label> #{ card_link set.cardname, text: set.label }:
         </div>
         #{ _render_core args }
       }
@@ -109,10 +109,10 @@ format :html do
     end
   end
 
-  view :edit_rule, :tags=>:unknown_ok do |args|
+  view :edit_rule, tags: :unknown_ok do |args|
     return 'not a rule' if !card.is_rule?
-    form_args = { :url=>path(:action=>:update, :no_id=>true),
-       :html=> {:class=>"card-form card-rule-form" } }
+    form_args = { url: path(action: :update, no_id: true),
+       html: {class: "card-form card-rule-form" } }
     if args[:remote]
       form_args[:remote] = true
       form_args[:html][:class] += ' slotter'
@@ -128,7 +128,7 @@ format :html do
     end
   end
 
-  view :related_edit_rule, :view=>:edit_rule
+  view :related_edit_rule, view: :edit_rule
 
   def default_edit_rule_args args
     args[:remote]       ||= true
@@ -139,40 +139,40 @@ format :html do
 
     args[:success] ||= {}
     args[:success].reverse_merge!( {
-      :card => args[:rule_context],
-      :id   => args[:rule_context].cardname.url_key,
-      :view => 'open_rule',
-      :item => 'view_rule'
+      card: args[:rule_context],
+      id:   args[:rule_context].cardname.url_key,
+      view: 'open_rule',
+      item: 'view_rule'
     })
 
     args[:delete_button] ||= delete_button args
     args[:cancel_button] ||=
       begin
-        cancel_path = path :view=>( card.new_card? ? :closed_rule : :open_rule ), :success=>false
-        button_tag( 'Cancel', :class=>'rule-cancel-button slotter', :type=>'button',
-                          :href=>cancel_path )
+        cancel_path = path view: ( card.new_card? ? :closed_rule : :open_rule ), success: false
+        button_tag( 'Cancel', class: 'rule-cancel-button slotter', type: 'button',
+                          href: cancel_path )
       end
   end
 
   def default_related_edit_rule_args args
     args[:remote]  ||= false
     args[:success] ||= {
-        :card => args[:parent] || card,
-        :id => (args[:parent] && args[:parent].cardname.url_key) || card.cardname.url_key,
-        :view => :open,
-        :item => nil
+        card: args[:parent] || card,
+        id: (args[:parent] && args[:parent].cardname.url_key) || card.cardname.url_key,
+        view: :open,
+        item: nil
       }
     default_edit_rule_args args
     args[:delete_button] = delete_button args, '.card-slot.related-view'
-    args[:cancel_button] = card_link( args[:success][:id], :text=>'Cancel',
-      :class=>'rule-cancel-button btn btn-default', :path_opts=>{:view=>args[:success][:view]} )
+    args[:cancel_button] = card_link( args[:success][:id], text: 'Cancel',
+      class: 'rule-cancel-button btn btn-default', path_opts: {view: args[:success][:view]} )
   end
 
   def delete_button args, slot_selector=nil
     if !card.new_card?
-      b_args = { :remote=>true, :class=>'rule-delete-button slotter', :type=>'button' }
+      b_args = { remote: true, class: 'rule-delete-button slotter', type: 'button' }
       b_args['data-slot-selector'] = slot_selector if slot_selector
-      b_args[:href] = path :action=>:delete, :success=>args[:success]
+      b_args[:href] = path action: :delete, success: args[:success]
       if (fset = args[:fallback_set]) && (fcard = Card.fetch(fset))
         b_args['data-confirm']="Deleting will revert to #{card.rule_setting_name} rule for #{fcard.label }"
       end
@@ -183,10 +183,10 @@ format :html do
   # used keys for args:
   # :success,  :set_selected, :set_options, :rule_context
   def editor args
-    wrap_with( :div, :class=>'card-editor' ) do
+    wrap_with( :div, class: 'card-editor' ) do
       [
         (type_formgroup( args ) if card.right.rule_type_editable),
-        formgroup( 'rule', content_field( form, args.merge(:skip_rev_id=>true) ), :editor=>'content' ),
+        formgroup( 'rule', content_field( form, args.merge(skip_rev_id: true) ), editor: 'content' ),
         set_selection( args )
       ]
     end
@@ -195,10 +195,10 @@ format :html do
 
   def type_formgroup args
     formgroup 'type', type_field(
-      :href         => path(:name=>args[:success][:card].name, :view=>args[:success][:view], :type_reload=>true),
-      :class        => 'type-field rule-type-field live-type-field',
+      href:         path(name: args[:success][:card].name, view: args[:success][:view], type_reload: true),
+      class:        'type-field rule-type-field live-type-field',
       'data-remote' => true
-    ), :editor=>'type'
+    ), editor: 'type'
   end
 
 
@@ -211,7 +211,7 @@ format :html do
   end
 
   def set_selection args
-    wrap_with( :div, :class=>'row') do
+    wrap_with( :div, class: 'row') do
       [
         set_formgroup( args ),
         related_set_formgroup( args)
@@ -224,7 +224,7 @@ format :html do
     tag = args[:rule_context].rule_user_setting_name
     narrower_rules = []
     option_list =
-      wrap_each_with :li, :class=>'radio' do
+      wrap_each_with :li, class: 'radio' do
         args[:set_options].map do |set_name, state|
 
           checked    = ( args[:set_selected] == set_name or current_set_key && args[:set_options].length==1 )
@@ -239,17 +239,17 @@ format :html do
              narrower_rules.last[0] = narrower_rules.last[0].downcase
           end
           rule_name  = "#{set_name}+#{tag}"
-          radio_button( :name, rule_name, :checked=>checked, :warning=>warning ) + %{
+          radio_button( :name, rule_name, checked: checked, warning: warning ) + %{
               <label class="set-label" #{'current-set-label' if is_current }>
-                #{ card_link set_name, :text=> Card.fetch(set_name).label, :target=>'wagn_set' }
+                #{ card_link set_name, text: Card.fetch(set_name).label, target: 'wagn_set' }
                 #{'<em>(current)</em>' if is_current }
-                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", :text=>"(overwritten)"}</em>" if state == :overwritten }
+                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", text: "(overwritten)"}</em>" if state == :overwritten }
               </label>
              }.html_safe
          end
 
        end
-    formgroup 'set', "<ul>#{ option_list }</ul>", :editor => 'set', :class=>'col-xs-6'
+    formgroup 'set', "<ul>#{ option_list }</ul>", editor: 'set', class: 'col-xs-6'
   end
 
   def related_set_formgroup args
@@ -257,26 +257,26 @@ format :html do
     return '' unless related_sets && related_sets.size > 0
     tag = args[:rule_context].rule_user_setting_name
     option_list =
-      wrap_each_with :li, :class=>'radio' do
+      wrap_each_with :li, class: 'radio' do
         related_sets.map do |set_name, label|
           rule_name  = "#{set_name}+#{tag}"
-          rule_card  = Card.fetch rule_name, :skip_modules=>true
+          rule_card  = Card.fetch rule_name, skip_modules: true
           radio_button( :name, rule_name) + %{
               <label class="set-label">
-                #{ card_link set_name, :text=>label, :target=>'wagn_set' }
-                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", :text=>"(exists)"}</em>" if rule_card}
+                #{ card_link set_name, text: label, target: 'wagn_set' }
+                #{"<em> #{card_link "#{set_name}+#{card.rule_user_setting_name}", text: "(exists)"}</em>" if rule_card}
               </label>
              }.html_safe
         end
       end
-    formgroup 'related set', "<ul>#{ option_list }</ul>", :editor => 'set', :class=>'col-xs-6'
+    formgroup 'related set', "<ul>#{ option_list }</ul>", editor: 'set', class: 'col-xs-6'
   end
 
   def edit_buttons  args
-    wrap_with( :div, :class=>'button-area' ) do
+    wrap_with( :div, class: 'button-area' ) do
      [
        args[:delete_button],
-       button_tag( 'Submit', :class=>'rule-submit-button', :situation=>'primary' ),
+       button_tag( 'Submit', class: 'rule-submit-button', situation: 'primary' ),
        args[:cancel_button]
      ]
     end
@@ -306,7 +306,7 @@ format :html do
     # and returns that member's ACTUAL rule for the POTENTIAL rule's setting
     if card.new_card?
       if setting = card.right
-        card.set_prototype.rule_card setting.codename, :user=>card.rule_user
+        card.set_prototype.rule_card setting.codename, user: card.rule_user
       end
     else
       card

data/tmpsets/set/mod007-05_standard/self/account_links.rb

@@ -12,39 +12,39 @@ format :html do
       optional_render( :sign_in, args)
     ]
   end
-  
+
   #ENGLISH below
-  view :sign_up, :perms=>lambda { |r| !Auth.signed_in? && Card.new(:type_id=>Card::SignupID).ok?(:create) }, 
-                 :denial=>:blank do |args|
-    link_to( 'Sign up', card_path('account/signup'), :id=>'signup-link' )
-  end
-  
-  view :sign_in, :perms=>lambda { |r| !Auth.signed_in? },
-                 :denial=>:blank do |args|
-    link_to( 'Sign in', card_path(':signin'), :id=>'signin-link' )
-  end
-  
-  view :invite, :perms=>lambda { |r|  Auth.signed_in? && Card.new(:type_id=>Card.default_accounted_type_id).ok?(:create) },
-                :denial=>:blank do |args|
-    link_to( 'Invite', card_path('account/signup'), :id=>'invite-a-friend-link' )
-  end
-  
-  view :sign_out, :perms=>lambda { |r| Auth.signed_in? },
-                  :denial=>:blank do |args|
-    link_to( 'Sign out', card_path('delete/:signin'), :id=>'signout-link' )
-  end 
-  
-  view :my_card, :perms=>lambda { |r| Auth.signed_in? },
-                 :denial=>:blank do |args|
-    card_link( Auth.current.cardname, :id=>'my-card-link' )
-  end
-  
+  view :sign_up, perms: lambda { |r| !Auth.signed_in? && Card.new(type_id: Card::SignupID).ok?(:create) },
+                 denial: :blank do |args|
+    link_to( 'Sign up', card_path('account/signup'), id: 'signup-link' )
+  end
+
+  view :sign_in, perms: lambda { |r| !Auth.signed_in? },
+                 denial: :blank do |args|
+    link_to( 'Sign in', card_path(':signin'), id: 'signin-link' )
+  end
+
+  view :invite, perms: lambda { |r|  Auth.signed_in? && Card.new(type_id: Card.default_accounted_type_id).ok?(:create) },
+                denial: :blank do |args|
+    link_to( 'Invite', card_path('account/signup'), id: 'invite-a-friend-link' )
+  end
+
+  view :sign_out, perms: lambda { |r| Auth.signed_in? },
+                  denial: :blank do |args|
+    link_to( 'Sign out', card_path('delete/:signin'), id: 'signout-link' )
+  end
+
+  view :my_card, perms: lambda { |r| Auth.signed_in? },
+                 denial: :blank do |args|
+    card_link( Auth.current.cardname, id: 'my-card-link' )
+  end
+
   view :raw do |args|
     item_links(args).join ' '
   end
 
   view :core do |args|
-    content_tag :span, :id=>'logging' do
+    content_tag :span, id: 'logging' do
       render_raw args
     end
   end

data/tmpsets/set/mod007-05_standard/self/all.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module All; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/all.rb ~~~~~~~~~~~
 
-event :admin_tasks, :on=>:update, :before=>:approve do
+event :admin_tasks, on: :update, before: :approve do
   if task = Env.params[:task]
     if Auth.always_ok?
       case task.to_sym

data/tmpsets/set/mod007-05_standard/self/head.rb

@@ -32,7 +32,7 @@ format :html do
     bits = []
     [:favicon, :logo].each do |name|
       if c = Card[name] and c.type_id == ImageID and !c.db_content.blank?
-        bits << %{<link rel="shortcut icon" href="#{ subformat(c)._render_source :size=>:small }" />}
+        bits << %{<link rel="shortcut icon" href="#{ subformat(c)._render_source size: :small }" />}
         break
       end
     end
@@ -40,12 +40,12 @@ format :html do
     #Universal Edit Button
     if root.card
       if !root.card.new_record? && root.card.ok?(:update)
-        bits << %{<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="#{ root.path :view=>:edit }"/>}
+        bits << %{<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="#{ root.path view: :edit }"/>}
       end
 
       # RSS # move to mods!
       if root.card.type_id == SearchTypeID
-        opts = { :format => :rss }
+        opts = { format: :rss }
         root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
         bits << %{<link rel="alternate" type="application/rss+xml" title="RSS" href=#{page_path root.card.cardname, opts} />}
       end
@@ -58,7 +58,7 @@ format :html do
     style_card   = Card[manual_style] if manual_style
     style_card ||= root.card.rule_card :style
     @css_path = if params[:debug] == 'style'
-      page_path( style_card.cardname, :item => :import, :format => :css)
+      page_path( style_card.cardname, item: :import, format: :css)
     elsif style_card
       card_path style_card.machine_output_url
     end
@@ -82,7 +82,7 @@ format :html do
     script_card ||= root.card.rule_card :script
 
     @js_tag = if params[:debug] == 'script'
-      script_card.format(:js).render_core :item => :include_tag
+      script_card.format(:js).render_core item: :include_tag
     elsif script_card
       javascript_include_tag script_card.machine_output_url
     end