card 1.19.6 → 1.20.0

data/mod/account/set/type/signup.rb

@@ -1,45 +1,46 @@
 format :html do
-  def default_new_args args
-    super args
-    args.merge!(
-      optional_help: :show, # , optional_menu: :never
-      buttons: submit_button,
-      account: card.fetch(trait: :account, new: {}),
-      title: "Sign up",
-      hidden: {
-        success: (card.rule(:thanks) || "_self"),
-        "card[type_id]" => card.type_id
-      }
-    )
-    return unless Auth.signed_in? && args[:account].confirm_ok?
-    invite_args args
+  def invitation?
+    if @invitation.nil?
+      @invitation = Auth.signed_in? && args[:account].confirm_ok?
+    else
+      @invitation
+    end
   end
 
-  def invite_args args
-    args[:title] = "Invite"
-    args[:buttons] = button_tag("Send Invitation", situation: "primary")
-    args[:hidden][:success] = "_self"
+  view :new do
+    voo.title = invitation? ? "Invite" : "Sign up"
+    super()
   end
 
-  view :new do |args|
-    # FIXME: make more use of standard new view?
+  def default_name_formgroup_args _args
+    voo.help = "usually first and last name"
+  end
+
+  view :content_formgroup do
+    [account_formgroups, (card.structure ? edit_slot : "")].join
+  end
 
-    frame_and_form :create, args, "main-success" => "REDIRECT" do
-      [
-        _render_name_formgroup(help: "usually first and last name"),
-        _optional_render(:account_formgroups, args),
-        (card.structure ? edit_slot : ""),
-        _optional_render(:button_formgroup, args)
-      ]
+  def hidden_success override=nil
+    override = card.rule(:thanks) unless invitation?
+    super override
+  end
+
+  view :new_buttons do
+    button_formgroup do
+      [standard_submit_button, invite_button].compact
     end
   end
 
-  view :account_formgroups do |args|
-    sub_args = { structure: true }
-    sub_args[:no_password] = true if Auth.signed_in?
+  def invite_button
+    return unless invitation?
+    button_tag "Send Invitation", situation: "primary"
+  end
+
+  def account_formgroups
+    account = card.fetch trait: :account, new: {}
     Auth.as_bot do
-      subformat(args[:account])._render :content_formgroup, sub_args
-    end # YUCK!!!!
+      subformat(account)._render :content_formgroup, structure: true
+    end
   end
 
   view :core do |_args|

data/mod/account/set/type/user.rb

@@ -6,30 +6,41 @@ attr_accessor :email
 format :html do
   view :setup, tags: :unknown_ok,
                perms: ->(_r) { Auth.needs_setup? } do |args|
-    account = card.fetch trait: :account, new: {}
+    voo.title = "Welcome, Wagneer!"
+    voo.show! :help
+    voo.hide! :menu
+
     Auth.as_bot do
-      frame_and_form :create, args do
+      frame_and_form :create do
         [
+          setup_hidden_fields,
+
           _render_name_formgroup(help: "usually first and last name"),
-          subformat(account)._render(:content_formgroup, structure: true),
-          _render_button_formgroup(args)
+          account_formgroup,
+          setup_form_buttons
         ]
       end
     end
   end
 
