authkit 0.5.0 → 0.7.0

data/lib/generators/authkit/templates/spec/controllers/users_controller_spec.rb

@@ -1,12 +1,13 @@
 require 'rails_helper'
 
-describe UsersController do
+RSpec.describe UsersController do
   render_views
 
-  let(:user) { create(:user) }
+  let(:user_session) { create(:user_session) }
+  let(:user) { user_session.user }
   let(:user_params) { attributes_for(:user) }
   let(:invalid_params) { user_params.merge(password: 'newpassword', password_confirmation: 'wrongpassword') }
-  let(:logged_in_session) { { user_id: user.id } }
+  let(:logged_in_session) { { user_session_id: user_session.id } }
 
   describe "GET 'edit'" do
     it "redirects if there is no current user" do
@@ -15,14 +16,14 @@ describe UsersController do
     end
 
     it "edits the current user" do
-      get :edit, {}, logged_in_session
+      get :edit, session: logged_in_session
       expect(response).to be_success
     end
   end
 
   describe "PUT 'update'" do
     it "redirects if there is no current user" do
-      put :update, {user: user_params.merge(first_name: "Alvarez")}
+      put :update, params: { user: user_params.merge(first_name: "Alvarez") }
       expect(response).to be_redirect
     end
 
@@ -36,18 +37,18 @@ describe UsersController do
           user.email = user.confirmation_email
           user.confirmation_email = nil
           expect(user).to_not receive(:send_confirmation)
-          put :update, {user: user_params.merge(confirmation_email: user.email)}, logged_in_session
+          put :update, params: { user: user_params.merge(confirmation_email: user.email) }, session: logged_in_session
         end
 
         it "doesn't reconfirm if the confirmation email is unchanged" do
           expect(user).to_not receive(:send_confirmation)
-          put :update, {user: user_params.merge(confirmation_email: user.email)}, logged_in_session
+          put :update, params: { user: user_params.merge(confirmation_email: user.email) }, session: logged_in_session
         end
 
         it "confirms the confirmation email" do
           user.email = "old@example.com"
           expect(user).to receive(:send_confirmation).and_return(true)
-          put :update, {user: user_params.merge(confirmation_email: "new@example.com")}, logged_in_session
+          put :update, params: { user: user_params.merge(confirmation_email: "new@example.com") }, session: logged_in_session
         end
       end
 
@@ -58,12 +59,12 @@ describe UsersController do
 
         it "updates the user" do
           expect {
-            put :update, {user: user_params.merge(first_name: "Alvarez")}, logged_in_session
+            put :update, params: { user: user_params.merge(first_name: "Alvarez")}, session: logged_in_session
           }.to change(user, :first_name)
         end
 
         it "redirects the user" do
-          put :update, {user: user_params}, logged_in_session
+          put :update, params: { user: user_params }, session: logged_in_session
           expect(response).to be_redirect
         end
       end
@@ -75,7 +76,7 @@ describe UsersController do
 
         it "updates the user" do
           expect {
-            put :update, {user: user_params.merge(first_name: "Alvarez"), format: 'json'}, logged_in_session
+            put :update, params: { user: user_params.merge(first_name: "Alvarez"), format: 'json' }, session: logged_in_session
           }.to change(user, :first_name)
         end
       end
@@ -88,12 +89,7 @@ describe UsersController do
 
       describe "from html" do
         before(:each) do
-          put :update, {user: invalid_params}, logged_in_session
-        end
-
-        it "renders the edit page" do
-          expect(response).to render_template('edit')
-          expect(response).to be_success
+          put :update, params: { user: invalid_params }, session: logged_in_session
         end
 
         it "sets the errors" do
@@ -103,7 +99,7 @@ describe UsersController do
 
       describe "from json" do
         before(:each) do
-          put :update, {user: invalid_params, format: 'json'}, logged_in_session
+          put :update, params: { user: invalid_params, format: 'json' }, session: logged_in_session
         end
 
         it "returns a 422" do

data/lib/generators/authkit/templates/spec/factories/user_session.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :user_session do
+    user
+  end
+end
+

data/lib/generators/authkit/templates/spec/forms/signup_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Signup do
+RSpec.describe Signup, type: :model do
   let(:signup) { Signup.new }
 
   it "should not be persisted" do

data/lib/generators/authkit/templates/spec/models/user_session_spec.rb

