card 1.16.8 → 1.16.9

data/db/seed/test/seed.rb

@@ -4,8 +4,8 @@ require 'timecop'
 class SharedData
   #attr_accessor :users
   USERS = [
-            'Joe User', 'Joe Admin', 'Joe Camel', 'Sample User', 'No count', 
-            'u1', 'u2', 'u3', 
+            'Joe User', 'Joe Admin', 'Joe Camel', 'Sample User', 'No count',
+            'u1', 'u2', 'u3',
             'Big Brother', 'Optic fan', 'Sunglasses fan', 'Narcissist'
            ]
 
@@ -14,188 +14,202 @@ class SharedData
   end
 
   def self.add_test_data
-    
+
     Card::Cache.reset_global
     Card::Env.reset
     Card::Auth.as_bot
 
-    Card.create! :name=>"Joe User",  :type_code=>'user', :content=>"I'm number two", :subcards=>account_args( '+*email'=>'joe@user.com'  )
-    Card.create! :name=>"Joe Admin", :type_code=>'user', :content=>"I'm number one", :subcards=>account_args( '+*email'=>'joe@admin.com' )
-    Card.create! :name=>"Joe Camel", :type_code=>'user', :content=>"Mr. Buttz",      :subcards=>account_args( '+*email'=>'joe@camel.com' )
-
-    Card['Joe Admin'].fetch(:trait=>:roles, :new=>{:type_code=>'pointer'}).items = [ Card::AdministratorID ]
+    Card::Auth.instant_account_activation do
+      Card.create! name: "Joe User",  type_code: 'user',
+                   content: "I'm number two",
+                   subcards: account_args( '+*email'=>'joe@user.com'  )
+      Card.create! name: "Joe Admin", type_code: 'user',
+                   content: "I'm number one",
+                   subcards: account_args( '+*email'=>'joe@admin.com' )
+      Card.create! name: "Joe Camel", type_code: 'user',
+                   content: "Mr. Buttz",
+                   subcards: account_args( '+*email'=>'joe@camel.com' )
+
+      # data for testing users and account requests
+      Card.create! type_code: 'user', name: "No Count",
+                   content: "I got no account"
+      Card.create! name: "Sample User", type_code: 'user',
+                   subcards: account_args(
+                     '+*email'=>'sample@user.com', '+*password'=>'sample_pass'
+                   )
+    end
 
-    Card.create! :name=>'signup alert email+*to', :content=>'signups@wagn.org'
+    Card['Joe Admin'].fetch(trait: :roles, new: {type_code: 'pointer'})
+      .items = [ Card::AdministratorID ]
+    Card.create! name: 'signup alert email+*to', content: 'signups@wagn.org'
 
     # generic, shared attribute card
-    color = Card.create! :name=>"color"
-    basic = Card.create! :name=>"Basic Card"
-
-    # data for testing users and account requests
-
-    Card.create! :type_code=>'user', :name=>"No Count", :content=>"I got no account"
-
-    
-    Card.create! :name=>"Sample User", :type_code=>'user', :subcards=>account_args('+*email'=>'sample@user.com', '+*password'=>'sample_pass')
+    color = Card.create! name: 'color'
+    basic = Card.create! name: "Basic Card"
 
     # CREATE A CARD OF EACH TYPE
-
-    Card.create! :type_id=>Card::SignupID, :name=>"Sample Signup" #, :email=>"invitation@request.com"
+    Card.create! type_id: Card::SignupID, name: "Sample Signup" #, email: "invitation@request.com"
     #above still necessary?  try commenting out above and 'Sign up' below
     Card::Auth.current_id = Card::WagnBotID # need to reset after creating sign up, which changes current_id for extend phase
 
     Card::Auth.createable_types.each do |type|
-      next if ['User', 'Sign up', 'Set', 'Number'].include? type
-      Card.create! :type=>type, :name=>"Sample #{type}"
+      next if ['User', 'Sign up', 'Set', 'Number', 'List', 'Listed by'].include? type
+      Card.create! type: type, name: "Sample #{type}"
     end
 
 
 
     # data for role_test.rb
 
