mks_auth 1.0.14 → 1.2.0

data/spec/factories/application_modules.rb

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :application_module, class: 'Mks::Auth::ApplicationModule' do
     code { FFaker::Name.name }
     name { FFaker::Name.name }

data/spec/factories/menus.rb

@@ -1,10 +1,10 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :menu, class: 'Mks::Auth::Menu' do
     text { FFaker::Name.name }
     icon_cls { FFaker::Name.name }
     class_name { FFaker::Name.name }
     location { FFaker::Name.name }
-    parent { nil }
+    parent nil
     association :application_module
   end
 end

data/spec/factories/user_roles.rb

@@ -1,7 +1,6 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :user_role, class: 'Mks::Auth::UserRole' do
     name { FFaker::Name.name }
-    association :application_module
 
     trait :with_menu do
       after(:create) do |role|

data/spec/factories/users.rb

@@ -1,10 +1,11 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :user, class: 'Mks::Auth::User' do
     first_name { FFaker::Name.name }
     last_name { FFaker::Name.name }
     email { FFaker::Internet.email }
-    active { true }
+    active true
     password { FFaker::Internet.password(min_length=6) }
+    association :application_module
 
     trait :with_role do
       after(:create) do |user|

data/spec/models/mks/auth/application_module_spec.rb

@@ -22,8 +22,7 @@ module Mks
 
       it 'can access users' do
         am = create(:application_module)
-        2.times { create(:user) }
-        User.all.each { |u| u.application_modules = [am] }
+        2.times { create(:user, :application_module => am) }
         expect(am.users.count).to eq 2
       end
 

data/spec/models/mks/auth/user_role_spec.rb

@@ -16,12 +16,6 @@ module Mks
         expect(build(:user_role, name: ur.name)).not_to be_valid
       end
 
-      it 'converts name to symbol' do
-        ur = create(:user_role)
-        result = ur.name.underscore.to_sym
-        expect(ur.sym_name).to eq result
-      end
-
       it 'can access users' do
         u = create(:user, :with_role)
         role = u.roles.first

data/spec/models/mks/auth/user_spec.rb

@@ -40,39 +40,6 @@ module Mks
         u = create(:user, :with_roles)
         expect(u.roles.count).to eq 3
       end
-
-      it 'role_names returns role names' do
-        r1 = create(:user_role)
-        r2 = create(:user_role)
-        u = create(:user, roles: [r1, r2])
-
-        roles = u.role_names
-        expect(roles).to include r1.name
-        expect(roles).to include r2.name
-      end
-
-      it 'role? checks if a role exists' do
-        r1 = create(:user_role)
-        r2 = create(:user_role)
-        r3 = create(:user_role)
-        u = create(:user, roles: [r1, r2])
-
-        expect(u.role?(r1.sym_name)).to be_truthy
-        expect(u.role?(r2.sym_name)).to be_truthy
-        expect(u.role?(r3.sym_name)).to be_falsey
-      end
-
-      it 'any_role? checks if any of the listed roles belong to user' do
-        r1 = create(:user_role)
-        r2 = create(:user_role)
-        r3 = create(:user_role)
-        r4 = create(:user_role)
-        u = create(:user, roles: [r1, r2])
-
-        expect(u.any_role?([r1.sym_name, r3.sym_name])).to be_truthy
-        expect(u.any_role?([r1.sym_name, r2.sym_name])).to be_truthy
-        expect(u.any_role?([r3.sym_name, r4.sym_name])).to be_falsey
-      end
     end
   end
 end

data/spec/rails_helper.rb

@@ -5,7 +5,6 @@ require File.expand_path('../dummy/config/environment', __FILE__)
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'spec_helper'
 require 'rspec/rails'
-require 'mks/auth/token_auth'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-require 'factory_bot_rails'
+require 'factory_girl_rails'
 
 require 'ffaker'
 

data/spec/support/factory_girl.rb

@@ -1,5 +1,5 @@
-require 'factory_bot'
+require 'factory_girl'
 
 RSpec.configure do |config|
-  config.include FactoryBot::Syntax::Methods
+  config.include FactoryGirl::Syntax::Methods
 end

metadata

@@ -1,155 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: mks_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.2.0
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3.3
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.3
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: mks_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.1
-  type: :development
+        version: 1.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.17'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: 4.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.16
-  type: :runtime
+        version: 0.20.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.16
 description: Authentication module for MKS apps
 email:
 - henockl@live.com