@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+RSpec.describe UserSession, type: :model do
+
+  let(:user_session) { create(:user_session) }
+  let(:user) { user_session.user }
+
+  it { should belong_to(:user) }
+
+  describe "validations" do
+    it { should validate_presence_of(:user) }
+  end
+
+  describe "scopes" do
+    it "finds active sessions" do
+      user_session
+      revoked_session = create(:user_session, revoked_at: 1.year.ago)
+      logged_out_session = create(:user_session, logged_out_at: 1.year.ago)
+
+      all = UserSession.active.all
+      expect(all).to include(user_session)
+      expect(all.length).to eq(1)
+    end
+  end
+
+  describe "tokens" do
+    it "sets the remember token" do
+      user_session.remember_token = nil
+      user_session.save
+      expect(user_session.remember_token).to_not be_blank
+    end
+  end
+
+  it "is active" do
+    user_session = UserSession.new
+    expect(user_session).to be_active
+    user_session.revoked_at = Time.now
+    expect(user_session).to_not be_active
+  end
+
+  it "is logged out" do
+    user_session = UserSession.new
+    expect(user_session).to_not be_logged_out
+    user_session.logged_out_at = Time.now
+    expect(user_session).to be_logged_out
+  end
+
+  it "is revoked" do
+    user_session = UserSession.new
+    expect(user_session).to_not be_revoked
+    user_session.revoked_at = Time.now
+    expect(user_session).to be_revoked
+  end
+
+  it "is super user" do
+    user_session = UserSession.new
+    expect(user_session).to_not be_sudo
+    user_session.sudo_enabled_at = Time.now
+    expect(user_session).to be_sudo
+    user_session.sudo_enabled_at = 2.hours.ago
+    expect(user_session).to_not be_sudo
+  end
+
+  it "logs out" do
+    token = user_session.remember_token
+    expect(user_session).to_not be_logged_out
+    user_session.logout
+    expect(user_session).to be_logged_out
+    expect(user_session.logged_out_at).to be_present
+  end
+
+  it "records the access" do
+    now = Time.now
+    allow(Time).to receive(:now).and_return(now)
+    request = double
+    expect(request).to receive(:remote_ip).and_return('1.1.1.1')
+    expect(request).to receive(:user_agent).and_return('webkit')
+    user_session.access(request)
+    expect(user_session.accessed_at).to eq(now)
+  end
+end

data/lib/generators/authkit/templates/spec/models/user_spec.rb

@@ -1,8 +1,10 @@
 require 'rails_helper'
 
-describe User do
+RSpec.describe User, type: :model do
   let(:user_params) { attributes_for(:user) }
 
+  it { should have_many(:sessions) }
+
   it "has secure password support" do
     expect(User.new).to respond_to(:authenticate)
   end
@@ -27,9 +29,9 @@ describe User do
       before(:each) do
         create(:user)
       end
-      <% if username? %>it { should validate_uniqueness_of(:username) }
-      <% end %>it { should validate_uniqueness_of(:email) }
-      it "validates the uniqueness of the the confirmation email" do
+      <% if username? %>it { should validate_uniqueness_of(:username).case_insensitive }
+      <% end %>it { should validate_uniqueness_of(:email).case_insensitive }
+      it "validates the uniqueness of the confirmation email" do
         existing_user = create(:user)
         user = build(:user, email: "old@example.com")
         user.confirmation_email = "new@example.com"
@@ -45,26 +47,6 @@ describe User do
 
   end
 
-  describe "tokens" do
-    it "sets the remember token" do
-      user = User.new
-      expect(user).to receive(:save!).and_return(true)
-      user.set_remember_token
-      expect(user.remember_token).to_not be_blank
-      expect(user.remember_token_created_at).to_not be_blank
-    end
-
-    it "clears the remember token" do
-      user = User.new
-      expect(user).to receive(:save!).and_return(true)
-      user.remember_token = "TOKEN"
-      user.remember_token_created_at = Time.now
-      user.clear_remember_token
-      expect(user.remember_token).to be_nil
-      expect(user.remember_token_created_at).to be_nil
-    end
-  end
-
   describe "token expiry" do
     it "should expire reset password tokens" do
       user = User.new
@@ -83,15 +65,6 @@ describe User do
       user.confirmation_token_created_at = 3.days.ago
       expect(user.confirmation_token_expired?).to eq(true)
     end
-
-    it "should expire remember tokens" do
-      user = User.new
-      expect(user.remember_token_expired?).to eq(true)
-      user.remember_token_created_at = 30.days.ago
-      expect(user.remember_token_expired?).to eq(false)
-      user.remember_token_created_at = 1.years.ago
-      expect(user.remember_token_expired?).to eq(true)
-    end
   end
 
   describe "display name" do
@@ -147,17 +120,17 @@ describe User do
 
     describe "with valid params" do
       it "confirms the email" do
-        user = User.new
+        user = build(:user)
         expect(user).to receive(:save!).and_return(true)
         allow(Time).to receive(:now).and_return(time = Time.now)
 
         user.send_confirmation