-    Card.create! :name=>"u1", :type_code=>'user', :subcards=>account_args('+*email'=>'u1@user.com', '+*password'=>'u1_pass')
-    Card.create! :name=>"u2", :type_code=>'user', :subcards=>account_args('+*email'=>'u2@user.com', '+*password'=>'u2_pass')
-    Card.create! :name=>"u3", :type_code=>'user', :subcards=>account_args('+*email'=>'u3@user.com', '+*password'=>'u3_pass')
+    Card.create! name: 'u1', type_code: 'user', subcards: account_args('+*email'=>'u1@user.com', '+*password'=>'u1_pass')
+    Card.create! name: 'u2', type_code: 'user', subcards: account_args('+*email'=>'u2@user.com', '+*password'=>'u2_pass')
+    Card.create! name: 'u3', type_code: 'user', subcards: account_args('+*email'=>'u3@user.com', '+*password'=>'u3_pass')
 
-    r1 = Card.create!( :type_code=>'role', :name=>'r1' )
-    r2 = Card.create!( :type_code=>'role', :name=>'r2' )
-    r3 = Card.create!( :type_code=>'role', :name=>'r3' )
-    r4 = Card.create!( :type_code=>'role', :name=>'r4' )
+    r1 = Card.create!( type_code: 'role', name: 'r1' )
+    r2 = Card.create!( type_code: 'role', name: 'r2' )
+    r3 = Card.create!( type_code: 'role', name: 'r3' )
+    r4 = Card.create!( type_code: 'role', name: 'r4' )
 
-    Card['u1'].fetch( :trait=>:roles, :new=>{} ).items = [ r1, r2, r3 ]
-    Card['u2'].fetch( :trait=>:roles, :new=>{} ).items = [ r1, r2, r4 ]
-    Card['u3'].fetch( :trait=>:roles, :new=>{} ).items = [ r1, r4, Card::AdministratorID ]
+    Card['u1'].fetch( trait: :roles, new: {} ).items = [ r1, r2, r3 ]
+    Card['u2'].fetch( trait: :roles, new: {} ).items = [ r1, r2, r4 ]
+    Card['u3'].fetch( trait: :roles, new: {} ).items = [ r1, r4, Card::AdministratorID ]
 
-    c1 = Card.create! :name=>'c1'
-    c2 = Card.create! :name=>'c2'
-    c3 = Card.create! :name=>'c3'
+    c1 = Card.create! name: 'c1'
+    c2 = Card.create! name: 'c2'
+    c3 = Card.create! name: 'c3'
 
     # cards for rename_test
     # FIXME: could probably refactor these..
-    z = Card.create! :name=>"Z", :content=>"I'm here to be referenced to"
-    a = Card.create! :name=>"A", :content=>"Alpha [[Z]]"
-    b = Card.create! :name=>"B", :content=>"Beta {{Z}}"
-    t = Card.create! :name=>"T", :content=>"Theta"
-    x = Card.create! :name=>"X", :content=>"[[A]] [[A+B]] [[T]]"
-    y = Card.create! :name=>"Y", :content=>"{{B}} {{A+B}} {{A}} {{T}}"
-    ab = Card.create! :name => "A+B", :content => "AlphaBeta"
+    z = Card.create! name: 'Z', content: "I'm here to be referenced to"
+    a = Card.create! name: 'A', content: "Alpha [[Z]]"
+    b = Card.create! name: 'B', content: "Beta {{Z}}"
+    t = Card.create! name: 'T', content: 'Theta'
+    x = Card.create! name: 'X', content: "[[A]] [[A+B]] [[T]]"
+    y = Card.create! name: 'Y', content: "{{B}} {{A+B}} {{A}} {{T}}"
+    ab = Card.create! name: "A+B", content: 'AlphaBeta'
 
-    Card.create! :name=>"One+Two+Three"
-    Card.create! :name=>"Four+One+Five"
+    Card.create! name: "One+Two+Three"
+    Card.create! name: "Four+One+Five"
 
     # for wql & permissions
-    %w{ A+C A+D A+E C+A D+A F+A A+B+C }.each do |name| Card.create!(:name=>name)  end
-    Card.create! :type_code=>'cardtype', :name=>"Cardtype A", :codename=>"cardtype_a"
-    Card.create! :type_code=>'cardtype', :name=>"Cardtype B", :codename=>"cardtype_b"
-    Card.create! :type_code=>'cardtype', :name=>"Cardtype C", :codename=>"cardtype_c"
-    Card.create! :type_code=>'cardtype', :name=>"Cardtype D", :codename=>"cardtype_d"
-    Card.create! :type_code=>'cardtype', :name=>"Cardtype E", :codename=>"cardtype_e"
-    Card.create! :type_code=>'cardtype', :name=>"Cardtype F", :codename=>"cardtype_f"
-
-    Card.create! :name=>'basicname', :content=>'basiccontent'
-    Card.create! :type_code=>'cardtype_a', :name=>"type-a-card", :content=>"type_a_content"
-    Card.create! :type_code=>'cardtype_b', :name=>"type-b-card", :content=>"type_b_content"
-    Card.create! :type_code=>'cardtype_c', :name=>"type-c-card", :content=>"type_c_content"
-    Card.create! :type_code=>'cardtype_d', :name=>"type-d-card", :content=>"type_d_content"
-    Card.create! :type_code=>'cardtype_e', :name=>"type-e-card", :content=>"type_e_content"
-    Card.create! :type_code=>'cardtype_f', :name=>"type-f-card", :content=>"type_f_content"
+    %w{ A+C A+D A+E C+A D+A F+A A+B+C }.each do |name| Card.create!(name: name)  end
+    Card.create! type_code: 'cardtype', name: "Cardtype A", codename: 'cardtype_a'
+    Card.create! type_code: 'cardtype', name: "Cardtype B", codename: 'cardtype_b'
+    Card.create! type_code: 'cardtype', name: "Cardtype C", codename: 'cardtype_c'
+    Card.create! type_code: 'cardtype', name: "Cardtype D", codename: 'cardtype_d'
+    Card.create! type_code: 'cardtype', name: "Cardtype E", codename: 'cardtype_e'
+    Card.create! type_code: 'cardtype', name: "Cardtype F", codename: 'cardtype_f'
+
+    Card.create! name: 'basicname', content: 'basiccontent'
+    Card.create! type_code: 'cardtype_a', name: "type-a-card", content: 'type_a_content'
+    Card.create! type_code: 'cardtype_b', name: "type-b-card", content: 'type_b_content'
+    Card.create! type_code: 'cardtype_c', name: "type-c-card", content: 'type_c_content'
+    Card.create! type_code: 'cardtype_d', name: "type-d-card", content: 'type_d_content'
+    Card.create! type_code: 'cardtype_e', name: "type-e-card", content: 'type_e_content'
+    Card.create! type_code: 'cardtype_f', name: "type-f-card", content: 'type_f_content'
 
     #warn "current user #{User.session_user.inspect}.  always ok?  #{Card::Auth.always_ok?}"
-    c = Card.create! :name=>'revtest', :content=>'first'
-    c.update_attributes! :content=>'second'
-    c.update_attributes! :content=>'third'
-    #Card.create! :type_code=>'cardtype', :name=>'*priority'
+    c = Card.create! name: 'revtest', content: 'first'
+    c.update_attributes! content: 'second'
+    c.update_attributes! content: 'third'
+    #Card.create! type_code: 'cardtype', name: '*priority'
 
     # for template stuff
-    Card.create! :type_id=>Card::CardtypeID, :name=> "UserForm"
-    Card.create! :name=>"UserForm+*type+*structure", :content=>"{{+name}} {{+age}} {{+description}}"
+    Card.create! type_id: Card::CardtypeID, name: 'UserForm'
+    Card.create! name: "UserForm+*type+*structure", content: "{{+name}} {{+age}} {{+description}}"
 
     Card::Auth.current_id = Card['joe_user'].id
-    Card.create!( :name=>"JoeLater", :content=>"test")
-    Card.create!( :name=>"JoeNow", :content=>"test")
+    Card.create!( name: 'JoeLater', content: 'test')
+    Card.create!( name: 'JoeNow', content: 'test')
 
     Card::Auth.current_id = Card::WagnBotID
