adminos 1.0.0.pre.rc.2 → 1.0.0.pre.rc.3

data/lib/generators/templates/two_facto_auth/auto/app/controllers/users/sessions_controller.rb

@@ -0,0 +1,5 @@
+class Users::SessionsController < Devise::SessionsController
+  include AuthenticatesWithTwoFactor
+
+  prepend_before_action :authenticate_with_two_factor, only: [:create]
+end

data/lib/generators/templates/two_facto_auth/auto/app/views/admin/profiles/_2fa.slim

@@ -0,0 +1,24 @@
+.f__fieldset
+  .f__legend Двухфакторная аутентификация
+  - if resource.otp_required_for_login
+    .f
+      .f__wrapper
+        .f-field
+          .f-field__label
+            label.f-label Ключ
+          .f-field__container
+            .f-field__text =resource.otp.secret
+        .f-field
+          .f-field__label
+            label.f-label Google Authenticator QR
+          .f-field__container
+            = google_authenticator_qrcode(resource)
+        .f-field
+          .f-field__container
+            = link_to "Отключить 2FA", toggle_two_factor_admin_profile_path, method: :post, class: 'btn btn btn-primary'
+  - else
+    .f
+      .f__wrapper
+        .f-field
+          .f-field__container
+            = link_to "Включить 2FA", toggle_two_factor_admin_profile_path, method: :post, class: 'btn btn btn-primary'

data/lib/generators/templates/two_facto_auth/auto/app/views/devise/sessions/two_factor.slim

@@ -0,0 +1,15 @@
+- @body_class = "page--auth ready"
+
+.auth
+  .auth__title Adminos
+  .auth__welcome Вход в систему администрирования
+
+  = simple_form_for resource, as: resource_name, url: session_path(resource_name), wrapper: :auth, html: { class: 'form auth__form' } do |f|
+    = f.input :otp_attempt, placeholder: '2FA'
+
+    .form__submit.centered
+      = f.submit 'Войти', class: 'button button--rounded'
+
+  - if flash.present?
+    .auth__message
+      = show_flash_alert

data/spec/lib/generators/adminos/feedback_generator_rspec.rb