@@ -160,11 +118,18 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/mks_auth_manifest.js
+- app/assets/javascripts/mks_auth/application.js
+- app/assets/stylesheets/mks_auth/application.css
+- app/controllers/mks/auth/access_controller.rb
 - app/controllers/mks/auth/application_controller.rb
 - app/controllers/mks/auth/application_modules_controller.rb
-- app/controllers/mks/auth/menus_controller.rb
 - app/controllers/mks/auth/user_roles_controller.rb
 - app/controllers/mks/auth/users_controller.rb
+- app/helpers/mks/auth/access_helper.rb
+- app/helpers/mks/auth/application_helper.rb
+- app/jobs/mks_auth/application_job.rb
+- app/mailers/mks_auth/application_mailer.rb
 - app/models/mks/auth/application_module.rb
 - app/models/mks/auth/application_record.rb
 - app/models/mks/auth/menu.rb
@@ -177,15 +142,11 @@ files:
 - db/migrate/20161029071047_create_mks_users_user_roles.rb
 - db/migrate/20161029072256_create_mks_auth_menus.rb
 - db/migrate/20161029074023_create_mks_menus_user_roles.rb
-- db/migrate/20180201104912_create_mks_users_application_modules.rb
 - lib/mks/auth.rb
 - lib/mks/auth/engine.rb
-- lib/mks/auth/token_auth.rb
 - lib/mks/auth/version.rb
 - lib/mks_auth.rb
 - lib/tasks/mks_auth_tasks.rake
-- spec/controllers/mks/auth/menus_controller_spec.rb
-- spec/controllers/mks/auth/user_roles_controller_spec.rb
 - spec/controllers/mks/auth/users_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -232,8 +193,6 @@ files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -270,75 +229,71 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Auth module for MKS apps
+summary: Authentication module for MKS apps
 test_files:
 - spec/spec_helper.rb
-- spec/dummy/app/mailers/application_mailer.rb
-- spec/dummy/app/models/application_record.rb
-- spec/dummy/app/jobs/application_job.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/layouts/mailer.html.erb
-- spec/dummy/app/views/layouts/mailer.text.erb
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/assets/javascripts/cable.js
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/channels/application_cable/connection.rb
-- spec/dummy/app/channels/application_cable/channel.rb
-- spec/dummy/bin/update
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
+- spec/rails_helper.rb
+- spec/dummy/public/apple-touch-icon-precomposed.png
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/404.html
+- spec/dummy/public/apple-touch-icon.png
+- spec/dummy/config.ru
+- spec/dummy/db/schema.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/application.rb
 - spec/dummy/config/cable.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
+- spec/dummy/config/boot.rb
 - spec/dummy/config/spring.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/routes.rb
 - spec/dummy/config/environment.rb
-- spec/dummy/config/application.rb
 - spec/dummy/config/puma.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/application_controller_renderer.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/new_framework_defaults.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
 - spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config.ru
+- spec/dummy/config/secrets.yml
 - spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/apple-touch-icon.png
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/public/apple-touch-icon-precomposed.png
-- spec/dummy/db/schema.rb
-- spec/dummy/log/test.log
-- spec/dummy/log/development.log
-- spec/models/mks/auth/menu_spec.rb
-- spec/models/mks/auth/application_module_spec.rb
-- spec/models/mks/auth/user_role_spec.rb
-- spec/models/mks/auth/user_spec.rb
-- spec/support/factory_girl.rb
-- spec/factories/menus.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/mailer.html.erb
+- spec/dummy/app/views/layouts/mailer.text.erb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/assets/javascripts/cable.js
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/jobs/application_job.rb
+- spec/dummy/app/channels/application_cable/connection.rb
+- spec/dummy/app/channels/application_cable/channel.rb
+- spec/dummy/app/mailers/application_mailer.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/models/application_record.rb
+- spec/dummy/bin/rake
+- spec/dummy/bin/rails
+- spec/dummy/bin/bundle
+- spec/dummy/bin/setup
+- spec/dummy/bin/update
 - spec/factories/user_roles.rb
 - spec/factories/application_modules.rb
 - spec/factories/users.rb
+- spec/factories/menus.rb
+- spec/support/factory_girl.rb
 - spec/controllers/mks/auth/users_controller_spec.rb
-- spec/controllers/mks/auth/user_roles_controller_spec.rb
-- spec/controllers/mks/auth/menus_controller_spec.rb
-- spec/rails_helper.rb
+- spec/models/mks/auth/menu_spec.rb
+- spec/models/mks/auth/user_spec.rb
+- spec/models/mks/auth/application_module_spec.rb
+- spec/models/mks/auth/user_role_spec.rb