-    Card.create!(:name=>"AdminNow", :content=>"test")
+    Card.create!(name: 'AdminNow', content: 'test')
+
+    Card.create name: 'Cardtype B+*type+*create', type: 'Pointer', content: '[[r1]]'
 
-    Card.create :name=>'Cardtype B+*type+*create', :type=>'Pointer', :content=>'[[r1]]'
+    Card.create! type: 'Cardtype', name: 'Book'
+    Card.create! name: "Book+*type+*structure", content: "by {{+author}}, design by {{+illustrator}}"
+    Card.create! name: 'Iliad', type: 'Book'
 
-    Card.create! :type=>"Cardtype", :name=>"Book"
-    Card.create! :name=>"Book+*type+*structure", :content=>"by {{+author}}, design by {{+illustrator}}"
-    Card.create! :name => "Iliad", :type=>"Book"
+    Card.create! type: 'Cardtype', name: 'Author'
+    Card.create! type: 'Author', name: 'Darles Chickens'
+    Card.create! type: 'Author', name: 'Stam Broker'
+    Card.create! name: 'Parry Hotter', type: 'Book'
+    Card.create! name: '50 grades of shy' , type: 'Book'
 
 
     ### -------- Notification data ------------
     Timecop.freeze(Cardio.future_stamp - 1.day) do
       # fwiw Timecop is apparently limited by ruby Time object, which goes only to 2037 and back to 1900 or so.
       #  whereas DateTime can represent all dates.
- 
-      
+
+
       followers = {
         'John'           => ['John Following', 'All Eyes On Me'],
-        'Sara'           => ['Sara Following', 'All Eyes On Me', 'Optic+*type', 'Google Glass'], 
+        'Sara'           => ['Sara Following', 'All Eyes On Me', 'Optic+*type', 'Google Glass'],
         'Big Brother'    => ['All Eyes on Me', 'Look at me+*self', 'Optic+*type', 'lens+*right', 'Optic+tint+*type plus right', ['*all','*created'], ['*all','*edited']],
         'Optic fan'      => ['Optic+*type'],
         'Sunglasses fan' => ['Sunglasses'],
         'Narcissist'     => [['*all','*created'], ['*all','*edited']]
       }
-      
+
       followers.each do |name, follow|
-        user = Card.create! :name=>name, :type_code=>'user', :subcards=>account_args('+*email'=>"#{name.parameterize}@user.com", '+*password'=>"#{name.parameterize}_pass")
+        user = Card.create! name: name, type_code: 'user', subcards: account_args('+*email'=>"#{name.parameterize}@user.com", '+*password'=>"#{name.parameterize}_pass")
       end
-      
-      Card.create! :name => "All Eyes On Me"
-      Card.create! :name => "No One Sees Me"
-      Card.create! :name => "Look At Me"
-      Card.create! :name => "Optic", :type => "Cardtype"
-      Card.create! :name => "Sara Following"
-      Card.create! :name => "John Following", :content => "{{+her}}"
-      Card.create! :name => "John Following+her"
-      magnifier = Card.create! :name => "Magnifier+lens"
+
+      Card.create! name: "All Eyes On Me"
+      Card.create! name: "No One Sees Me"
+      Card.create! name: "Look At Me"
+      Card.create! name: 'Optic', type: 'Cardtype'
+      Card.create! name: "Sara Following"
+      Card.create! name: "John Following", content: "{{+her}}"
+      Card.create! name: "John Following+her"
+      magnifier = Card.create! name: "Magnifier+lens"
 
       Card::Auth.current_id = Card['Narcissist'].id
-      magnifier.update_attributes! :content=>"zoom in"
-      Card.create! :name => "Sunglasses", :type=>"Optic", :content=>"{{+tint}}{{+lens}}"
-      
+      magnifier.update_attributes! content: "zoom in"
+      Card.create! name: 'Sunglasses', type: 'Optic', content: "{{+tint}}{{+lens}}"
+
       Card::Auth.current_id = Card['Optic fan'].id
-      Card.create! :name => "Google glass", :type=>"Optic", :content=>"{{+price}}"
-      
+      Card.create! name: "Google glass", type: 'Optic', content: "{{+price}}"
+
       Card::Auth.current_id = Card::WagnBotID