@@ -0,0 +1,50 @@
+require 'support/generators'
+
+RSpec.describe Adminos::Generators::FeedbackGenerator, type: :generator do
+
+  prepare_app(folder_name: 'dummy')
+  generate('adminos:feedback')
+
+  context 'controllers' do
+    describe 'app/controllers/feedbacks_controller.rb' do
+      subject { file('app/controllers/feedbacks_controller.rb') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/controllers/admin/feedbacks_controller.rb' do
+      subject { file('app/controllers/admin/feedbacks_controller.rb') }
+      it { is_expected.to exist }
+    end
+  end
+
+  context 'models' do
+    describe 'app/models/feedback.rb' do
+      subject { file('app/models/feedback.rb') }
+      it { is_expected.to exist }
+    end
+  end
+
+  context 'views' do
+    describe 'app/views/admin/feedbacks/_fields.slim' do
+      subject { file('app/views/admin/feedbacks/_fields.slim') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/views/admin/feedbacks/index.slim' do
+      subject { file('app/views/admin/feedbacks/index.slim') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/views/shared/admin/_sidebar.slim' do
+      subject { file('app/views/shared/admin/_sidebar.slim') }
+      it { is_expected.to contain  /admin_feedbacks_path/ }
+    end
+  end
+
+  context 'config' do
+    describe 'config/routes.rb' do
+      subject { file('config/routes.rb') }
+      it { is_expected.to contain /resources :feedbacks, except: :show do/ }
+    end
+  end
+end

data/spec/lib/generators/adminos/install_generator_rspec.rb

@@ -168,6 +168,11 @@ RSpec.describe Adminos::Generators::InstallGenerator, type: :generator do
         it { is_expected.to exist }
       end
 
+      describe 'config/initializers/adminos.rb' do
+        subject { file( 'config/initializers/adminos.rb') }
+        it { is_expected.to exist }
+      end
+
       describe 'config/locales/devise.ru.yml' do
         subject { file( 'config/locales/devise.ru.yml') }
         it { is_expected.to exist }
@@ -250,7 +255,6 @@ RSpec.describe Adminos::Generators::InstallGenerator, type: :generator do
       describe 'app/models/page.rb' do
         subject { file('app/models/page.rb') }
         it { is_expected.to contain /translates :name, .*/  }
-        it { is_expected.to contain  /accepts_nested_attributes_for :translations/  }
       end
     end
 
@@ -295,11 +299,6 @@ RSpec.describe Adminos::Generators::InstallGenerator, type: :generator do
     end
 
     context 'config' do
-      describe 'config/initializers/globalize_fields.rb' do
-        subject { file('config/initializers/globalize_fields.rb') }
-        it { is_expected.to exist }
-      end
-
       describe 'config/routes.rb' do
         subject { file('config/routes.rb') }
         it { is_expected.to contain /scope '\(:locale\)'/ }
@@ -314,7 +313,7 @@ RSpec.describe Adminos::Generators::InstallGenerator, type: :generator do
     context 'Gemfile' do
       describe 'Gemfile' do
         subject { file('Gemfile') }
-        it { is_expected.to contain  /gem 'globalize'/ }
+        it { is_expected.to contain  /gem 'mobility'/ }
       end
     end
   end

data/spec/lib/generators/adminos/profile_generator_rspec.rb

@@ -0,0 +1,33 @@
+require 'support/generators'
+
+RSpec.describe Adminos::Generators::ProfileGenerator, type: :generator do
+
+  prepare_app(folder_name: 'dummy')
+  generate('adminos:profile')
+
+  context 'controllers' do
+    describe 'app/controllers/admin/profiles_controller.rb' do
+      subject { file('app/controllers/admin/profiles_controller.rb') }
+      it { is_expected.to exist }
+    end
+  end
+
+  context 'views' do
+    describe 'app/views/admin/profiles/edit.slim' do
+      subject { file('app/views/admin/profiles/edit.slim') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/views/shared/admin/_sidebar.slim' do
+      subject { file('app/views/shared/admin/_sidebar.slim') }
+      it { is_expected.to contain  /link_to edit_admin_profile_path/ }
+    end
+  end
+
+  context 'config' do
+    describe 'config/routes.rb' do
+      subject { file('config/routes.rb') }
+      it { is_expected.to contain /resource  :profile, only: \[:edit, :update\]/ }
+    end
+  end
+end

data/spec/lib/generators/adminos/search_generator.rb

@@ -0,0 +1,20 @@
+require 'support/generators'
+
+RSpec.describe Adminos::Generators::SearchGenerator, type: :generator do
+  prepare_app(folder_name: 'dummy')
+  generate('adminos article')
+  generate('adminos:search Article')
+
+  describe "app/models/article.rb" do
+    subject { file("app/models/article.rb") }
+
+    it { is_expected.to contain /include Adminos::Searchable/ }
+    it { is_expected.to contain /searchable/  }
+  end
+
+  describe "app/views/admin/articles/index.slim" do
+    subject { file("app/views/admin/articles/index.slim") }
+
+    it { is_expected.to contain "= render 'shared/admin/search_form'" }
+  end
+end

data/spec/lib/generators/adminos/two_factor_auth_generator_rspec.rb

@@ -0,0 +1,61 @@
+require 'support/generators'
+
+RSpec.describe Adminos::Generators::TwoFactorAuthGenerator, type: :generator do
+
+  prepare_app(folder_name: 'dummy')
+  generate('adminos:profile')
+  generate('adminos:two_factor_auth')
+
+  context 'controllers' do
+    describe 'app/controllers/concerns/authenticates_with_two_factor.rb' do
+      subject { file('app/controllers/concerns/authenticates_with_two_factor.rb') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/controllers/users/sessions_controller.rb' do
+      subject { file('app/controllers/users/sessions_controller.rb') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/controllers/admin/profiles_controller.rb' do
+      subject { file('app/controllers/admin/profiles_controller.rb') }
+      it { is_expected.to contain  /def toggle_two_factor/ }
+    end
+  end
+
+  context 'views' do
+    describe 'app/views/admin/profiles/_2fa.slim' do
+      subject { file('app/views/admin/profiles/_2fa.slim') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/views/devise/sessions/two_factor.slim' do
+      subject { file('app/views/devise/sessions/two_factor.slim') }
+      it { is_expected.to exist }
+    end
+
+    describe 'app/views/admin/profiles/edit.slim' do
+      subject { file('app/views/admin/profiles/edit.slim') }
+      it { is_expected.to contain  /\= render '2fa', resource: resource/ }
+    end
+  end
+
+  context 'helpers' do
+    describe 'app/helpers/application_helper.rb' do
+      subject { file('app/helpers/application_helper.rb') }
+      it { is_expected.to contain  /def google_authenticator_qrcode/ }
+    end
+  end
+
+  context 'config' do
+    describe 'Gemfile' do
+      subject { file('Gemfile') }
+      it { is_expected.to contain /gem 'devise-two-factor'/ }
+    end
+
+    describe 'config/routes.rb' do
+      subject { file('config/routes.rb') }
+      it { is_expected.to contain /resource  :profile, only: \[\] do/ }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ require 'generators/adminos/i18n_generator'
 require 'generators/adminos/adminos_generator'
 require 'generators/adminos/ci_generator'
 require 'generators/adminos/install_generator'
+require 'generators/adminos/profile_generator'
+require 'generators/adminos/two_factor_auth_generator'
+require 'generators/adminos/search_generator'
+require 'generators/adminos/feedback_generator'
 
 require 'adminos/helpers/models/flag_attrs'
 require 'adminos/helpers/models/array_attrs'

data/spec/support/shared/generator.rb

@@ -21,7 +21,7 @@ shared_examples 'Gemfile' do
     subject { file('Gemfile') }
 
     it { is_expected.to exist }
-    it { is_expected.to contain(/gem 'globalize'/) }
+    it { is_expected.to contain(/gem 'mobility'/) }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminos
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.2
+  version: 1.0.0.pre.rc.3
 platform: ruby
 authors:
 - RavWar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: russian
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -154,7 +154,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,7 +168,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: cocoon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,7 +182,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cocoon
+  name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,7 +196,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -321,19 +321,27 @@ files:
 - app/assets/images/favicon.ico
 - app/assets/images/safari-pinned-tab.svg
 - app/inputs/cropp_input.rb
+- app/inputs/filter_inputs/boolean_input.rb
+- app/inputs/filter_inputs/date_range_input.rb
+- app/inputs/filter_inputs/numeric_input.rb
+- app/inputs/filter_inputs/string_input.rb
 - bin/bundle
 - bin/gem
-- bin/rspec
 - exe/adminos
 - lib/adminos.rb
 - lib/adminos/cli.rb
+- lib/adminos/configuration.rb
 - lib/adminos/controllers/admin_extension.rb
+- lib/adminos/controllers/filters.rb
 - lib/adminos/controllers/helpers.rb
 - lib/adminos/controllers/resource.rb
-- lib/adminos/extensions/globalize_actiontext.rb
-- lib/adminos/extensions/globalize_fields.rb
 - lib/adminos/extensions/nested_set.rb
+- lib/adminos/extensions/simple_form.rb
 - lib/adminos/extensions/string.rb
+- lib/adminos/features/search/elastic.rb
+- lib/adminos/features/search/pg_search.rb
+- lib/adminos/filters/forms.rb
+- lib/adminos/form_builder.rb
 - lib/adminos/generators/gemfile_merge.rb
 - lib/adminos/generators/utilities.rb
 - lib/adminos/helpers/admin.rb
@@ -350,6 +358,7 @@ files:
 - lib/adminos/helpers/models/nested_set/place_to.rb
 - lib/adminos/helpers/models/nested_set/safe_destroy.rb
 - lib/adminos/helpers/models/recognizable.rb
+- lib/adminos/helpers/models/searchable.rb
 - lib/adminos/helpers/models/slugged.rb
 - lib/adminos/helpers/models/soft_destroy.rb
 - lib/adminos/helpers/models/wysiwyg.rb
@@ -362,14 +371,17 @@ files:
 - lib/adminos_template.rb
 - lib/generators/adminos/adminos_generator.rb
 - lib/generators/adminos/ci_generator.rb
+- lib/generators/adminos/feedback_generator.rb
 - lib/generators/adminos/field_generator.rb
 - lib/generators/adminos/i18n_generator.rb
 - lib/generators/adminos/install_generator.rb
+- lib/generators/adminos/profile_generator.rb
+- lib/generators/adminos/search_generator.rb
+- lib/generators/adminos/two_factor_auth_generator.rb
 - lib/generators/templates/adminos/adminos.ru.yml
 - lib/generators/templates/adminos/fields.slim
 - lib/generators/templates/adminos/locales/general_fields.slim
 - lib/generators/templates/adminos/locales/locale_fields.slim
-- lib/generators/templates/adminos/locales/migration.rb.erb
 - lib/generators/templates/adminos/locales/model.rb.erb
 - lib/generators/templates/adminos/sidebar.slim
 - lib/generators/templates/adminos/sorts/body.slim
@@ -402,17 +414,21 @@ files:
 - lib/generators/templates/ci/rakelib/audit.rake
 - lib/generators/templates/ci/rakelib/lint.rake
 - lib/generators/templates/ci/spec/Gemfile
+- lib/generators/templates/feedback/auto/app/controllers/admin/feedbacks_controller.rb
+- lib/generators/templates/feedback/auto/app/controllers/feedbacks_controller.rb
+- lib/generators/templates/feedback/auto/app/models/feedback.rb
+- lib/generators/templates/feedback/auto/app/views/admin/feedbacks/_fields.slim
+- lib/generators/templates/feedback/auto/app/views/admin/feedbacks/index.slim
+- lib/generators/templates/feedback/feedbacks_migration.rb
 - lib/generators/templates/field/locales/locale_fields.slim
-- lib/generators/templates/field/locales/migration.rb.erb
 - lib/generators/templates/field/locales/model.rb.erb
 - lib/generators/templates/i18n/Gemfile
-- lib/generators/templates/i18n/add_translation_table_to_page.rb
 - lib/generators/templates/i18n/auto/app/validators/locale_validator.rb
 - lib/generators/templates/i18n/auto/app/views/admin/base/_fields.slim
 - lib/generators/templates/i18n/auto/app/views/admin/base/_pills.slim
 - lib/generators/templates/i18n/auto/app/views/admin/pages/_general_fields.slim
 - lib/generators/templates/i18n/auto/app/views/admin/pages/_locale_fields.slim
-- lib/generators/templates/i18n/auto/config/initializers/globalize_fields.rb
+- lib/generators/templates/i18n/auto/config/initializers/mobility.rb
 - lib/generators/templates/i18n/controller.rb
 - lib/generators/templates/i18n/devise/devise.ru.yml
 - lib/generators/templates/i18n/devise/views/_links.erb
@@ -431,6 +447,7 @@ files:
 - lib/generators/templates/install/.gitignore
 - lib/generators/templates/install/Gemfile
 - lib/generators/templates/install/Procfile
+- lib/generators/templates/install/README.md
 - lib/generators/templates/install/_sidebar.slim.erb
 - lib/generators/templates/install/add_authentications/authentication.rb
 - lib/generators/templates/install/add_authentications/authentications_controller.rb
@@ -534,11 +551,12 @@ files:
 - lib/generators/templates/install/auto/app/views/shared/helpers/admin/_top_menu_item.slim
 - lib/generators/templates/install/auto/app/views/shared/helpers/admin/_unpublished_sign.slim
 - lib/generators/templates/install/auto/browserslist
-- lib/generators/templates/install/auto/config/deploy/shared/database.yml.erb
-- lib/generators/templates/install/auto/config/deploy/shared/nginx.conf.erb
-- lib/generators/templates/install/auto/config/deploy/shared/unicorn.rb.erb
 - lib/generators/templates/install/auto/config/deploy/staging.rb
+- lib/generators/templates/install/auto/config/deploy/templates/database.yml.erb
+- lib/generators/templates/install/auto/config/deploy/templates/nginx_conf.erb
+- lib/generators/templates/install/auto/config/deploy/templates/puma.rb.erb
 - lib/generators/templates/install/auto/config/environments/staging.rb
+- lib/generators/templates/install/auto/config/initializers/adminos.rb
 - lib/generators/templates/install/auto/config/initializers/awesome_nested_set.rb
 - lib/generators/templates/install/auto/config/initializers/content_security_policy.rb
 - lib/generators/templates/install/auto/config/initializers/friendly_id.rb
@@ -547,9 +565,11 @@ files:
 - lib/generators/templates/install/auto/config/initializers/slim.rb
 - lib/generators/templates/install/auto/config/locales/adminos.en.yml
 - lib/generators/templates/install/auto/config/locales/adminos.ru.yml
-- lib/generators/templates/install/auto/lib/capistrano/substitute_strings.rb
+- lib/generators/templates/install/auto/config/schedule.rb
+- lib/generators/templates/install/auto/config/systemd/puma.service.erb
+- lib/generators/templates/install/auto/config/systemd/sidekiq.service.erb
+- lib/generators/templates/install/auto/lib/capistrano/smart_templates.rb
 - lib/generators/templates/install/auto/lib/capistrano/tasks/setup_config.cap
-- lib/generators/templates/install/auto/lib/capistrano/template.rb
 - lib/generators/templates/install/auto/public/404.html
 - lib/generators/templates/install/auto/public/500.html
 - lib/generators/templates/install/database.yml
@@ -566,7 +586,13 @@ files:
 - lib/generators/templates/install/webpack/javascript/admin/js/index.js
 - lib/generators/templates/install/webpack/javascript/admin/styles/admin.scss
 - lib/generators/templates/install/webpack/javascript/packs/admin.js
-- package-lock.json
+- lib/generators/templates/profile/auto/app/controllers/admin/profiles_controller.rb
+- lib/generators/templates/profile/auto/app/views/admin/profiles/edit.slim
+- lib/generators/templates/two_facto_auth/Gemfile
+- lib/generators/templates/two_facto_auth/auto/app/controllers/concerns/authenticates_with_two_factor.rb
+- lib/generators/templates/two_facto_auth/auto/app/controllers/users/sessions_controller.rb
+- lib/generators/templates/two_facto_auth/auto/app/views/admin/profiles/_2fa.slim
+- lib/generators/templates/two_facto_auth/auto/app/views/devise/sessions/two_factor.slim
 - spec/config/database.yml
 - spec/db/schema.rb
 - spec/lib/adminos/helpers/models/apply_sortable_order.rb
@@ -578,8 +604,12 @@ files:
 - spec/lib/adminos/helpers/models/slugged.rb
 - spec/lib/generators/adminos/adminos_generator_spec.rb
 - spec/lib/generators/adminos/ci_generator_spec.rb
+- spec/lib/generators/adminos/feedback_generator_rspec.rb
 - spec/lib/generators/adminos/i18n_generator_spec.rb
 - spec/lib/generators/adminos/install_generator_rspec.rb
+- spec/lib/generators/adminos/profile_generator_rspec.rb
+- spec/lib/generators/adminos/search_generator.rb
+- spec/lib/generators/adminos/two_factor_auth_generator_rspec.rb
 - spec/spec_helper.rb
 - spec/support/ammeter.rb
 - spec/support/database.rb
@@ -604,8 +634,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Adminos
@@ -621,8 +650,12 @@ test_files:
 - spec/lib/adminos/helpers/models/slugged.rb
 - spec/lib/generators/adminos/adminos_generator_spec.rb
 - spec/lib/generators/adminos/ci_generator_spec.rb
+- spec/lib/generators/adminos/feedback_generator_rspec.rb
 - spec/lib/generators/adminos/i18n_generator_spec.rb
 - spec/lib/generators/adminos/install_generator_rspec.rb
+- spec/lib/generators/adminos/profile_generator_rspec.rb
+- spec/lib/generators/adminos/search_generator.rb
+- spec/lib/generators/adminos/two_factor_auth_generator_rspec.rb
 - spec/spec_helper.rb
 - spec/support/ammeter.rb
 - spec/support/database.rb