card 1.16.12 → 1.16.13

data/mod/05_standard/spec/set/right/password_spec.rb

@@ -3,27 +3,26 @@
 describe Card::Set::Right::Password do
 
   before :each do
-    @user_card = Card::Auth[ 'joe@user.com' ]
+    @account = Card::Auth[ 'joe@user.com' ]
   end
 
   describe '#update_attributes' do
-
     it 'should encrypt password' do
-      @user_card.account.password_card.update_attributes! content: 'new password'
-      expect(@user_card.account.password).not_to eq('new password')
-      assert_equal @user_card.id, Card::Auth.authenticate('joe@user.com', 'new password')
+      @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
-      password_card = @user_card.account.password_card
+      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
-        acct = @user_card.account
+        acct = @account
         original_pw = acct.password
         expect(original_pw.size).to be > 10
         pw_card = acct.password_card
@@ -33,9 +32,9 @@ describe Card::Set::Right::Password do
       end
 
       it "shouldn't break email editing" do
-        @user_card.account.update_attributes! subcards: {'+*password'=>'', '+*email'=>'joe2@user.com'}
-        expect(@user_card.account.email).to eq('joe2@user.com')
-        expect(@user_card.account.password).not_to be_empty
+        @account.update_attributes! subcards: {'+*password'=>'', '+*email'=>'joe2@user.com'}
+        expect(@account.email).to eq('joe2@user.com')
+        expect(@account.password).not_to be_empty
       end
     end
   end

data/mod/05_standard/spec/set/right/token_spec.rb

@@ -1,5 +1,23 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Token do
-  # SPECSTUB
+  before do
+    @token = Card['Anonymous+*account'].fetch trait: :token, new: {}
+  end
+
+  it 'should get 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
+    @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
+    @token.expiration = 'none'
+    expect(@token.term).to eq('permanent')
+    expect(@token.permanent?).to be true
+  end
 end

data/mod/05_standard/spec/set/type/signup_spec.rb

@@ -52,8 +52,8 @@ describe Card::Set::Type::Signup do
 
     it 'creates an authenticable token' do
       expect(@account.token).to eq(@token)
-      expect(@account.authenticate_by_token(@token)).to eq(@signup.id)
-      expect(@account.fetch(trait: :token)).not_to be_present
+      expect(@account.validate_token!(@token)).to be_truthy
+      expect(@account.errors).to be_empty
     end
 
     it 'notifies someone' do
@@ -83,9 +83,8 @@ describe Card::Set::Type::Signup do
       @account.reload
       # token gets updated
       expect(@account.token).not_to eq(@token)
-      success = Card::Env.params[:success]
       # user notified of expired token
-      expect(success[:message]).to match(/expired/)
+      expect(Card::Env.success.message).to match(/expired/)
     end
   end
 

data/spec/lib/card/auth_spec.rb

@@ -1,17 +1,58 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Auth do
+  before do
+    Card::Auth.current_id = Card::AnonymousID
+    @joeuserid = Card['Joe User'].id
+  end
 
   it 'should authenticate user' do
-    assert_equal Card::Auth[ 'joe@user.com' ].id, Card::Auth.authenticate('joe@user.com', 'joe_pass')
+    authenticated = Card::Auth.authenticate 'joe@user.com', 'joe_pass'
+    expect(authenticated.left_id).to eq(@joeuserid)
   end
 
   it 'should authenticate user despite whitespace' do
-    assert_equal Card::Auth[ 'joe@user.com' ].id, Card::Auth.authenticate(' joe@user.com ', ' joe_pass ')
+    authenticated = Card::Auth.authenticate ' joe@user.com ', ' joe_pass '
+    expect(authenticated.left_id).to eq(@joeuserid)
   end
 
   it 'should authenticate user with weird email capitalization' do
-    assert Card::Auth.authenticate('JOE@user.com', 'joe_pass')
+    authenticated = Card::Auth.authenticate 'JOE@user.com', 'joe_pass'
+    expect(authenticated.left_id).to eq(@joeuserid)
+  end
+
+  it 'should set current directly from email' do
+    Card::Auth.set_current_from_mark 'joe@user.com'
+    expect(Card::Auth.current_id).to eq(@joeuserid)
+  end
+
+  it 'should set current directly from id when mark is id' do
+    Card::Auth.set_current_from_mark @joeuserid
+    expect(Card::Auth.current_id).to eq(@joeuserid)
+  end
+
+  it 'should set current directly from id when mark is id' do
+    Card::Auth.set_current_from_mark @joeuserid
+    expect(Card::Auth.current_id).to eq(@joeuserid)
+  end
+
+  context 'with token' do
+    before do
+      @joeadmin = Card['Joe Admin']
+      @token = 'abcd'
+      Card::Auth.as_bot do
+        @joeadmin.account.token_card.update_attributes! content: @token
+      end
+    end
+
+    it 'should set current from token' do
+      Card::Auth.set_current_from_token @token
+      expect(Card::Auth.current_id).to eq(@joeadmin.id)
+    end
+
+    it 'should set arbitrary current from token on authorized account' do
+      Card::Auth.set_current_from_token @token, @joeuserid
+      expect(Card::Auth.current_id).to eq(@joeuserid)
+    end
   end
-  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.16.12
+  version: 1.16.13
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +308,7 @@ files:
 - db/migrate_core_cards/20150824135418_update_file_history.rb
 - db/migrate_core_cards/20150903130006_attachment_upload_cards.rb
 - db/migrate_core_cards/20150910085603_remove_performance_log_card.rb
+- db/migrate_core_cards/20151120180631_add_token_expiration.rb
 - db/migrate_core_cards/data/1.11_help_text.json
 - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_core_cards/data/1.12_stylesheets/common.scss