-      Card.create! :name=>'Google glass+*self+*follow_fields', :content=>''
-      Card.create! :name=>'Sunglasses+*self+*follow_fields', :content=>"[[#{Card[:includes].name}]]\n[[_self+price]]\n[[_self+producer]]"
-      Card.create! :name => "Sunglasses+tint"
-      Card.create! :name => "Sunglasses+price" 
+      Card.create! name: 'Google glass+*self+*follow_fields', content: ''
+      Card.create! name: 'Sunglasses+*self+*follow_fields', content: "[[#{Card[:includes].name}]]\n[[_self+price]]\n[[_self+producer]]"
+      Card.create! name: "Sunglasses+tint"
+      Card.create! name: "Sunglasses+price"
 
       followers.each do |name, follow|
         user = Card[name]
         follow.each do |f|
           user.follow *f
         end
-      end     
+      end
     end
 
 
     ## --------- create templated permissions -------------
-    ctt = Card.create! :name=> 'Cardtype E+*type+*default'
+    ctt = Card.create! name: 'Cardtype E+*type+*default'
 
 
     ## --------- Fruit: creatable by anon but not readable ---
-    f = Card.create! :type=>"Cardtype", :name=>"Fruit"
-    Card.create! :name=>'Fruit+*type+*create', :type=>'Pointer', :content=>'[[Anyone]]'
-    Card.create! :name=>'Fruit+*type+*read', :type=>'Pointer', :content=>'[[Administrator]]'
+    f = Card.create! type: 'Cardtype', name: 'Fruit'
+    Card.create! name: 'Fruit+*type+*create', type: 'Pointer', content: '[[Anyone]]'
+    Card.create! name: 'Fruit+*type+*read', type: 'Pointer', content: '[[Administrator]]'
 
     # codenames for card_accessor tests
-    Card.create! :name=>'*write', :codename=>:write
+    Card.create! name: '*write', codename: :write
 
     # -------- For toc testing: ------------
 
-    Card.create! :name=>"OnneHeading", :content => "<h1>This is one heading</h1>\r\n<p>and some text</p>"
-    Card.create! :name=>'TwwoHeading', :content => "<h1>One Heading</h1>\r\n<p>and some text</p>\r\n<h2>And a Subheading</h2>\r\n<p>and more text</p>"
-    Card.create! :name=>'ThreeHeading', :content =>"<h1>A Heading</h1>\r\n<p>and text</p>\r\n<h2>And Subhead</h2>\r\n<p>text</p>\r\n<h1>And another top Heading</h1>"
+    Card.create! name: 'OnneHeading', content: "<h1>This is one heading</h1>\r\n<p>and some text</p>"
+    Card.create! name: 'TwwoHeading', content: "<h1>One Heading</h1>\r\n<p>and some text</p>\r\n<h2>And a Subheading</h2>\r\n<p>and more text</p>"
+    Card.create! name: 'ThreeHeading', content: "<h1>A Heading</h1>\r\n<p>and text</p>\r\n<h2>And Subhead</h2>\r\n<p>text</p>\r\n<h1>And another top Heading</h1>"
 
     # -------- For history testing: -----------
-    first = Card.create! :name=>"First", :content => 'egg'
-    first.update_attributes! :content=> 'chicken'
-    first.update_attributes! :content=> 'chick'
+    first = Card.create! name: 'First', content: 'egg'
+    first.update_attributes! content: 'chicken'
+    first.update_attributes! content: 'chick'
 
   end
 end

data/lib/card.rb

@@ -18,8 +18,6 @@ class Card < ActiveRecord::Base
     attr_accessor *args
   end
 
-
-
   require_dependency 'card/active_record_ext'
   require_dependency 'card/codename'
   require_dependency 'card/query'
@@ -32,6 +30,7 @@ class Card < ActiveRecord::Base
   require_dependency 'card/act'
   require_dependency 'card/change'
   require_dependency 'card/reference'
+  require_dependency 'card/subcards'
   require_dependency 'card/view_cache'
 
   has_many :references_from, class_name: :Reference, foreign_key: :referee_id
