devise_token_auth 1.0.0 → 1.1.0

data/test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb

@@ -2,11 +2,13 @@
 
 require 'test_helper'
 require 'fileutils'
-require 'generators/devise_token_auth/install_generator'
+require 'generators/devise_token_auth/install_generator' if DEVISE_TOKEN_AUTH_ORM == :active_record
+require 'generators/devise_token_auth/install_mongoid_generator' if DEVISE_TOKEN_AUTH_ORM == :mongoid
 
 module DeviseTokenAuth
   class InstallGeneratorTest < Rails::Generators::TestCase
-    tests InstallGenerator
+    tests InstallGenerator        if DEVISE_TOKEN_AUTH_ORM == :active_record
+    tests InstallMongoidGenerator if DEVISE_TOKEN_AUTH_ORM == :mongoid
     destination Rails.root.join('tmp/generators')
 
     # The namespaced user model for testing
@@ -31,28 +33,30 @@ module DeviseTokenAuth
         assert_file 'config/initializers/devise_token_auth.rb'
       end
 
-      test 'migration is created for user model with namespace' do
-        assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb"
+      test 'subsequent runs raise no errors' do
+        run_generator %W[#{user_class} auth]
       end
 
-      test 'migration file for user model with namespace contains rails version' do
-        if Rails::VERSION::MAJOR >= 5
-          assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}/
-        else
+      if DEVISE_TOKEN_AUTH_ORM == :active_record
+        test 'migration is created for user model with namespace' do
           assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb"
         end
-      end
 
-      test 'subsequent runs raise no errors' do
-        run_generator %W[#{user_class} auth]
-      end
+        test 'migration file for user model with namespace contains rails version' do
+          if Rails::VERSION::MAJOR >= 5
+            assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}/
+          else
+            assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb"
+          end
+        end
 
-      test 'add primary key type with rails 5 when specified in rails generator' do
-        run_generator %W[#{user_class} auth --primary_key_type=uuid --force]
-        if Rails::VERSION::MAJOR >= 5
-          assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}, id: :uuid\) do/
-        else
-          assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}\) do/
+        test 'add primary key type with rails 5 when specified in rails generator' do
+          run_generator %W[#{user_class} auth --primary_key_type=uuid --force]
+          if Rails::VERSION::MAJOR >= 5
+            assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}, id: :uuid\) do/
+          else
+            assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}\) do/
+          end
         end
       end
     end
@@ -68,18 +72,32 @@ module DeviseTokenAuth
         # make dir if not exists
         FileUtils.mkdir_p(@dir)
 
-        # account for rails version 5
-        active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
+        case DEVISE_TOKEN_AUTH_ORM
+        when :active_record
+          # account for rails version 5
+          active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
 
-        @f = File.open(@fname, 'w') do |f|
-          f.write <<-RUBY
-            class User < #{active_record_needle}
+          @f = File.open(@fname, 'w') do |f|
+            f.write <<-RUBY
+              class User < #{active_record_needle}
 
-              def whatever
-                puts 'whatever'
+                def whatever
+                  puts 'whatever'
+                end
               end
-            end
-          RUBY
+            RUBY
+          end
+        when :mongoid
+          @f = File.open(@fname, 'w') do |f|
+            f.write <<-'RUBY'
+              class User
+
+                def whatever
+                  puts 'whatever'
+                end
+              end
+            RUBY
+          end
         end
 
         run_generator
@@ -141,10 +159,6 @@ module DeviseTokenAuth
           run_generator %w[Mang mangs]
         end
 
-        test 'migration is created' do
-          assert_migration 'db/migrate/devise_token_auth_create_mangs.rb'
-        end
-
         test 'route method is appended to routes file' do
           assert_file 'config/routes.rb' do |routes|
             assert_match(/mount_devise_token_auth_for 'Mang', at: 'mangs'/, routes)
