adminos 1.0.0.pre.rc.2 → 1.0.0.pre.rc.4

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.4
 platform: ruby
 authors:
 - RavWar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path
@@ -45,14 +45,14 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
@@ -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:
     - - ">="
@@ -215,14 +215,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -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.1.6
 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

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/lib/adminos/extensions/globalize_actiontext.rb

@@ -1,28 +0,0 @@
-module GlobalizeActiontext
-  module ActionText
-    def setup_translates!(options)
-      super
-
-      self.after_initialize do
-        reflect_has_one = self.class.reflect_on_all_associations(:has_one)
-        rich_text_attributes = reflect_has_one.map(&:name).map { |name| name.to_s.gsub('rich_text_', '') }.compact
-
-        self.class.translation_class.class_eval do
-          rich_text_attributes.each do |rich_text_attribute|
-            attribute rich_text_attribute
-            has_rich_text rich_text_attribute
-            define_method "#{rich_text_attribute}=" do |value|
-              send(rich_text_attribute).body = value
-
-              return unless public_send(rich_text_attribute).changed?
-
-              attribute_will_change! rich_text_attribute
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.singleton_class.prepend(GlobalizeActiontext::ActionText)

data/lib/adminos/extensions/globalize_fields.rb

@@ -1,19 +0,0 @@
-module ActionView
-  module Helpers
-    class FormBuilder
-      def globalize_fields_for(locale, *args, &proc)
-        raise ArgumentError, "Missing block" unless block_given?
-        @globalize_index = @globalize_index ? @globalize_index + 1 : 1
-        object_name = "#{@object_name}[translations_attributes][#{@globalize_index}]"
-        object = @object.translation_for locale
-        @template.concat @template.hidden_field_tag("#{object_name}[id]", object ? object.id : "")
-        @template.concat @template.hidden_field_tag("#{object_name}[locale]", locale)
-        if @template.respond_to? :simple_fields_for
-          @template.simple_fields_for(object_name, object, *args, &proc)
-        else
-          @template.fields_for(object_name, object, *args, &proc)
-        end
-      end
-    end
-  end
-end

data/lib/generators/templates/adminos/locales/migration.rb.erb

@@ -1,18 +0,0 @@
-class AddTranslationTableTo<%= file_name.camelize %> < ActiveRecord::Migration[5.2]
-  def up
-    <%= file_name.camelize %>.create_translation_table!({
-      name: :string,<%= "\n      nav_name: :string," if options.type == 'section' %>
-<% attributes.each do |attribute| -%>
-      <%= "#{attribute.name}: :#{attribute.type},\n" if attribute.locale -%>
-<% end -%>
-      meta_description: :text,
-      meta_title: :string
-    }, {
-      migrate_data: true
-    })
-  end
-
-  def down
-    <%= file_name.camelize %>.drop_translation_table! migrate_data: true
-  end
-end

data/lib/generators/templates/field/locales/migration.rb.erb

@@ -1,13 +0,0 @@
-class AddTranslationFields<%= attributes.select(&:locale).map(&:name).join('_').camelize %>To<%= file_name.camelize %> < ActiveRecord::Migration[5.1]
-  def up
-    <% attributes.select(&:locale).each do |attribute| -%>
-      <%= file_name.camelize %>.add_translation_fields! <%= attribute.name %>: :<%= attribute.type %>
-    <% end -%>
-  end
-
-  def down
-    <% attributes.select(&:locale).each do |attribute| -%>
-      remove_column :<%= file_name %>_translations, :<%= attribute.name %>
-    <% end -%>
-  end
-end

data/lib/generators/templates/i18n/add_translation_table_to_page.rb

@@ -1,15 +0,0 @@
-class AddTranslationTableToPage < ActiveRecord::Migration[5.1]
-  def up
-    Page.create_translation_table!({
-      name: :string,
-      nav_name: :string,
-      body: :text,
-      meta_description: :text,
-      meta_title: :string
-    },       migrate_data: true)
-  end
-
-  def down
-    Page.drop_translation_table! migrate_data: true
-  end
-end

data/lib/generators/templates/i18n/auto/config/initializers/globalize_fields.rb

@@ -1 +0,0 @@
-require 'adminos/extensions/globalize_fields'

data/lib/generators/templates/install/auto/config/deploy/shared/nginx.conf.erb

@@ -1,28 +0,0 @@
-upstream unicorn {
-  server unix:<%= shared_path %>/tmp/sockets/unicorn.sock fail_timeout=0;
-}
-
-server {
-  server_name <%= fetch(:server_name) %>;
-  listen 80;
-  root <%= fetch(:deploy_to) %>/current/public;
-
-  location ^~ /assets/ {
-    gzip_static on;
-    expires max;
-    add_header Cache-Control public;
-  }
-
-  try_files $uri/index.html $uri @unicorn;
-  location @unicorn {
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-    proxy_pass http://unicorn;
-  }
-
-  error_page 500 502 503 504 /500.html;
-  client_max_body_size 4G;
-  keepalive_timeout 10;
-}
-

data/lib/generators/templates/install/auto/config/deploy/shared/unicorn.rb.erb

@@ -1,35 +0,0 @@
-worker_processes <%= fetch(:unicorn_worker_processes) %>
-user "<%= fetch(:deploy_user) %>", "<%= fetch(:deploy_user) %>"
-working_directory "<%= current_path %>"
-listen "<%= shared_path %>/tmp/sockets/unicorn.sock"
-
-timeout 80
-
-preload_app true
-
-pid "<%= shared_path %>/tmp/pids/unicorn.pid"
-
-stderr_path "<%= shared_path %>/log/unicorn.stderr.log"
-stdout_path "<%= shared_path %>/log/unicorn.stdout.log"
-
-GC.respond_to?(:copy_on_write_friendly=) and
-  GC.copy_on_write_friendly = true
-
-before_fork do |server, worker|
-   old_pid = "#{server.config[:pid]}.oldbin"
-   if File.exists?(old_pid) && server.pid != old_pid
-      begin
-         Process.kill("QUIT", File.read(old_pid).to_i)
-      rescue Errno::ENOENT, Errno::ESRCH
-      end
-   end
-end
-
-after_fork do |server, worker|
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-end
-
-before_exec do |server|
-  ENV['BUNDLE_GEMFILE'] = "<%= current_path %>/Gemfile"
-end

data/lib/generators/templates/install/auto/lib/capistrano/substitute_strings.rb

@@ -1,12 +0,0 @@
-# we often want to refer to variables which
-# are defined in subsequent stage files. This
-# let's us use the {{var}} to represent fetch(:var)
-# in strings which are only evaluated at runtime.
-
-def sub_strings(input_string)
-  output_string = input_string
-  input_string.scan(/{{(\w*)}}/).each do |var|
-    output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym))
-  end
-  output_string
-end

data/package-lock.json

@@ -1,3 +0,0 @@
-{
-  "lockfileVersion": 1
-}