-  def default_setup_args args
-    args.merge!(
-      title: "Welcome, Wagneer!",
-      optional_help: :show,
-      optional_menu: :never,
-      help_text: help_text,
-      buttons: setup_button,
-      hidden: {
-        success: "REDIRECT: #{Card.path_setting '/'}",
-        "card[type_id]" => Card.default_accounted_type_id,
-        "setup" => true
-      }
+  def setup_form_buttons
+    button_formgroup { setup_button }
+  end
+
+  def account_formgroup
+    account = card.fetch trait: :account, new: {}
+    subformat(account)._render :content_formgroup, structure: true
+  end
+
+  def setup_button
+    submit_button text: "Set up", disable_with: "Setting up"
+  end
+
+  def setup_hidden_fields
+    hidden_tags(
+      setup: true,
+      success: "REDIRECT: #{Card.path_setting '/'}",
+      "card[type_id]" => Card.default_accounted_type_id
     )
   end
 
@@ -38,15 +49,11 @@ format :html do
     if Card.config.action_mailer.perform_deliveries == false
       text += <<-HTML
         <br>WARNING: Email delivery is turned off.
-        Change settings in config/application.rb to send sign up notifications.'
+        Change settings in config/application.rb to send sign up notifications.
       HTML
     end
     text
   end
-
-  def setup_button
-    submit_button text: "Set up", disable_with: "Setting up"
-  end
 end
 
 event :setup_as_bot, before: :check_permissions, on: :create,

data/mod/account/spec/set/all/account_spec.rb

@@ -2,11 +2,11 @@
 
 describe Card::Set::All::Account do
   describe "accountable?" do
-    it "should be false for cards with *accountable rule off" do
+    it "is false for cards with *accountable rule off" do
       expect(Card["A"].accountable?).to eq(false)
     end
 
-    it "should be true for cards with *accountable rule on" do
+    it "is true for cards with *accountable rule on" do
       Card::Auth.as_bot do
         Card.create name: "A+*self+*accountable", content: "1"
         Card.create name: "*account+*right+*create",
@@ -35,11 +35,11 @@ describe Card::Set::All::Account do
         @parties = @joe_user_card.parties # note: must be called to test resets
       end
 
-      it "should initially have only auth and self " do
+      it "initially has only auth and self " do
         expect(@parties).to eq([Card::AnyoneSignedInID, @joe_user_card.id])
       end
 
-      it "should update when new roles are set" do
+      it "updates when new roles are set" do
         roles_card = @joe_user_card.fetch trait: :roles, new: {}
         r1 = Card["r1"]
 
@@ -68,13 +68,13 @@ describe Card::Set::All::Account do
   end
 
   describe "among?" do
-    it "should be true for self" do
+    it "is true for self" do
       expect(Card::Auth.current.among?([Card::Auth.current_id])).to be_truthy
     end
   end
 
   describe "+*email" do
-    it "should create a card and account card" do
+    it "creates a card and account card" do
       jadmin = Card["joe admin"]
       Card::Auth.current_id = jadmin.id
       # simulate login to get correct from address
@@ -98,19 +98,19 @@ describe Card::Set::All::Account do
       @card = Card["Joe User"]
     end
 
-    it "should handle email updates" do
+    it "handles email updates" do
       @card.update_attributes! "+*account" => { "+*email" => "joe@user.co.uk" }
       expect(@card.account.email).to eq("joe@user.co.uk")
     end
 
-    it "should let Wagn Bot block accounts" do
+    it "lets Wagn Bot block accounts" do
       Card::Auth.as_bot do
         @card.account.status_card.update_attributes! content: "blocked"
         expect(@card.account.blocked?).to be_truthy
       end
     end
 
-    it "should not allow a user to block or unblock himself" do
+    it "does not allow a user to block or unblock himself" do
       expect do
         @card.account.status_card.update_attributes! content: "blocked"
       end.to raise_error(ActiveRecord::RecordInvalid,

data/mod/account/spec/set/right/account_spec.rb

@@ -16,13 +16,13 @@ describe Card::Set::Right::Account do
         end
       end
 
-      it "should create an authenticable password" do
+      it "creates an authenticable password" do
         validity = Card::Auth.password_valid? @user_card.account, "tmp_pass"
         expect(validity).to be_truthy
       end
     end
 
-    it "should check accountability of 'accounted' card" do
+    it "checks accountability of 'accounted' card" do
       @unaccountable = Card.create(
         name: "BasicUnaccountable",
         "+*account" => {
@@ -34,7 +34,7 @@ describe Card::Set::Right::Account do
       expect(error_msg).to eq("not allowed on this card")
     end
 
-    it "should require email" do
+    it "requires email" do
       @no_email = Card.create(
         name: "TmpUser",
         type_id: Card::UserID,
@@ -63,8 +63,11 @@ describe Card::Set::Right::Account do
     end
 
     it "contains link to verify account" do
-      url = "/update/#{@account.left.cardname.url_key}?token=#{@account.token}"
-      expect(@mail.parts[0].body.raw_source).to include(url)
+      raw_source = @mail.parts[0].body.raw_source
+      ["/update/#{@account.left.cardname.url_key}",
+       "token=#{@account.token}"].each do |url_part|
+        expect(raw_source).to include(url_part)
+      end
     end
 
     it "contains expiry days" do
@@ -87,10 +90,16 @@ describe Card::Set::Right::Account do
       expect(body).to match(Card.global_setting(:title))
     end
 
-    it "contains password resset link" do
+    it "contains password reset link" do
+      raw_source = @mail.parts[0].body.raw_source
       token = @account.token_card.refresh(true).content
-      url = "/update/#{@account.cardname.url_key}?token=#{token}"
-      expect(@mail.parts[0].body.raw_source).to include(url)
+      ["/update/#{@account.left.cardname.url_key}",
+       "token=#{token}",
+       "live_token=true",
+       "event=reset_password"].each do |url_part|
+
+        expect(raw_source).to include(url_part)
+      end
     end
 
     it "contains expiry days" do
@@ -104,13 +113,13 @@ describe Card::Set::Right::Account do
       @account = Card::Auth.find_account_by_email("joe@user.com")
     end
 
-    it "should reset password" do
+    it "resets password" do
       @account.password_card.update_attributes!(content: "new password")
       authenticated = Card::Auth.authenticate "joe@user.com", "new password"
       assert_equal @account, authenticated
     end
 
-    it "should not rehash password when updating email" do
+    it "does not rehash password when updating email" do
       @account.email_card.update_attributes! content: "joe2@user.com"
       authenticated = Card::Auth.authenticate "joe2@user.com", "joe_pass"
       assert_equal @account, authenticated
@@ -128,15 +137,15 @@ describe Card::Set::Right::Account do
       Card::Auth.current_id = Card::AnonymousID
     end
 
-    it "should authenticate with correct token and delete token card" do
+    it "authenticates with correct token" do
       expect(Card::Auth.current_id).to eq(Card::AnonymousID)
       expect(@account.save).to eq(true)
       expect(Card::Auth.current_id).to eq(@account.left_id)
       @account = @account.refresh true
-      expect(@account.fetch(trait: :token)).to be_nil
+      # expect(@account.fetch(trait: :token)).to be_nil
     end
 
-    it "should not work if token is expired" do
+    it "does not work if token is expired" do
       @account.token_card.update_column :updated_at,
                                         3.days.ago.strftime("%F %T")
       @account.token_card.expire
@@ -152,7 +161,7 @@ describe Card::Set::Right::Account do
       # user notified of expired token
     end
 
-    it "should not work if token is wrong" do
+    it "does not work if token is wrong" do
       Card::Env.params[:token] = @token + "xxx"
       Card::Env.params[:event] = "reset_password"
       @account.save

data/mod/account/spec/set/right/email_spec.rb

@@ -7,19 +7,19 @@ describe Card::Set::Right::Email do
       @format = @card.format
     end
 
-    it "should allow Wagn Bot to read" do
+    it "allows Wagn Bot to read" do
       Card::Auth.as_bot do
         expect(@format.render_raw).to eq("u1@user.com")
       end
     end
 
-    it "should allow self to read" do
+    it "allows self to read" do
       Card::Auth.as Card["u1"] do
         expect(@format.render_raw).to eq("u1@user.com")
       end
     end
 
-    it "should hide from other users" do
+    it "hides from other users" do
       expect(@card.ok?(:read)).to be_falsey
       expect(@format.render_raw).to match(/denied/)
     end
@@ -31,20 +31,20 @@ describe Card::Set::Right::Email do
         @email_card = Card["u1"].account.email_card
       end
 
-      it "should downcase email" do
+      it "downcases email" do
         Card::Auth.as_bot do
           @email_card.update_attributes! content: "QuIrE@example.com"
           expect(@email_card.content).to eq("quire@example.com")
         end
       end
 
-      it "should require valid email" do
+      it "requires valid email" do
         @email_card.update_attributes content: "boop"
         expect(@email_card.errors[:content].first)
           .to match(/must be valid address/)
       end
 
-      it "should require unique email" do
+      it "requires unique email" do
         @email_card.update_attributes content: "joe@user.com"
         expect(@email_card.errors[:content].first).to match(/must be unique/)
       end

data/mod/account/spec/set/right/password_spec.rb

@@ -6,21 +6,21 @@ describe Card::Set::Right::Password do
   end
 
   describe "#update_attributes" do
-    it "should encrypt password" do
+    it "encrypts password" do
       @account.password_card.update_attributes! content: "new password"
       expect(@account.password).not_to eq("new password")
       authenticated = Card::Auth.authenticate "joe@user.com", "new password"
       assert_equal @account, authenticated
     end
 
-    it "should validate password" do
+    it "validates password" do
       password_card = @account.password_card
       password_card.update_attributes content: "2b"
       expect(password_card.errors[:password]).not_to be_empty
     end
 
     context "blank password" do
-      it "shouldn't change the password" do
+      it "does not change the password" do
         acct = @account
         original_pw = acct.password
         expect(original_pw.size).to be > 10
@@ -30,7 +30,7 @@ describe Card::Set::Right::Password do
         expect(original_pw).to eq(pw_card.refresh(_force = true).content)
       end
 
-      it "shouldn't break email editing" do
+      it "does not break email editing" do
         @account.update_attributes! subcards: { "+*password" => "",
                                                 "+*email" => "joe2@user.com" }
         expect(@account.email).to eq("joe2@user.com")

data/mod/account/spec/set/right/token_spec.rb

@@ -5,17 +5,17 @@ describe Card::Set::Right::Token do
     @token = Card["Anonymous+*account"].fetch trait: :token, new: {}
   end
 
-  it "should get expiration from configuration by default" do
+  it "gets expiration from configuration by default" do
     expect(@token.term).to eq(Card.config.token_expiry)
   end
 
-  it "should get expiration from card if it exists" do
+  it "gets expiration from card if it exists" do
     @token.expiration = "3 days"
     expect(@token.term).to eq(3.days)
     expect(@token.permanent?).to be false
   end
 
-  it 'should be permanent if expiration is "none"' do
+  it 'is permanent if expiration is "none"' do
     @token.expiration = "none"
     expect(@token.term).to eq("permanent")
     expect(@token.permanent?).to be true

data/mod/account/spec/set/self/account_links_spec.rb

@@ -2,9 +2,9 @@
 
 describe Card::Set::Self::AccountLinks do
   it "has a 'my card' link" do
-    assert_view_select render_card(:core, name: "*account links"),
-                       'span[id="logging"]' do
-      assert_select 'a[id="my-card-link"]', text: "Joe User"
+    account_links = render_card :core, name: "*account links"
+    assert_view_select account_links, 'span[id="logging"]' do
+      assert_select 'a[class=~"my-card-link"]', text: "Joe User"
     end
   end
 end

data/mod/account/spec/set/self/signin_spec.rb

@@ -55,13 +55,13 @@ describe Card::Set::Self::Signin do
       Card::Env.params[:reset_password] = true
     end
 
-    it "should be triggered by an update" do
+    it "is triggered by an update" do
       # Card['joe admin'].account.token.should be_nil FIXME - this should be t
       @card.update_attributes! "+*email" => "joe@admin.com"
       expect(Card["joe admin"].account.token).not_to be_nil
     end
 
-    it "should return an error if email is not found" do
+    it "returns an error if email is not found" do
       @card.update_attributes "+*email" => "schmoe@admin.com"
       expect(@card.errors[:email].first).to match(/not recognized/)
     end