@@ -43,7 +42,7 @@ class Card < ActiveRecord::Base
   cattr_accessor :set_patterns, :error_codes, :serializable_attributes, :set_specific_attributes
   @@set_patterns, @@error_codes = [], {}
 
-  serializable_attr_accessor :action, :supercard, :current_act, :current_action,
+  serializable_attr_accessor :action, :supercard, :superleft, :current_act, :current_action,
     :comment, :comment_author,    # obviated soon
     :update_referencers,          # wrong mechanism for this
     :update_all_users,            # if the above is wrong then this one too

data/lib/card/active_record_helper.rb

@@ -0,0 +1,44 @@
+module Card::ActiveRecordHelper
+  def create_card args
+    resolve_name_conflict args
+    Card.create! args
+  end
+
+  def create_card! args
+    create_card args.merge(rename_if_conflict: :other)
+  end
+
+  def update_card name, args
+    resolve_name_conflict args
+    Card[name].update_attributes! args
+  end
+
+  def update_card! args
+    update_card args.merge(resolve_name_conflict: :other)
+  end
+
+  def create_or_update name_or_args, args=nil
+    name = args ? name_or_args : name_or_args[:name]
+    args ||= name_or_args
+    if Card[name]
+      update_card name, args
+    else
+      create_card args.merge(:name=>name)
+    end
+  end
+
+  def create_or_update! name_or_args, args=nil
+    if args
+      args[:resolve_name_conflict] = :other
+    else
+      name_or_args[:resolve_name_conflict] = :other
+    end
+    create_or_update name_or_args, args
+  end
+
+  def resolve_name_conflict args
+    if (rename = args.delete :rename_if_conflict)
+      args[:name] = Card.uniquify_name args[:name], rename == :other
+    end
+  end
+end

data/lib/card/auth.rb

@@ -2,30 +2,30 @@
 
 class Card
   module Auth
-    @@as_card = @@as_id = @@current_id = @@current = @@simulating_setup_need = nil
+    @@as_card = @@as_id = @@current_id = @@current = nil
+    @@simulating_setup_need = nil
 
     NON_CREATEABLE_TYPES = %w{ signup setting set } # NEED API
-    NEED_SETUP_KEY = 'NEED_SETUP'
+    SETUP_COMPLETED_KEY = 'SETUP_COMPLETED'
 
-    #after_save :reset_instance_cache
+    # after_save :reset_instance_cache
 
     class << self
-
       # Authenticates a user by their login name and unencrypted password.
       def authenticate email, password
-        accounted = Auth[ email ]
-        if accounted and account = accounted.account and account.active?
-          if Card.config.no_authentication or password_authenticated?( account, password.strip )
-            accounted.id
-          end
+        accounted = Auth[email]
+        return unless accounted && (account = accounted.account) &&
+                      account.active?
+        if Card.config.no_authentication ||
+           password_authenticated?(account, password.strip)
+          accounted.id
         end
       end
 
       def password_authenticated? account, password
-        account.password == encrypt( password, account.salt )
+        account.password == encrypt(password, account.salt)
       end
 
-
       # Encrypts some data with the salt.
       def encrypt password, salt
         Digest::SHA1.hexdigest "#{salt}--#{password}--"
@@ -34,9 +34,11 @@ class Card
       # find accounted by email
       def [] email
         Auth.as_bot do
