card 1.16.6 → 1.16.7

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

@@ -7,7 +7,7 @@ module ClassMethods
 end
 
 def account
-  fetch :trait=>:account
+  fetch trait: :account
 end
 
 def accountable?
@@ -46,12 +46,12 @@ def read_rules
 end
 
 def all_roles
-  @all_roles ||= 
+  @all_roles ||=
     if id == Card::AnonymousID
       []
     else
       Auth.as_bot do
-        role_trait = fetch :trait=>:roles
+        role_trait = fetch trait: :roles
         [ Card::AnyoneSignedInID ] + ( role_trait ? role_trait.item_ids : [] )
       end
     end
@@ -59,10 +59,10 @@ end
 
 
 event :generate_token do
-  Digest::SHA1.hexdigest "--#{Time.now.to_f}--#{rand 10}--" 
+  Digest::SHA1.hexdigest "--#{Time.now.to_f}--#{rand 10}--"
 end
 
-event :set_stamper, :before=>:approve do
+event :set_stamper, before: :approve do
   self.updater_id = Auth.current_id
   self.creator_id = self.updater_id if new_card?
 end

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module Comment; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/comment.rb ~~~~~~~~~~~
-event :add_comment, :after=>:approve, :on=>:save, :when=> proc {|c| c.comment } do
+event :add_comment, after: :approve, on: :save, when: proc {|c| c.comment } do
   self.content = %{
     #{ content }
     #{ '<hr>' unless content.blank? }
@@ -16,16 +16,16 @@ event :add_comment, :after=>:approve, :on=>:save, :when=> proc {|c| c.comment }
   }
 end
 
