card 1.16.9 → 1.16.10

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Right; module Token; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/token.rb ~~~~~~~~~~~
+class Card; module Set; module Right; module Token; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/token.rb ~~~~~~~~~~~
 include All::Permissions::Accounts
 
 view :raw do |args|

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Right; module WhenCreated; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/when_created.rb ~~~~~~~~~~~
+class Card; module Set; module Right; module WhenCreated; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/when_created.rb ~~~~~~~~~~~
 view :raw do |args|
   card.left.new_card? ? '' : card.left.created_at.strftime('%A, %B %d, %Y %I:%M %p %Z')
 end

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Right; module WhenLastEdited; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/when_last_edited.rb ~~~~~~~~~~~
+class Card; module Set; module Right; module WhenLastEdited; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/when_last_edited.rb ~~~~~~~~~~~
 view :raw do |args|
   card.left.new_card? ? '' : card.left.updated_at.strftime('%A, %B %d, %Y %I:%M %p %Z')
 end

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

@@ -1,5 +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 ~~~~~~~~~~~
+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
   if (recent = Card[:recent_settings])
     recent.insert_item 0, cardname.right

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module AccountLinks; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/account_links.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module AccountLinks; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/account_links.rb ~~~~~~~~~~~
 
 format :html do
 

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Alerts; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/alerts.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Alerts; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/alerts.rb ~~~~~~~~~~~
 
 view :raw do |args|
   '<!-- *alerts is deprecated. please remove from layout -->'

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

@@ -1,5 +1,6 @@
 # -*- 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 ~~~~~~~~~~~
+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
   if task = Env.params[:task]

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Foot; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/foot.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Foot; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/foot.rb ~~~~~~~~~~~
 
 format :html do
   view :raw do |args|

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Head; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/head.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Head; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/head.rb ~~~~~~~~~~~
 format :html do
 
   view :raw do |args|
@@ -86,7 +87,6 @@ format :html do
     elsif script_card
       javascript_include_tag script_card.machine_output_url
     end
-
     ie9_card    = Card[:script_html5shiv_printshiv]
     %(#{ javascript_tag do varvals * ';' end  }
       #{ @js_tag if @js_tag }

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Navbox; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/navbox.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Navbox; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/navbox.rb ~~~~~~~~~~~
 
 format :html do
 

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Now; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/now.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Now; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/now.rb ~~~~~~~~~~~
 
 view :raw do |args|
   Time.now.strftime '%A, %B %d, %Y %I:%M %p %Z'

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Recent; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/recent.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Recent; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/recent.rb ~~~~~~~~~~~
 
 view :title do |args|
    super args.merge( title: 'Recent Changes' )

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Search; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/search.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Search; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/search.rb ~~~~~~~~~~~
 
 format :html do
 

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

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Signin; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/signin.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Signin; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/signin.rb ~~~~~~~~~~~
 
 format :html do
-
   view :open do |args|
     args.merge! optional_help: :show
     super args
@@ -14,84 +14,93 @@ format :html do
 
   view :open_content do |args|
     # annoying step designed to avoid table of contents.  sigh
-    _render_core( args )
+    _render_core(args)
   end
 
-  view :closed_content do |args|
+  view :closed_content do |_args|
     ''
   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] += link_to( '...or sign up!', card_path("account/signup"))
+      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: {}
     form_args = {
       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'}
-          end,
-          _optional_render( :button_formgroup, args )
+          _optional_render(:content_formgroup, args.merge(structure: true)),
+          _optional_render(:button_formgroup, args)
         ].join
       end
     end
   end
 
-  #FORGOT PASSWORD
+  # FORGOT PASSWORD
   view :edit do |args|
-    args.merge!( {
+    @forgot_password = true
+    args.merge!(
       title: 'Forgot Password',
       optional_help: :hide,
-      buttons: button_tag( 'Reset my password', situation: 'primary' ),
+      buttons: button_tag('Reset my password', situation: 'primary'),
       structure: true,
       hidden: {
         reset_password: true,
         success: { view: :reset_password_success }
       }
-    } )
+    )
 
     Auth.as_bot { super args }
   end
 
