card 1.16.6 → 1.16.7

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

@@ -1,9 +1,9 @@
 
 view :editor do |args|
-  text_field :content, :class=>'card-content'
+  text_field :content, class: 'card-content'
 end
 
-event :validate_number, :after=>:approve do
+event :validate_number, after: :approve do
   errors.add :content, "'#{content}' is not numeric" unless valid_number?( content )
 end
 

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

@@ -1,3 +1,3 @@
 view :editor do |args|
-  text_field :content, :class=>'card-content'
+  text_field :content, class: 'card-content'
 end

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

@@ -9,7 +9,7 @@ def item_cards params={}
 end
 
 def item_names params={}
-  Card.search(query(params.merge(:return=>:name)))
+  Card.search(query(params.merge(return: :name)))
 end
 
 def item_type
@@ -28,8 +28,10 @@ end
 def get_query params={}
   query = Auth.as_bot do ## why is this a wagn_bot thing?  can't deny search content??
     query_content = params.delete(:query) || raw_content
-    #warn "get_query #{name}, #{query_content}, #{params.inspect}"
-    raise(JSON::ParserError, "Error in card '#{self.name}':can't run search with empty content") if query_content.empty?
+    if query_content.empty?
+      raise JSON::ParserError,
+        "Error in card '#{self.name}':can't run search with empty content"
+    end
     String === query_content ? JSON.parse( query_content ) : query_content
   end
   query.symbolize_keys!.merge! params.symbolize_keys
@@ -79,10 +81,10 @@ format do
       begin
         v = {}
         v[:query] = card.query( search_params )
-        v[:item]  = set_inclusion_opts args.merge( :query_view=>v[:query][:view] )
+        v[:item]  = set_inclusion_opts args.merge( query_view: v[:query][:view] )
         v
       rescue JSON::ParserError => e
-        { :error => e }
+        { error: e }
       end
   end
 
@@ -92,9 +94,13 @@ format do
       if search_vars[:error]
         search_vars[:error]
       else
-        raw_results = card.item_cards search_params
-        is_count = search_vars[:query][:return] =='count'
-        is_count ? raw_results.to_i : raw_results
+        begin
+          raw_results = card.item_cards search_params
+          is_count = search_vars[:query][:return] == 'count'
+          is_count ? raw_results.to_i : raw_results
+        rescue BadQuery => e
+          e 
+        end
       end
     end
   end
@@ -104,13 +110,13 @@ format do
       begin
         card.item_names search_params
       rescue => e
-        { :error => e}
+        { error: e}
       end
   end
 
   def each_reference_with_args args={}
     search_result_names.each do |name|
-      yield(name, nest_args(args.reverse_merge!(:item=>:content)))
+      yield(name, nest_args(args.reverse_merge!(item: :content)))
     end
   end
 
@@ -125,7 +131,7 @@ format do
 
   def page_link text, page, current=false, options={}
     @paging_path_args[:offset] = page * @paging_limit
-    options.merge!(:class=>'card-paging-link slotter', :remote => true)
+    options.merge!(class: 'card-paging-link slotter', remote: true)
     link_to raw(text), path(@paging_path_args), options
   end
 
@@ -136,7 +142,7 @@ format do
                   'disabled'
                 end
     page ||= 0
-    content_tag :li, :class=>css_class do
+    content_tag :li, class: css_class do
       page_link text, page, current, options
     end
   end
@@ -181,22 +187,22 @@ end
 
 format :json do
   def default_search_params
-    set_default_search_params :default_limit => 0
+    set_default_search_params default_limit: 0
   end
 end
 
 format :rss do
   view :feed_body do |args|
     case raw_feed_items args
-    when Exception ; @xml.item { render :search_error }
-    when Integer   ; @xml.item { render :search_count }
+    when Exception ; @xml.item(render :search_error)
+    when Integer   ; @xml.item(render :search_count)
     else super args
     end
   end
 
   def raw_feed_items args
     @raw_feed_items ||= begin
-      search_params.merge!(:default_limit => 25)
+      search_params.merge!(default_limit: 25)
       search_results
     end
   end
@@ -215,7 +221,7 @@ format :html do
           item_view = inclusion_defaults(c)[:view]
           %{
             <div class="search-result-item item-#{ item_view }">
-              #{nest(c, :size=>args[:size], :view=>item_view)}
+              #{nest(c, size: args[:size], view: item_view)}
             </div>
           }
         end.join "\n"
@@ -238,12 +244,12 @@ format :html do
       search_limit = args[:closed_search_limit]
       search_params[:limit] = search_limit && search_limit < Card.config.closed_search_limit ?
                                 search_limit : Card.config.closed_search_limit
-      _render_core args.merge( :hide=>'paging', :item=>:link )
+      _render_core args.merge( hide: 'paging', item: :link )
       # TODO: if item is queryified to be "name", then that should work.  otherwise use link
     end
   end
 
-  view :editor, :mod=>Html::HtmlFormat
+  view :editor, mod: Html::HtmlFormat
 
   view :no_search_results do |args|
     %{<div class="search-no-results"></div>}
@@ -257,7 +263,7 @@ format :html do
     total = card.count search_params
     return '' if limit >= total # should only happen if limit exactly equals the total
 
-    @paging_path_args = { :limit => limit, :item=> inclusion_defaults(card)[:view] }
+    @paging_path_args = { limit: limit, item: inclusion_defaults(card)[:view] }
     @paging_limit = limit
 
     s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
@@ -296,7 +302,7 @@ format :html do
   end
 
   def default_search_params
-    set_default_search_params :default_limit=>20
+    set_default_search_params default_limit: 20
   end
 
 end

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

@@ -8,12 +8,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/mod/05_standard/set/type/set.rb

@@ -23,14 +23,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"
@@ -39,20 +39,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
@@ -60,7 +60,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|
@@ -71,14 +71,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)
         ]
@@ -87,15 +87,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")
       ]
@@ -109,13 +109,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|
@@ -131,8 +131,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
 
@@ -145,16 +145,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
@@ -169,12 +169,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),
@@ -189,7 +189,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
@@ -335,14 +335,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/mod/05_standard/set/type/signup.rb

@@ -1,32 +1,32 @@
 
 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 )
@@ -36,7 +36,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
@@ -68,16 +68,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
@@ -101,13 +101,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
@@ -116,9 +116,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
 
@@ -126,11 +126,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'] ||={}
@@ -138,7 +138,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