-view( :comment_box, :denial=>:blank, :tags=>:unknown_ok, :perms=>lambda { |r| r.card.ok? :comment } ) do |args|
-  
-  
+view( :comment_box, denial: :blank, tags: :unknown_ok, perms: lambda { |r| r.card.ok? :comment } ) do |args|
+
+
   %{<div class="comment-box nodblclick"> #{
     card_form :update do
       %{
-        #{ hidden_field_tag( 'card[name]', card.name ) if card.new_card? 
+        #{ hidden_field_tag( 'card[name]', card.name ) if card.new_card?
         # FIXME wish we had more generalized solution for names.  without this, nonexistent cards will often take left's linkname.  (needs test)
         }
-        #{ text_area :comment, :rows=>3 }
+        #{ text_area :comment, rows: 3 }
         <div class="comment-buttons">
           #{
             unless Auth.signed_in?
@@ -33,7 +33,7 @@ view( :comment_box, :denial=>:blank, :tags=>:unknown_ok, :perms=>lambda { |r| r.
               %{<label>My Name is:</label> #{ text_field :comment_author }}
             end
           }
-          #{ button_tag 'Comment', :type=>:submit, :disable_with=>"Commenting" }
+          #{ button_tag 'Comment', type: :submit, disable_with: "Commenting" }
         </div>
       }
     end}

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

@@ -3,36 +3,36 @@ class Card; module Set; module All; module Error; extend Card::Set # ~~~~~~~~~~~
 
 
 format do
-  view :closed_missing, :perms=>:none, :closed=>true do |args|
+  view :closed_missing, perms: :none, closed: true do |args|
     ''
   end
 
-  view :missing, :perms=>:none do |args|
+  view :missing, perms: :none do |args|
     ''
   end
 
-  view :not_found, :perms=>:none, :error_code=>404 do |args|
+  view :not_found, perms: :none, error_code: 404 do |args|
     %{ Could not find #{card.name.present? ? %{"#{card.name}"} : 'the card requested'}. }
   end
 
-  view :server_error, :perms=>:none, :error_code=>500 do |args|
+  view :server_error, perms: :none, error_code: 500 do |args|
     %{ Wagn Hitch!  Server Error. Yuck, sorry about that.\n}+
     %{ To tell us more and follow the fix, add a support ticket at http://wagn.org/new/Support_Ticket }
   end
 
-  view :denial, :perms=>:none, :error_code=>403 do |args|
+  view :denial, perms: :none, error_code: 403 do |args|
     focal? ? 'Permission Denied' : ''
   end
 
-  view :bad_address, :perms=>:none, :error_code=>404 do |args|
+  view :bad_address, perms: :none, error_code: 404 do |args|
     %{ 404: Bad Address }
   end
 
-  view :too_deep, :perms=>:none, :closed=>true do |args|
+  view :too_deep, perms: :none, closed: true do |args|
     %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
   end
 
-  view :too_slow, :perms=>:none, :closed=>true do |args|
+  view :too_slow, perms: :none, closed: true do |args|
     %{ Timed out! #{ showname } took too long to load. }
   end
 end
@@ -49,14 +49,14 @@ format :html do
 
   def commentable? view, args
     self.class.tagged view, :comment                                   and
-    show_view? :comment_box, args.merge( :default_visibility=>:hide )  and #developer or wagneer has overridden default
+    show_view? :comment_box, args.merge( default_visibility: :hide )  and #developer or wagneer has overridden default
     ok? :comment
   end
 
   def rendering_error exception, view
     details = if Auth.always_ok?
-                card_link(error_cardname, :class=>'render-error-link') +
-                    alert('warning', :dismissible=>true, :alert_class=>"render-error-message errors-view admin-error-message") do
+                card_link(error_cardname, class: 'render-error-link') +
+                    alert('warning', dismissible: true, alert_class: "render-error-message errors-view admin-error-message") do
                       %{
                         <h3>Error message (visible to admin only)</h3>
                         <p><strong>#{ exception.message }</strong></p>
@@ -67,7 +67,7 @@ format :html do
                 error_cardname
               end
 
-    content_tag :span, :class=>'render-error alert alert-danger' do
+    content_tag :span, class: 'render-error alert alert-danger' do
       [
         'error rendering',
         details,
@@ -80,7 +80,7 @@ format :html do
     "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
   end
 
-  view :message, :perms=>:none, :tags=>:unknown_ok do |args|
+  view :message, perms: :none, tags: :unknown_ok do |args|
     frame args do
       params[:message]
     end
@@ -90,28 +90,28 @@ format :html do
   view :missing do |args|
     return '' unless card.ok? :create  # should this be moved into ok_view?
 
-    opts = { :remote=>true, :class=>"slotter missing-#{ args[:denied_view] || args[:home_view]}" }
-    opts[:path_opts] = { :type=> args[:type] } if args[:type]
+    opts = { remote: true, class: "slotter missing-#{ args[:denied_view] || args[:home_view]}" }
+    opts[:path_opts] = { type: args[:type] } if args[:type]
 
     wrap args do
       view_link "Add #{ fancy_title args[:title] }", :new, opts
     end
   end
 
-  view :closed_missing, :perms=>:none do |args|
+  view :closed_missing, perms: :none do |args|
     %{<span class="faint"> #{ showname } </span>}
   end
 
 
 
-  view :conflict, :error_code=>409 do |args|
-    wrap args.merge( :slot_class=>'error-view' ) do  #ENGLISH below
+  view :conflict, error_code: 409 do |args|
+    wrap args.merge( slot_class: 'error-view' ) do  #ENGLISH below
       alert 'warning' do
         %{<strong>Conflict!</strong><span class="new-current-revision-id">#{card.last_action_id}</span>
           <div>#{ card_link card.last_action.act.actor.cardname } has also been making changes.</div>
           <div>Please examine below, resolve above, and re-submit.</div>
           #{ wrap do |args|
-              _render_act_expanded :act=>card.last_action.act, :current_rev_nr => 0
+              _render_act_expanded act: card.last_action.act, current_rev_nr: 0
             end
            }
         }
@@ -119,14 +119,14 @@ format :html do
     end
   end
 
-  view :errors, :perms=>:none do |args|
+  view :errors, perms: :none do |args|
 
     if card.errors.any?
       title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
-      frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
+      frame args.merge(panel_class: "panel panel-warning", title: title, hide: 'menu' ) do
         card.errors.map do |attrib, msg|
           msg = "<strong>#{attrib.to_s.upcase}:</strong> #{msg}" unless attrib == :abort
-          alert 'warning', :dismissible=>true, :alert_class=>'card-error-msg' do
+          alert 'warning', dismissible: true, alert_class: 'card-error-msg' do
             msg
           end
         end
@@ -137,11 +137,11 @@ format :html do
   view :not_found do |args| #ug.  bad name.
     sign_in_or_up_links = if !Auth.signed_in?
       %{<div>
-        #{ card_link :signin, :text=>'Sign in' } or
+        #{ card_link :signin, text: 'Sign in' } or
         #{ link_to 'Sign up', card_path('new/:signup') } to create it.
        </div>}
     end
-    frame args.merge(:title=>'Not Found', :optional_menu=>:never) do
+    frame args.merge(title: 'Not Found', optional_menu: :never) do
       %{
         <h2>Could not find #{card.name.present? ? "<em>#{card.name}</em>" : 'that'}.</h2>
         #{sign_in_or_up_links}
@@ -165,10 +165,10 @@ format :html do
         when Auth.signed_in?
           "You need permission #{to_task}"
         else
-          or_signup = if Card.new(:type_id=>Card::SignupID).ok? :create
+          or_signup = if Card.new(type_id: Card::SignupID).ok? :create
             "or #{ link_to 'sign up', card_url('new/:signup') }"
           end
-          save_interrupted_action(request.env['REQUEST_URI'])
+          Env.save_interrupted_action(request.env['REQUEST_URI'])
           "Please #{ link_to 'sign in', card_url(':signin') } #{or_signup} #{to_task}"
         end
 

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

@@ -50,7 +50,7 @@ def puts_events events, prefix='', depth=0
 end
 
 def events_tree filt
-  hash = {:name => filt }
+  hash = {name: filt }
   if respond_to? "_#{filt}_callbacks"
     send( "_#{filt}_callbacks" ).each do |callback|
       next unless callback.applies? self

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

@@ -20,14 +20,14 @@ format do
   #
   def smart_link link_text, target, html_args={}
     if (view = target.delete(:view))
-      view_link link_text, view, html_args.merge(:path_opts=>target)
+      view_link link_text, view, html_args.merge(path_opts: target)
     elsif (page = target.delete(:card))
-      card_link page, html_args.merge(:path_opts=>target, :text=>link_text)
+      card_link page, html_args.merge(path_opts: target, text: link_text)
     elsif target[:related]
       if target[:related].kind_of? String
-        target[:related] = {:name=>"+#{target[:related]}"}
+        target[:related] = {name: "+#{target[:related]}"}
       end
-      view_link link_text, :related, html_args.merge(:path_opts=>target)
+      view_link link_text, :related, html_args.merge(path_opts: target)
     elsif target[:web]
     else
       link_to link_text, target, html_args
@@ -47,6 +47,7 @@ format do
       else
         return card_link href, opts
       end
+    opts[:target] = "_blank" if new_class == 'external-link'
     add_class opts, new_class
     link_to text, href, opts
   end
@@ -54,7 +55,7 @@ format do
   # link to a specific card
   def card_link name_or_card, opts={}
     name = case name_or_card
-           when Symbol then Card.fetch( name_or_card, :skip_modules=>true ).cardname
+           when Symbol then Card.fetch( name_or_card, skip_modules: true ).cardname
            when Card   then name_or_card.cardname
            else             name_or_card
            end
@@ -80,12 +81,12 @@ format do
 
   def related_link name_or_card, opts={}
     name = case name_or_card
-           when Symbol then Card.fetch( name_or_card, :skip_modules=>true ).cardname
+           when Symbol then Card.fetch( name_or_card, skip_modules: true ).cardname
            when Card   then name_or_card.cardname
            else             name_or_card
            end
-   opts[:path_opts] ||= {:view=>:related}
-   opts[:path_opts][:related] = {:name=>"+#{name}"}
+   opts[:path_opts] ||= {view: :related}
+   opts[:path_opts][:related] = {name: "+#{name}"}
    opts[:path_opts][:related].merge! opts[:related_opts] if opts[:related_opts]
    view_link( opts[:text] || name, :related, opts)
   end
@@ -143,7 +144,7 @@ format :html do
       end
     end
 
-    content_tag :a, raw(text), opts.merge(:href=>href)
+    content_tag :a, raw(text), opts.merge(href: href)
   end
 
 end

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

@@ -8,7 +8,7 @@ format :html do
 
   def show view, args
     if show_layout?
-      args.merge! :view=>view if view
+      args.merge! view: view if view
       @main_opts = args
       self.render :layout
     else
@@ -22,16 +22,16 @@ format :html do
     !Env.ajax? || params[:layout]
   end
 
-  view :layout, :perms=>:none do |args|
+  view :layout, perms: :none do |args|
     output [
-      process_content(get_layout_content, :content_opts=>{ :chunk_list=>:references }),
+      process_content(get_layout_content, content_opts: { chunk_list: :references }),
       _render_modal_slot(args)
     ]
   end
 
 
   view :content do |args|
-    wrap args.reverse_merge(:slot_class=>'card-content') do
+    wrap args.reverse_merge(slot_class: 'card-content') do
       [
         _optional_render( :menu, args, :hide ),
         _render_core( args )
@@ -40,8 +40,8 @@ format :html do
   end
 
   view :content_panel do |args|
-    wrap args.reverse_merge(:slot_class=>'card-content panel panel-default') do
-      wrap_with :div, :class=>'panel-body' do
+    wrap args.reverse_merge(slot_class: 'card-content panel panel-default') do
+      wrap_with :div, class: 'panel-body' do
         [
           _optional_render( :menu, args, :hide ),
           _render_core( args )
@@ -50,12 +50,12 @@ format :html do
     end
   end
 
-  view :titled, :tags=>:comment do |args|
+  view :titled, tags: :comment do |args|
     wrap args do
       [
         _optional_render( :menu, args ),
         _render_header( args ),
-        wrap_body( :content=>true ) { _render_core args },
+        wrap_body( content: true ) { _render_core args },
         optional_render( :comment_box, args )
       ]
     end
@@ -66,7 +66,7 @@ format :html do
       [
         _optional_render( :menu, args ),
         "<label>#{ _render_title args }</label>",
-        wrap_body( :body_class=>'closed-content', :content=>true ) do
+        wrap_body( body_class: 'closed-content', content: true ) do
           _render_closed_content args
         end
       ]
@@ -76,20 +76,20 @@ format :html do
   view :title do |args|
     title = fancy_title args[:title], args[:title_class]
     title =  _optional_render( :title_editable, args, :hide) ||
-             _optional_render( :title_link, args.merge( :title_ready=>title ), :hide ) ||
+             _optional_render( :title_link, args.merge( title_ready: title ), :hide ) ||
              title
     add_name_context
     title
   end
 
   view :title_link do |args|
-    card_link card.cardname, :text=>( args[:title_ready] || showname(args[:title]) )
+    card_link card.cardname, text: ( args[:title_ready] || showname(args[:title]) )
   end
 
   view :type_info do |args|
     %{
       <span class="type-info pull-right">
-        #{card_link(card.type_name, :text=>"#{card.type_name}", :class=>'navbar-link')}
+        #{card_link(card.type_name, text: "#{card.type_name}", class: 'navbar-link')}
       </span>
     }.html_safe
   end
@@ -100,17 +100,17 @@ format :html do
     end
     res = links.shift
     links.each_with_index do |link, index|
-      res += card_link card.cardname.parts[0..index+1].join('+'), :text=>glyphicon('plus','header-icon')
+      res += card_link card.cardname.parts[0..index+1].join('+'), text: glyphicon('plus','header-icon')
       res += link
     end
     res += ' '
-    res.concat view_link(glyphicon('edit','header-icon'),:edit_name, :class=>'slotter', 'data-toggle'=>'tooltip', :title=>'edit name')
+    res.concat view_link(glyphicon('edit','header-icon'),:edit_name, class: 'slotter', 'data-toggle'=>'tooltip', title: 'edit name')
     res.concat _optional_render(:type_link,args,:show)
   end
 
-  view :open, :tags=>:comment do |args|
+  view :open, tags: :comment do |args|
     args[:optional_toggle] ||= main? ? :hide : :show
-    frame args.merge(:content=>true) do
+    frame args.merge(content: true) do
       [
         _render_open_content( args ),
         optional_render( :comment_box, args )
@@ -121,7 +121,7 @@ format :html do
 
 
 =begin
-  view :anchor, :perms=>:none, :tags=>:unknown_ok do |args|
+  view :anchor, perms: :none, tags: :unknown_ok do |args|
     %{ <a id="#{card.cardname.url_key}" name="#{card.cardname.url_key}"></a> }
   end
 =end
@@ -129,11 +129,11 @@ format :html do
   view :type do |args|
     klasses = ['cardtype']
     klass = args[:type_class] and klasses << klass
-    card_link card.type_card.name, :class=>klasses
+    card_link card.type_card.name, class: klasses
   end
 
   view :closed do |args|
-    frame args.reverse_merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show, :optional_toolbar=>:hide ) do
+    frame args.reverse_merge(content: true, body_class: 'closed-content', toggle_mode: :close, optional_toggle: :show, optional_toolbar: :hide ) do
       _optional_render :closed_content, args
     end
   end
@@ -160,7 +160,7 @@ format :html do
 
   view :related do |args|
     if args[:related_card]
-      frame args.merge(:optional_toolbar=>:show) do
+      frame args.merge(optional_toolbar: :show) do
         nest( args[:related_card], args[:related_args])
       end
     end
@@ -170,22 +170,22 @@ format :html do
     if rparams = args[:related] || params[:related]
       rcard = rparams[:card] || begin
                 rcardname = rparams[:name].to_name.to_absolute_name( card.cardname)
-                Card.fetch rcardname, :new=>{}
+                Card.fetch rcardname, new: {}
               end
 
       #subheader =  with_name_context(card.name) { showname rcard.name }
       subheader =  with_name_context(card.name) { subformat(rcard)._render_title(args) }
       add_name_context card.name
       nest_args = ( rparams[:slot] || {} ).deep_symbolize_keys.reverse_merge(
-        :view            => ( rparams[:view] || :open ),
-        :optional_header => :hide,
-        :optional_menu   => :show,
-        :subheader       => subheader,
-        :optional_toggle => :hide,
-        :optional_help   => :show,
-        :parent          => card,
-        :subframe        => true,
-        :subslot         => true
+        view:            ( rparams[:view] || :open ),
+        optional_header: :hide,
+        optional_menu:   :show,
+        subheader:       subheader,
+        optional_toggle: :hide,
+        optional_help:   :show,
+        parent:          card,
+        subframe:        true,
+        subslot:         true
       )
       nest_args[:optional_comment_box] = :show if rcard.show_comment_box_in_related?
 
@@ -196,14 +196,14 @@ format :html do
 
 
 
-  view :help, :tags=>:unknown_ok do |args|
+  view :help, tags: :unknown_ok do |args|
     text = if args[:help_text]
       args[:help_text]
     else
-      setting = card.new_card? ? [ :add_help, { :fallback => :help } ] : :help
+      setting = card.new_card? ? [ :add_help, { fallback: :help } ] : :help
       if help_card = card.rule_card( *setting ) and help_card.ok? :read
         with_inclusion_mode :normal do
-          process_content _render_raw( args.merge :structure=>help_card.name ), :content_opts=>{ :chunk_list=>:references }
+          process_content _render_raw( args.merge structure: help_card.name ), content_opts: { chunk_list: :references }
           # render help card with current card's format so current card's context is used in help card inclusions
         end
       end
@@ -220,7 +220,7 @@ format :html do
         when :create then 'added'
         when :delete then 'deleted'
         else
-          link_to('edited', path(:view=>:history), :class=>'last-edited', :rel=>'nofollow')
+          link_to('edited', path(view: :history), class: 'last-edited', rel: 'nofollow')
         end
 
       %{