-  view :raw do |args|
-    '{{+*email|title:email;type:Phrase}}'
+  view :raw do |_args|
+    if @forgot_password
+      "{{+#{Card[:email].name}|title:email;type:Phrase}}"
+    else
+      %(
+        {{+#{Card[:email].name}|titled;title:email}}
+        {{+#{Card[:password].name}|titled;title:password}}
+      )
+    end
   end
 
-  view :reset_password_success do |args|
+  view :reset_password_success do |_args|
     frame { 'Check your email for a link to reset your password' }
   end
-
 end
 
 event :signin, before: :approve, on: :update do
-  email = subcards["+#{Card[:email   ].name}"]
-  email &&= email['content']
-  pword = subcards["+#{Card[:password].name}"]
-  pword &&= pword['content']
+  email = subfield :email
+  email &&= email.content
+  pword = subfield :password
+  pword &&= pword.content
 
   abort :failure, 'bad signin args' unless email && pword
 
-  if signin_id = Auth.authenticate( email, pword )
+  if (signin_id = Auth.authenticate(email, pword))
     Auth.signin signin_id
   else
-    accted = Auth[ email.strip.downcase ]
-    errors.add :signin, case
-      when accted.nil?             ; "Unrecognized email."
-      when !accted.account.active? ; "Sorry, that account is not active."
-      else                         ; "Wrong password"
+    accted = Auth[email.strip.downcase]
+    error_msg =
+      case
+      when accted.nil?             then 'Unrecognized email.'
+      when !accted.account.active? then 'Sorry, that account is not active.'
+      else 'Wrong password'
       end
+    errors.add :signin, error_msg
     abort :failure
   end
 end
@@ -100,11 +109,13 @@ 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
-  email = subcards["+#{Card[:email].name}"]
-  email &&= email['content']
+event :send_reset_password_token,
+      before: :signin, on: :update,
+      when: proc { Env.params[:reset_password] } do
+  email = subfield :email
+  email &&= email.content
 
-  if accted = Auth[ email.strip.downcase ] and accted.account.active?
+  if (accted = Auth[email.strip.downcase]) && accted.account.active?
     accted.account.send_reset_password_token
     abort :success
   else
@@ -123,7 +134,5 @@ event :signout, before: :approve, on: :delete do
 end
 
 
-
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/signin.rb ~~~~~~~~~~~
 end;end;end;end;

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Stats; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/stats.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Stats; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/stats.rb ~~~~~~~~~~~
 
 format :html do
   view :core do |args|

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module Version; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/version.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module Version; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/version.rb ~~~~~~~~~~~
 # -*- encoding : utf-8 -*-
 require_dependency 'card/version'
 

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Basic; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/basic.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Basic; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/basic.rb ~~~~~~~~~~~
 format :html do
   view :open_content do |args|
     content = _render_core args

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Cardtype; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/cardtype.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Cardtype; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/cardtype.rb ~~~~~~~~~~~
 
 format :html do
 

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Date; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/date.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Date; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/date.rb ~~~~~~~~~~~
 
 format :html do
 

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module File; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/file.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module File; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/file.rb ~~~~~~~~~~~
 attachment :file, uploader: FileUploader
 
 module SelectedAction
@@ -89,9 +90,11 @@ format :html do
   end
 
   view :preview_editor, tags: :unknown_ok do |args|
+    cached_upload_card_name = Card::Env.params[:attachment_upload]
+    cached_upload_card_name.gsub!(/\[\w+\]$/, "[cached_upload]")
     <<-HTML
       <div class="chosen-file">
-        <input type="hidden" name="cached_upload" value="#{card.selected_action_id}">
+        <input type="hidden" name="#{cached_upload_card_name}" value="#{card.selected_action_id}">
         <table role="presentation" class="table table-striped"><tbody class="files">
           <tr class="template-download fade in">
             <td>
@@ -128,7 +131,12 @@ format :html do
             <span>
                 #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
             </span>
-             #{file_field card.attachment_name, class: 'file-upload slotter'}
+             <input class="file-upload slotter form-control" type="file" 
+                name="card[#{card.type_code}]" id="card_#{card.type_code}">
+             #{hidden_field_tag 'attachment_type_id', card.type_id}
+             #{hidden_field card.attachment_name, class: "attachment_card_name",
+                            value: ''}
+             #{hidden_field_tag 'file_card_name', card.cardname.url_key}
         </span>
       </div>
       <div id="progress" class="progress" style="display: none;">

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Image; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/image.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Image; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/image.rb ~~~~~~~~~~~
 attachment :image, uploader: ImageUploader
 
 include File::SelectedAction

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module LayoutType; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/layout_type.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module LayoutType; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/layout_type.rb ~~~~~~~~~~~
 # -*- encoding : utf-8 -*-
 include Html
 

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Number; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/number.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Number; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/number.rb ~~~~~~~~~~~
 
 view :editor do |args|
   text_field :content, class: 'card-content'

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

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Phrase; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/phrase.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Phrase; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/phrase.rb ~~~~~~~~~~~
 view :editor do |args|
   text_field :content, class: 'card-content'
 end

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

@@ -1,13 +1,13 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module SearchType; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/search_type.rb ~~~~~~~~~~~
-
+class Card; module Set; module Type; module SearchType; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/search_type.rb ~~~~~~~~~~~
 
 def item_cards params={}
   s = query(params)
-  raise("OH NO.. no limit") unless s[:limit]
+  raise('OH NO.. no limit') unless s[:limit]
   # forces explicit limiting
   # can be 0 or less to force no limit
-  Card.search( s )
+  Card.search(s)
 end
 
 def item_names params={}
@@ -15,11 +15,12 @@ def item_names params={}
 end
 
 def item_type
+  return if query[:type].is_a?(Array) || query[:type].is_a?(Hash)
   query[:type]
 end
 
 def count params={}
-  Card.count_by_wql query( params )
+  Card.count_by_wql query(params)
 end
 
 def query params={}
@@ -28,47 +29,50 @@ def query params={}
 end
 
 def get_query params={}
-  query = Auth.as_bot do ## why is this a wagn_bot thing?  can't deny search content??
+  # why is this a wagn_bot thing?  can't deny search content??
+  query = Auth.as_bot do
     query_content = params.delete(:query) || raw_content
-    if query_content.empty?
+    case
+    when query_content.empty?
       raise JSON::ParserError,
-        "Error in card '#{self.name}':can't run search with empty content"
+            "Error in card '#{name}':can't run search with empty content"
+    when query_content.is_a?(String)
+      JSON.parse(query_content)
+    else query_content
     end
-    String === query_content ? JSON.parse( query_content ) : query_content
   end
   query.symbolize_keys!.merge! params.symbolize_keys
-  if default_limit = query.delete(:default_limit) and !query[:limit]
-    query[:limit] = default_limit
+  if (default_limit = query.delete(:default_limit))
+    query[:limit] ||= default_limit
   end
   query[:context] ||= cardname
   query
 end
 
-
-
-
 format do
-
+  # rubocop:disable Style/ExtraSpacing
   view :core do |args|
-    view = case search_results args
-      when Exception           ;  :search_error
-      when Integer             ;  :search_count
-      when @mode == :template  ;  :raw
-      else                     ;  :card_list
+    view =
+      case search_results args
+      when Exception          then :search_error
+      when Integer            then :search_count
+      when @mode == :template then :raw
+      else                         :card_list
       end
     _render view, args
   end
+  # rubocop:enable Style/ExtraSpacing
 
-
-  view :search_count do |args|
+  view :search_count do |_args|
     search_results.to_s
   end
 
-  view :search_error do |args|
-    %{#{search_results.class.to_s} :: #{search_results.message} :: #{card.raw_content}}
+  view :search_error do |_args|
+    sr_class = search_results.class.to_s
+    %{#{sr_class} :: #{search_results.message} :: #{card.raw_content}}
   end
 
-  view :card_list do |args|
+  view :card_list do |_args|
     if search_results.empty?
       'no results'
     else
@@ -82,8 +86,8 @@ format do
     @search_vars ||=
       begin
         v = {}
-        v[:query] = card.query( search_params )
-        v[:item]  = set_inclusion_opts args.merge( query_view: v[:query][:view] )
+        v[:query] = card.query(search_params)
+        v[:item] = set_inclusion_opts args.merge(query_view: v[:query][:view])
         v
       rescue JSON::ParserError => e
         { error: e }
@@ -96,9 +100,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
@@ -108,7 +116,7 @@ format do
       begin
         card.item_names search_params
       rescue => e
-        { error: e}
+        { error: e }
       end
   end
 
@@ -121,13 +129,12 @@ format do
   def set_inclusion_opts args
     @inclusion_defaults = nil
     @inclusion_opts ||= {}
-    @inclusion_opts[:view] = args[:item] || inclusion_opts[:view] || args[:query_view] || default_item_view
+    @inclusion_opts[:view] = args[:item] || inclusion_opts[:view] ||
+                             args[:query_view] || default_item_view
     # explicit > inclusion syntax > WQL > inclusion defaults
   end
 
-
-
-  def page_link text, page, current=false, options={}
+  def page_link text, page, _current=false, options={}
     @paging_path_args[:offset] = page * @paging_limit
     options.merge!(class: 'card-paging-link slotter', remote: true)
     link_to raw(text), path(@paging_path_args), options
@@ -146,11 +153,13 @@ format do
   end
 
   def previous_page_link page
-    page_li '<span aria-hidden="true">&laquo;</span>', page, false, 'aria-label'=>"Previous"
+    page_li '<span aria-hidden="true">&laquo;</span>', page, false,
+            'aria-label' => 'Previous'
   end
 
   def next_page_link page
-    page_li '<span aria-hidden="true">&raquo;</span>', page, false, 'aria-label'=>"Next"
+    page_li '<span aria-hidden="true">&raquo;</span>', page, false,
+            'aria-label' => 'Next'
   end
 
   def ellipse_page
@@ -162,10 +171,8 @@ format do
   end
 end
 
-
 format :data do
-
-  view :card_list do |args|
+  view :card_list do |_args|
     search_results.map do |c|
       nest c
     end
@@ -192,13 +199,13 @@ 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 then @xml.item(render :search_error)
+    when Integer then @xml.item(render :search_count)
     else super args
     end
   end
 
-  def raw_feed_items args
+  def raw_feed_items _args
     @raw_feed_items ||= begin
       search_params.merge!(default_limit: 25)
       search_results
@@ -207,7 +214,6 @@ format :rss do
 end
 
 format :html do
-
   view :card_list do |args|
     paging = _optional_render :paging, args
 
@@ -234,42 +240,44 @@ format :html do
     end
   end
 
-
   view :closed_content do |args|
     if @depth > self.class.max_depth
-      "..."
+      '...'
     else
       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 )
-      # TODO: if item is queryified to be "name", then that should work.  otherwise use link
+      search_params[:limit] =
+        search_limit && [search_limit, Card.config.closed_search_limit].min
+      _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 :no_search_results do |args|
+  view :no_search_results do |_args|
     %{<div class="search-no-results"></div>}
   end
 
-  view :paging do |args|
+  view :paging do |_args|
     s = card.query search_params
     offset, limit = s[:offset].to_i, s[:limit].to_i
     return '' if limit < 1
-    return '' if offset==0 && limit > offset + search_results.length #avoid query if we know there aren't enough results to warrant paging
+    # avoid query if we know there aren't enough results to warrant paging
+    return '' if offset == 0 && limit > offset + search_results.length
     total = card.count search_params
-    return '' if limit >= total # should only happen if limit exactly equals the total
+    # should only happen if limit exactly equals the total
+    return '' if limit >= total
 
     @paging_path_args = { limit: limit, item: inclusion_defaults(card)[:view] }
     @paging_limit = limit
 
     s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
 
-    out = ['<nav><ul class="pagination paging">' ]
+    out = ['<nav><ul class="pagination paging">']
 
-    total_pages  = ((total-1) / limit).to_i
-    current_page = ( offset   / limit).to_i # should already be integer
+    total_pages = ((total - 1) / limit).to_i
+    current_page = (offset / limit).to_i # should already be integer
     window = 2 # should be configurable
     window_min = current_page - window
     window_max = current_page + window
@@ -277,19 +285,19 @@ format :html do
     previous_page = current_page > 0 ? current_page - 1 : false
     out << previous_page_link(previous_page)
     if window_min > 0
-      out << page_li( 1, 0 )
+      out << page_li(1, 0)
       out << ellipse_page if window_min > 1
     end
 
-    (window_min .. window_max).each do |page|
-      next if page < 0 or page > total_pages
+    (window_min..window_max).each do |page|
+      next if page < 0 || page > total_pages
       text = page + 1
-      out << page_li( text, page, page==current_page )
+      out << page_li(text, page, page == current_page)
     end
 
     if total_pages > window_max
       out << ellipse_page if total_pages > window_max + 1
-      out << page_li( total_pages + 1, total_pages )
+      out << page_li(total_pages + 1, total_pages)
     end
 
     next_page = current_page < total_pages ? current_page + 1 : false
@@ -302,10 +310,8 @@ format :html do
   def default_search_params
     set_default_search_params default_limit: 20
   end
-
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/search_type.rb ~~~~~~~~~~~
 end;end;end;end;