-        expect(user.confirmation_token_created_at).to eq(time)
+        expect(user.confirmation_token_created_at).to eq(time.to_s)
         expect(user.confirmation_token).to_not be_blank
       end
 
       it "generates a token before it sends confirmation email instructions" do
-        user = User.new
+        user = build(:user)
         expect(user).to receive(:save!).and_return(true)
         user.send_confirmation
         expect(user.confirmation_token).to_not be_blank
@@ -165,7 +138,7 @@ describe User do
       end
 
       it "sends confirmation email instructions" do
-        user = User.new
+        user = build(:user)
         expect(user).to receive(:save!).and_return(true)
         user.send_confirmation
       end
@@ -219,20 +192,20 @@ describe User do
       expect(user).to receive(:save).and_return(true)
       user.change_password("password", "password")
       expect(user.password_digest).to_not be_blank
-      expect(user.remember_token).to be_nil
-      expect(user.remember_token_created_at).to be_nil
+      expect(user.reset_password_token).to be_nil
+      expect(user.reset_password_token_created_at).to be_nil
     end
 
     it "doesn't change the password if it doesn't match" do
-      user = User.new
-      user.remember_token = "token"
+      user = build(:user)
+      user.reset_password_token = "token"
       user.change_password("password", "typotypo")
       expect(user).to_not be_valid
-      expect(user.remember_token).to eq("token")
+      expect(user.reset_password_token).to eq("token")
     end
 
     it "resets the password" do
-      user = User.new
+      user = build(:user)
       expect(user).to receive(:save!).and_return(true)
       allow(Time).to receive(:now).and_return(time = Time.now)
 
@@ -242,7 +215,7 @@ describe User do
     end
 
     it "generates a token before it sends reset password instructions" do
-      user = User.new
+      user = build(:user)
       expect(user).to receive(:save!).and_return(true)
       user.send_reset_password
       expect(user.reset_password_token).to_not be_blank
@@ -250,7 +223,7 @@ describe User do
     end
 
     it "sends reset password instructions" do
-      user = User.new
+      user = build(:user)
       expect(user).to receive(:save!).and_return(true)
       user.send_reset_password
     end

data/lib/generators/authkit/templates/spec/support/factory_girl.rb

@@ -0,0 +1,5 @@
+# FactoryGirl allows you to quickly create template based objects
+# The syntax methods give you inline `create` and a `build` commands
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

data/lib/generators/authkit/templates/spec/support/shoulda_matchers.rb

@@ -0,0 +1,6 @@
+# Shoulda matchers allow you to quickly verify validations and relationships
+# The syntax methods give you inline matcher syntax
+RSpec.configure do |config|
+  config.include(Shoulda::Matchers::ActiveModel, type: :model)
+  config.include(Shoulda::Matchers::ActiveRecord, type: :model)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeff Rafter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_model_otp
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - FEATURES.md
 - Gemfile
 - LICENSE.txt
@@ -115,6 +116,7 @@ files:
 - lib/generators/authkit/templates/app/models/auth.rb
 - lib/generators/authkit/templates/app/models/avatar.rb
 - lib/generators/authkit/templates/app/models/user.rb
+- lib/generators/authkit/templates/app/models/user_session.rb
 - lib/generators/authkit/templates/app/views/auths/connect.html.erb
 - lib/generators/authkit/templates/app/views/password_change/show.html.erb
 - lib/generators/authkit/templates/app/views/password_reset/show.html.erb
@@ -129,6 +131,7 @@ files:
 - lib/generators/authkit/templates/db/migrate/add_authkit_fields_to_users.rb
 - lib/generators/authkit/templates/db/migrate/create_auths.rb
 - lib/generators/authkit/templates/db/migrate/create_avatars.rb
+- lib/generators/authkit/templates/db/migrate/create_user_sessions.rb
 - lib/generators/authkit/templates/db/migrate/create_users.rb
 - lib/generators/authkit/templates/lib/email_format_validator.rb
 - lib/generators/authkit/templates/lib/full_name_splitter.rb
@@ -142,9 +145,13 @@ files:
 - lib/generators/authkit/templates/spec/controllers/signup_controller_spec.rb
 - lib/generators/authkit/templates/spec/controllers/users_controller_spec.rb
 - lib/generators/authkit/templates/spec/factories/user.rb
+- lib/generators/authkit/templates/spec/factories/user_session.rb
 - lib/generators/authkit/templates/spec/forms/signup_spec.rb
 - lib/generators/authkit/templates/spec/models/auth_spec.rb
+- lib/generators/authkit/templates/spec/models/user_session_spec.rb
 - lib/generators/authkit/templates/spec/models/user_spec.rb
+- lib/generators/authkit/templates/spec/support/factory_girl.rb
+- lib/generators/authkit/templates/spec/support/shoulda_matchers.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jeffrafter/authkit
@@ -167,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Auth for your Rails application