-          Card.search( right_plus: [
-            {id: Card::AccountID},
-            {right_plus: [{id: Card::EmailID},{ content: email.strip.downcase }]}
+          Card.search(right_plus: [
+            { id: Card::AccountID },
+            { right_plus: [
+              { id: Card::EmailID }, { content: email.strip.downcase }
+            ] }
           ]).first
         end
       end
@@ -53,7 +55,7 @@ class Card
       def set_current_from_session
         self.current_id =
           if session
-            if card_id=session[:user] and Card.exists? card_id
+            if (card_id = session[:user]) && Card.exists?(card_id)
               card_id
             else
               session[:user] = nil
@@ -81,28 +83,23 @@ class Card
 
       def get_user_id user
         case user
-        when NilClass;   nil
-        when Card    ;   user.id
-        when Integer ;   user
-        else
-          user = user.to_s
-          Card::Codename[user] or (cd=Card[user] and cd.id)
+        when NilClass then nil
+        when Card     then user.id
+        else Card.fetch_id(user)
         end
       end
 
       def as given_user
         tmp_id, tmp_card = @@as_id, @@as_card
-        @@as_id, @@as_card = get_user_id( given_user ), nil  # we could go ahead and set as_card if given a card...
+        # we could go ahead and set as_card if given a card...
+        @@as_id, @@as_card = get_user_id(given_user), nil
 
         @@current_id = @@as_id if @@current_id.nil?
 
-        if block_given?
-          value = yield
-          @@as_id, @@as_card = tmp_id, tmp_card
-          return value
-        else
-          #fail "BLOCK REQUIRED with Card#as"
-        end
+        return unless block_given?
+        value = yield
+        @@as_id, @@as_card = tmp_id, tmp_card
+        value
       end
 
       def as_bot &block
@@ -118,7 +115,7 @@ class Card
       end
 
       def as_card
-        if @@as_card and @@as_card.id == as_id
+        if @@as_card && @@as_card.id == as_id
           @@as_card
         else
           @@as_card = Card[as_id]
@@ -130,43 +127,51 @@ class Card
       end
 
       def needs_setup?
-        test = Card.cache.read NEED_SETUP_KEY
-        !test.nil? ? test : begin
-          @@simulating_setup_need or Card.cache.write( NEED_SETUP_KEY, (account_count < 3) ) # 3, because
-        end
+        @@simulating_setup_need || (
+          !Card.cache.read(SETUP_COMPLETED_KEY) &&
+          !Card.cache.write(SETUP_COMPLETED_KEY, account_count > 2)
+        )
+        # every deck starts with WagnBot and Anonymous account
       end
 
       def simulate_setup_need! mode=true
         @@simulating_setup_need = mode
-        Card.cache.write NEED_SETUP_KEY, nil
       end
 
+      def instant_account_activation
+        simulate_setup_need!
+        yield
+      ensure
+        simulate_setup_need! false
+      end
 
       def always_ok?
-        #warn Rails.logger.warn("aok? #{as_id}, #{as_id&&Card[as_id].id}")
-        return false unless usr_id = as_id
-        return true if usr_id == Card::WagnBotID #cannot disable
+        # warn Rails.logger.warn("aok? #{as_id}, #{as_id&&Card[as_id].id}")
+        return false unless (usr_id = as_id)
+        return true if usr_id == Card::WagnBotID # cannot disable
 
         always = Card.cache.read('ALWAYS') || {}
-        #warn(Rails.logger.warn "Auth.always_ok? #{usr_id}")
+        # warn(Rails.logger.warn "Auth.always_ok? #{usr_id}")
         if always[usr_id].nil?
           always = always.dup if always.frozen?
-          always[usr_id] = !!Card[usr_id].all_roles.detect{|r|r==Card::AdministratorID}
-          #warn(Rails.logger.warn "update always hash #{always[usr_id]}, #{always.inspect}")
+          always[usr_id] =
+            !!Card[usr_id].all_roles.find { |r| r == Card::AdministratorID }
+          # warn(Rails.logger.warn "update always hash #{always[usr_id]},
+          # #{always.inspect}")
           Card.cache.write 'ALWAYS', always
         end
-        #warn Rails.logger.warn("aok? #{usr_id}, #{always[usr_id]}")
+        # warn Rails.logger.warn("aok? #{usr_id}, #{always[usr_id]}")
         always[usr_id]
       end
       # PERMISSIONS
 
-
       def createable_types
         type_names = Auth.as_bot do
-          Card.search type: Card::CardtypeID, return: :name, not: { codename: ['in'] + NON_CREATEABLE_TYPES }
+          Card.search type: Card::CardtypeID, return: :name,
+                      not: { codename: ['in'] + NON_CREATEABLE_TYPES }
         end
-        type_names.reject do |name|
-          !Card.new( type: name ).ok? :create
+        type_names.select do |name|
+          Card.new(type: name).ok? :create
         end.sort
       end
 
@@ -175,7 +180,6 @@ class Card
       def account_count
         as_bot { Card.count_by_wql right: Card[:account].name }
       end
-
     end
   end
 end