@@ -157,6 +171,12 @@ module DeviseTokenAuth
             assert_match(/# Define routes for Mang within this block./, routes)
           end
         end
+
+        if DEVISE_TOKEN_AUTH_ORM == :active_record
+          test 'migration is created' do
+            assert_migration 'db/migrate/devise_token_auth_create_mangs.rb'
+          end
+        end
       end
     end
 

data/test/models/concerns/mongoid_support_test.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+if DEVISE_TOKEN_AUTH_ORM == :mongoid
+  class DeviseTokenAuth::Concerns::MongoidSupportTest < ActiveSupport::TestCase
+    describe DeviseTokenAuth::Concerns::MongoidSupport do
+      before do
+        @user = create(:user)
+      end
+
+      describe '#as_json' do
+        test 'should be defined' do
+          assert @user.methods.include?(:as_json)
+        end
+
+        test 'should except _id attribute' do
+          refute @user.as_json.key?('_id')
+        end
+
+        test 'should return with id attribute' do
+          assert_equal @user._id.to_s, @user.as_json['id']
+        end
+
+        test 'should accept options' do
+          refute @user.as_json(except: [:created_at]).key?('created_at')
+        end
+      end
+    end
+  end
+end

data/test/models/only_email_user_test.rb

@@ -4,14 +4,6 @@ require 'test_helper'
 
 class OnlyEmailUserTest < ActiveSupport::TestCase
   describe OnlyEmailUser do
-    test 'trackable is disabled' do
-      refute OnlyEmailUser.method_defined?(:sign_in_count)
-      refute OnlyEmailUser.method_defined?(:current_sign_in_at)
-      refute OnlyEmailUser.method_defined?(:last_sign_in_at)
-      refute OnlyEmailUser.method_defined?(:current_sign_in_ip)
-      refute OnlyEmailUser.method_defined?(:last_sign_in_ip)
-    end
-
     test 'confirmable is disabled' do
       refute OnlyEmailUser.method_defined?(:confirmation_token)
       refute OnlyEmailUser.method_defined?(:confirmed_at)

data/test/models/user_test.rb

@@ -44,7 +44,7 @@ class UserTest < ActiveSupport::TestCase
         @resource = build(:user, user_attributes)
 
         refute @resource.save
-        assert @resource.errors.messages[:email] == [I18n.t('errors.messages.taken')]
+        assert @resource.errors.messages[:email].first.include? 'taken'
         assert @resource.errors.messages[:email].none? { |e| e =~ /translation missing/ }
       end
     end

data/test/test_helper.rb

@@ -7,11 +7,15 @@ SimpleCov.start 'rails' do
 end
 
 ENV['RAILS_ENV'] = 'test'
+DEVISE_TOKEN_AUTH_ORM = (ENV['DEVISE_TOKEN_AUTH_ORM'] || :active_record).to_sym
+
+puts "\n==> DeviseTokenAuth.orm = #{DEVISE_TOKEN_AUTH_ORM.inspect}"
 
 require File.expand_path('dummy/config/environment', __dir__)
-require 'rails/test_help'
+require 'active_support/testing/autorun'
 require 'minitest/rails'
 require 'mocha/minitest'
+require 'database_cleaner'
 
 FactoryBot.definition_file_paths = [File.expand_path('factories', __dir__)]
 FactoryBot.find_definitions
@@ -30,7 +34,13 @@ end
 class ActiveSupport::TestCase
   include FactoryBot::Syntax::Methods
 
-  ActiveRecord::Migration.check_pending!
+  ActiveRecord::Migration.check_pending! if DEVISE_TOKEN_AUTH_ORM == :active_record
+
+  strategies = { active_record: :transaction,
+                 mongoid: :truncation }
+  DatabaseCleaner.strategy = strategies[DEVISE_TOKEN_AUTH_ORM]
+  setup { DatabaseCleaner.start }
+  teardown { DatabaseCleaner.clean }
 
   # Add more helper methods to be used by all tests here...
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
         version: 3.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 3.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: mongoid-locker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: For use with client side single page apps such as the venerable https://github.com/lynndylanhurley/ng-token-auth.
 email:
 - lynn.dylan.hurley@gmail.com
@@ -126,19 +160,21 @@ files:
 - app/controllers/devise_token_auth/sessions_controller.rb
 - app/controllers/devise_token_auth/token_validations_controller.rb
 - app/controllers/devise_token_auth/unlocks_controller.rb
+- app/models/devise_token_auth/concerns/active_record_support.rb
+- app/models/devise_token_auth/concerns/mongoid_support.rb
 - app/models/devise_token_auth/concerns/user.rb
 - app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb
-- app/validators/email_validator.rb
+- app/validators/devise_token_auth/email_validator.rb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.erb
 - app/views/devise_token_auth/omniauth_external_window.html.erb
-- config/initializers/devise.rb
 - config/locales/da-DK.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/he.yml
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/nl.yml
@@ -155,6 +191,7 @@ files:
 - config/locales/zh-HK.yml
 - config/locales/zh-TW.yml
 - lib/devise_token_auth.rb
+- lib/devise_token_auth/blacklist.rb
 - lib/devise_token_auth/controllers/helpers.rb
 - lib/devise_token_auth/controllers/url_helpers.rb
 - lib/devise_token_auth/engine.rb
@@ -164,10 +201,13 @@ files:
 - lib/devise_token_auth/version.rb
 - lib/generators/devise_token_auth/USAGE
 - lib/generators/devise_token_auth/install_generator.rb
+- lib/generators/devise_token_auth/install_generator_helpers.rb
+- lib/generators/devise_token_auth/install_mongoid_generator.rb
 - lib/generators/devise_token_auth/install_views_generator.rb
 - lib/generators/devise_token_auth/templates/devise_token_auth.rb
 - lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb.erb
 - lib/generators/devise_token_auth/templates/user.rb.erb
+- lib/generators/devise_token_auth/templates/user_mongoid.rb.erb
 - lib/tasks/devise_token_auth_tasks.rake
 - test/controllers/custom/custom_confirmations_controller_test.rb
 - test/controllers/custom/custom_omniauth_callbacks_controller_test.rb
@@ -192,6 +232,13 @@ files:
 - test/controllers/overrides/sessions_controller_test.rb
 - test/controllers/overrides/token_validations_controller_test.rb
 - test/dummy/README.rdoc
+- test/dummy/app/active_record/lockable_user.rb
+- test/dummy/app/active_record/mang.rb
+- test/dummy/app/active_record/only_email_user.rb
+- test/dummy/app/active_record/scoped_user.rb
+- test/dummy/app/active_record/unconfirmable_user.rb
+- test/dummy/app/active_record/unregisterable_user.rb
+- test/dummy/app/active_record/user.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/auth_origin_controller.rb
 - test/dummy/app/controllers/custom/confirmations_controller.rb
@@ -210,13 +257,14 @@ files:
 - test/dummy/app/controllers/overrides/sessions_controller.rb
 - test/dummy/app/controllers/overrides/token_validations_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/lockable_user.rb
-- test/dummy/app/models/mang.rb
-- test/dummy/app/models/only_email_user.rb
-- test/dummy/app/models/scoped_user.rb
-- test/dummy/app/models/unconfirmable_user.rb
-- test/dummy/app/models/unregisterable_user.rb
-- test/dummy/app/models/user.rb
+- test/dummy/app/models/concerns/favorite_color.rb
+- test/dummy/app/mongoid/lockable_user.rb
+- test/dummy/app/mongoid/mang.rb
+- test/dummy/app/mongoid/only_email_user.rb
+- test/dummy/app/mongoid/scoped_user.rb
+- test/dummy/app/mongoid/unconfirmable_user.rb
+- test/dummy/app/mongoid/unregisterable_user.rb
+- test/dummy/app/mongoid/user.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -251,13 +299,17 @@ files:
 - test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/migration_database_helper.rb
-- test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb
-- test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb
+- test/dummy/tmp/generators/app/models/azpire/v1/human_resource/user.rb
+- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
+- test/dummy/tmp/generators/config/routes.rb
+- test/dummy/tmp/generators/db/migrate/20190112150327_devise_token_auth_create_azpire_v1_human_resource_users.rb
 - test/factories/users.rb
+- test/lib/devise_token_auth/blacklist_test.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
 - test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb
 - test/lib/generators/devise_token_auth/install_views_generator_test.rb
+- test/models/concerns/mongoid_support_test.rb
 - test/models/only_email_user_test.rb
 - test/models/user_test.rb
 - test/support/controllers/routes.rb
@@ -282,18 +334,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Token based authentication for rails. Uses Devise + OmniAuth.
 test_files:
-- test/dummy/app/models/only_email_user.rb
-- test/dummy/app/models/scoped_user.rb
-- test/dummy/app/models/mang.rb
-- test/dummy/app/models/unregisterable_user.rb
-- test/dummy/app/models/lockable_user.rb
-- test/dummy/app/models/unconfirmable_user.rb
-- test/dummy/app/models/user.rb
+- test/dummy/app/mongoid/only_email_user.rb
+- test/dummy/app/mongoid/scoped_user.rb
+- test/dummy/app/mongoid/mang.rb
+- test/dummy/app/mongoid/unregisterable_user.rb
+- test/dummy/app/mongoid/lockable_user.rb
+- test/dummy/app/mongoid/unconfirmable_user.rb
+- test/dummy/app/mongoid/user.rb
+- test/dummy/app/models/concerns/favorite_color.rb
+- test/dummy/app/active_record/only_email_user.rb
+- test/dummy/app/active_record/scoped_user.rb
+- test/dummy/app/active_record/mang.rb
+- test/dummy/app/active_record/unregisterable_user.rb
+- test/dummy/app/active_record/lockable_user.rb
+- test/dummy/app/active_record/unconfirmable_user.rb
+- test/dummy/app/active_record/user.rb
 - test/dummy/app/controllers/overrides/token_validations_controller.rb
 - test/dummy/app/controllers/overrides/omniauth_callbacks_controller.rb
 - test/dummy/app/controllers/overrides/passwords_controller.rb
@@ -346,14 +406,18 @@ test_files:
 - test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb
 - test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
 - test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
-- test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb
-- test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb
+- test/dummy/tmp/generators/app/models/azpire/v1/human_resource/user.rb
+- test/dummy/tmp/generators/config/routes.rb
+- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
+- test/dummy/tmp/generators/db/migrate/20190112150327_devise_token_auth_create_azpire_v1_human_resource_users.rb
 - test/dummy/README.rdoc
 - test/models/only_email_user_test.rb
+- test/models/concerns/mongoid_support_test.rb
 - test/models/user_test.rb
 - test/support/controllers/routes.rb
 - test/factories/users.rb
 - test/lib/devise_token_auth/url_test.rb
+- test/lib/devise_token_auth/blacklist_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
 - test/lib/generators/devise_token_auth/install_views_generator_test.rb
 - test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb