card 1.16.6 → 1.16.7

data/mod/05_standard/set/self/account_links.rb

@@ -10,39 +10,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/mod/05_standard/set/self/all.rb

@@ -1,5 +1,5 @@
 
-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/mod/05_standard/set/self/head.rb

@@ -30,7 +30,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
@@ -38,12 +38,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
@@ -56,7 +56,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
@@ -80,7 +80,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

data/mod/05_standard/set/self/navbox.rb

@@ -1,33 +1,33 @@
 
 format :html do
-  
+
   view :raw do |args|
-    input_args = { :class=>'navbox form-control' }
+    input_args = { class: 'navbox form-control' }
     @@placeholder ||= begin
       p = Card["#{Card[:navbox].name}+*placeholder"] and p.raw_content
     end
     input_args[:placeholder] = @@placeholder if @@placeholder
-    
-    content_tag :div, :class=>'form-group' do
+
+    content_tag :div, class: 'form-group' do
       text_field_tag :_keyword, '', input_args
     end
   end
-  
+
   view :navbar_left do |args|
-    _render_core args.merge(:navbar_class=>'navbar-form navbar-left')
+    _render_core args.merge(navbar_class: 'navbar-form navbar-left')
   end
-  
+
   view :navbar_right do |args|
-    _render_core args.merge(:navbar_class=>'navbar-form navbar-right')
+    _render_core args.merge(navbar_class: 'navbar-form navbar-right')
   end
-  
+
   view :core do |args|
-    tag_args = { :method=>'get', :role=>'search', :class=>"nodblclick navbox-form #{args[:navbar_class]}"}
+    tag_args = { method: 'get', role: 'search', class: "nodblclick navbox-form #{args[:navbar_class]}"}
     form_tag Card.path_setting('/:search'), tag_args do
       _render_raw args
     end
 
   end
-  
+
 end
 

data/mod/05_standard/set/self/recent.rb

@@ -1,6 +1,6 @@
 
 view :title do |args|
-   super args.merge( :title=>'Recent Changes' )
+   super args.merge( title: 'Recent Changes' )
 end
 
 format :html do
@@ -32,7 +32,7 @@ format :html do
                  cards_by_day[day].map do |card|
                    %{
                      <div class="search-result-item item-#{ search_vars[:item] }">
-                      #{ nest(card, :view=>search_vars[:item]) }
+                      #{ nest(card, view: search_vars[:item]) }
                     </div>
                    }
                  end * ' '

data/mod/05_standard/set/self/search.rb

@@ -1,10 +1,10 @@
 
 format :html do
-  
+
   view :title do |args|
     vars = root.search_params[:vars]
     if vars && vars[:keyword]
-       args.merge! :title=> %{Search results for: <span class="search-keyword">#{ vars[:keyword] }</span>}
+       args.merge! title: %{Search results for: <span class="search-keyword">#{ vars[:keyword] }</span>}
     end
     super args
   end
@@ -19,25 +19,25 @@ format :json do
       term = main+term
     end
 
-    exact = Card.fetch term, :new=>{}
+    exact = Card.fetch term, new: {}
     goto_cards = Card.search goto_wql(term)
-    goto_cards.unshift exact.name if exact.known? && !goto_cards.map{|n| n.to_name.key}.include?(exact.key) 
+    goto_cards.unshift exact.name if exact.known? && !goto_cards.map{|n| n.to_name.key}.include?(exact.key)
 
     {
-      :search => true, # card.ok?( :read ),
-      :add    => (exact.new_card? && exact.cardname.valid? && !exact.virtual? && exact.ok?( :create ) && exact.name),
-      :new    => (exact.type_id==Card::CardtypeID &&
-                  Card.new(:type_id=>exact.type_id).ok?(:create) &&
+      search: true, # card.ok?( :read ),
+      add:    (exact.new_card? && exact.cardname.valid? && !exact.virtual? && exact.ok?( :create ) && exact.name),
+      new:    (exact.type_id==Card::CardtypeID &&
+                  Card.new(type_id: exact.type_id).ok?(:create) &&
                   [exact.name, exact.cardname.url_key]
                  ),
-      :goto   => goto_cards.map { |name| [name, highlight(name, term), name.to_name.url_key] }
+      goto:   goto_cards.map { |name| [name, highlight(name, term), name.to_name.url_key] }
     }
-  
+
   end
-  
+
   #hacky.  here for override
   def goto_wql(term)
-   { :complete=>term, :limit=>8, :sort=>'name', :return=>'name' }
+   { complete: term, limit: 8, sort: 'name', return: 'name' }
   end
-  
+
 end

data/mod/05_standard/set/self/signin.rb

@@ -2,7 +2,7 @@
 format :html do
 
   view :open do |args|
-    args.merge! :optional_help=>:show
+    args.merge! optional_help: :show
     super args
   end
 
@@ -20,26 +20,26 @@ format :html do
   end
 
   def default_core_args args={}
-    args[:buttons] = button_tag 'Sign in', :situation=>'primary'
-    if Card.new(:type_id=>Card::SignupID).ok? :create
+    args[:buttons] = button_tag 'Sign in', situation: 'primary'
+    if Card.new(type_id: Card::SignupID).ok? :create
       args[:buttons] += link_to( '...or sign up!', card_path("account/signup"))
     end
-    args[:buttons] += raw("<div style='float:right'>#{ view_link 'RESET PASSWORD', :edit, :path_opts=>{:slot=>{:hide=>:toolbar}} }</div>") #FIXME - hardcoded styling
+    args[:buttons] += raw("<div style='float:right'>#{ view_link 'RESET PASSWORD', :edit, path_opts: {slot: {hide: :toolbar}} }</div>") #FIXME - hardcoded styling
     args
   end
 
   view :core do |args|
-    account = card.fetch :trait=>:account, :new=>{}
+    account = card.fetch trait: :account, new: {}
     form_args = {
-      :hidden => { :success=>"REDIRECT: #{Env.interrupted_action || '*previous'}" },
-      :recaptcha => :off
+      hidden: { success: "REDIRECT: #{Env.interrupted_action || '*previous'}" },
+      recaptcha: :off
     }
 
     with_inclusion_mode :edit do
       card_form :update, form_args do
         [
           Auth.as_bot do
-            subformat(account)._render :content_formgroup, :structure=>true, :items=>{:autocomplete=>'on'}
+            subformat(account)._render :content_formgroup, structure: true, items: {autocomplete: 'on'}
           end,
           _optional_render( :button_formgroup, args )
         ].join
@@ -50,13 +50,13 @@ format :html do
   #FORGOT PASSWORD
   view :edit do |args|
     args.merge!( {
-      :title=>'Forgot Password',
-      :optional_help=>:hide,
-      :buttons => button_tag( 'Reset my password', :situation=>'primary' ),
-      :structure => true,
-      :hidden => {
-        :reset_password => true,
-        :success => { :view => :reset_password_success }
+      title: 'Forgot Password',
+      optional_help: :hide,
+      buttons: button_tag( 'Reset my password', situation: 'primary' ),
+      structure: true,
+      hidden: {
+        reset_password: true,
+        success: { view: :reset_password_success }
       }
     } )
 
@@ -73,7 +73,7 @@ format :html do
 
 end
 
-event :signin, :before=>:approve, :on=>:update do
+event :signin, before: :approve, on: :update do
   email = subcards["+#{Card[:email   ].name}"]
   email &&= email['content']
   pword = subcards["+#{Card[:password].name}"]
@@ -94,11 +94,11 @@ event :signin, :before=>:approve, :on=>:update do
   end
 end
 
-event :signin_success, :after=>:signin do
+event :signin_success, after: :signin do
   abort :success
 end
 
-event :send_reset_password_token, :before=>:signin, :on=>:update, :when=>proc{ |c| Env.params[:reset_password] } do
+event :send_reset_password_token, before: :signin, on: :update, when: proc{ |c| Env.params[:reset_password] } do
   email = subcards["+#{Card[:email].name}"]
   email &&= email['content']
 
@@ -115,7 +115,7 @@ event :send_reset_password_token, :before=>:signin, :on=>:update, :when=>proc{ |
   end
 end
 
-event :signout, :before=>:approve, :on=>:delete do
+event :signout, before: :approve, on: :delete do
   Auth.signin nil
   abort :success
 end

data/mod/05_standard/set/self/stats.rb

@@ -12,12 +12,12 @@ format :html do
         </tr>
         <tr>
           <td>cards</td>
-          <td>#{ Card.where(:trash=>false).count }</td>
+          <td>#{ Card.where(trash: false).count }</td>
           <td></td>
         </tr>
         <tr>
           <td>trashed cards</td>
-          <td>#{ Card.where(:trash=>true).count  }</td>
+          <td>#{ Card.where(trash: true).count  }</td>
           <td>#{link_to 'delete all', card_path( 'update/:all?task=empty_trash' )}</td>
         </tr>
         <tr>

data/mod/05_standard/set/type/basic.rb

@@ -16,7 +16,7 @@ format :html do
         tag, value = $~[1,2]
         value = ActionView::Base.new.strip_tags(value).strip
         next if value.empty?
-        item = { :value => value, :uri => URI.escape(value) }
+        item = { value: value, uri: URI.escape(value) }
         case tag.downcase
         when 'h1'
           item[:depth] = dep = 1; toc << item

data/mod/05_standard/set/type/cardtype.rb

@@ -2,7 +2,7 @@
 format :html do
 
   view :type do |args|
-    args.merge!(:type_class=>'no-edit') if card.cards_of_type_exist?
+    args.merge!(type_class: 'no-edit') if card.cards_of_type_exist?
     super args
   end
 
@@ -16,10 +16,10 @@ format :html do
 
   view :add_link do |args|
     args[:title] ||= "Add #{card.name}"
-    link_to _render_title(args), _render_add_path(args), :class=>args[:css_class]
+    link_to _render_title(args), _render_add_path(args), class: args[:css_class]
   end
 
-  view :add_button, :view=>:add_link
+  view :add_button, view: :add_link
   def default_add_button_args args
     args[:css_class] = 'btn btn-default'
   end
@@ -62,10 +62,10 @@ end
 
 
 def cards_of_type_exist?
-  !new_card? and Auth.as_bot { Card.count_by_wql :type_id=>id } > 0
+  !new_card? and Auth.as_bot { Card.count_by_wql type_id: id } > 0
 end
 
-event :check_for_cards_of_type, :after=>:validate_delete do
+event :check_for_cards_of_type, after: :validate_delete do
   if cards_of_type_exist?
     errors.add :cardtype, "can't alter this type; #{name} cards still exist"
   end

data/mod/05_standard/set/type/date.rb

@@ -3,6 +3,6 @@ format :html do
 
   # what is this for?  Can't you just use TYPE-date and editor to match this cas, no special view needed?
   view :editor do |args|
-    text_field :content, :class=>'date-editor'
+    text_field :content, class: 'date-editor'
   end
 end

data/mod/05_standard/set/type/file.rb

@@ -1,4 +1,4 @@
-attachment :file, :uploader=>FileUploader
+attachment :file, uploader: FileUploader
 
 module SelectedAction
   def select_action_by_params params
@@ -51,10 +51,10 @@ format :file do
       file = selected_file_version
       [ file.path,
         {
-          :type => file.content_type,
-          :filename =>  "#{card.cardname.safe_key}#{file.extension}",
-          :x_sendfile => true,
-          :disposition => (params[:format]=='file' ? 'attachment' : 'inline' )
+          type: file.content_type,
+          filename:  "#{card.cardname.safe_key}#{file.extension}",
+          x_sendfile: true,
+          disposition: (params[:format]=='file' ? 'attachment' : 'inline' )
         }
       ]
     else
@@ -86,7 +86,7 @@ format :html do
     ''
   end
 
-  view :preview_editor, :tags=>:unknown_ok do |args|
+  view :preview_editor, tags: :unknown_ok do |args|
     <<-HTML
       <div class="chosen-file">
         <input type="hidden" name="cached_upload" value="#{card.selected_action_id}">
@@ -126,7 +126,7 @@ format :html do
             <span>
                 #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
             </span>
-             #{file_field card.attachment_name, :class=>'file-upload slotter'}
+             #{file_field card.attachment_name, class: 'file-upload slotter'}
         </span>
       </div>
       <div id="progress" class="progress" style="display: none;">

data/mod/05_standard/set/type/image.rb

@@ -1,4 +1,4 @@
-attachment :image, :uploader=>ImageUploader
+attachment :image, uploader: ImageUploader
 
 include File::SelectedAction
 
@@ -7,7 +7,7 @@ format do
   include File::Format
 
   view :closed_content do |args|
-    _render_core :size=>:icon
+    _render_core size: :icon
   end
 
   view :source do |args|
@@ -38,20 +38,20 @@ format :html do
 
   def preview args
     if !card.new_card? || card.preliminary_upload?
-      content_tag( :div, _render_core(args.merge(:size=>:medium)).html_safe,
-          :class=>'attachment-preview', :id=>"#{card.attachment.filename}-preview")
+      content_tag( :div, _render_core(args.merge(size: :medium)).html_safe,
+          class: 'attachment-preview', id: "#{card.attachment.filename}-preview")
     end
   end
 
   view :content_changes do |args|
     out = ''
     size = args[:diff_type]==:summary ? :icon : :medium
-    if !args[:hide_diff] and args[:action] and last_change = card.last_change_on(:db_content,:before=>args[:action])
+    if !args[:hide_diff] and args[:action] and last_change = card.last_change_on(:db_content,before: args[:action])
       card.selected_action_id=last_change.card_action_id
-      out << Card::Diff.render_deleted_chunk(_render_core(:size=>size))
+      out << Card::Diff.render_deleted_chunk(_render_core(size: size))
     end
     card.selected_action_id=args[:action].id
-    out <<  Card::Diff.render_added_chunk(_render_core(:size=>size))
+    out <<  Card::Diff.render_added_chunk(_render_core(size: size))
     out
   end
 
@@ -75,7 +75,7 @@ format :file do
   end
 
   def selected_file_version
-    style = _render_style(:style=>params[:size]).to_sym
+    style = _render_style(style: params[:size]).to_sym
     (style && style != :original) ? card.attachment.versions[style] : card.attachment
   end
 end