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

data/lib/adminos.rb

@@ -3,17 +3,38 @@ require 'rails'
 require 'jquery-fileupload-rails'
 require 'dotenv-rails'
 require 'babosa'
-require 'russian'
 require 'devise'
 require 'cancancan'
+require 'ransack'
 require 'cocoon'
+require 'simple_form'
 
 module Adminos
+
+  autoload :FormBuilder,              'adminos/form_builder'
+
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset
+    @configuration = Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
   Helpers      = Module.new
   NestedSet    = Module.new
   Controllers  = Module.new
   StatefulLink = Module.new
 
+
   Path.require_tree 'adminos', except: %w[generators operations]
 
   class Engine < ::Rails::Engine
@@ -26,6 +47,7 @@ module Adminos
     initializer 'adminos.controller_helpers' do
       ActionController::Base.send :include, Controllers::Helpers
       ActionController::Base.send :include, Controllers::Resource
+      ActionController::Base.send :include, Controllers::Filters
     end
 
     initializer 'adminos.stateful_link' do
@@ -38,5 +60,3 @@ module Adminos
     end
   end
 end
-
-require 'adminos/extensions/nested_set'

data/lib/generators/adminos/adminos_generator.rb

@@ -26,6 +26,7 @@ module Adminos::Generators
       file = Dir.glob('db/migrate/*.rb').grep(/\d+_create_#{table_name}.rb$/).first
 
       return unless file
+
       inject_into_file file, file_content('migration.rb', true), after: /create_table.*\n/
 
       if drag_type?
@@ -62,6 +63,10 @@ module Adminos::Generators
     def locale_specific_actions
       return unless options.locale? || attributes.map(&:locale).any?
 
+      file = Dir.glob('db/migrate/*.rb').grep(/\d+_create_#{table_name}.rb$/).first
+      locale_attributes = attributes.map { |attr| attr.name if attr.locale }.compact
+      locale_attributes += %w(name nav_name meta_description meta_title)
+
       template 'locales/locale_fields.slim', "app/views/admin/#{table_name}/_locale_fields.slim"
       template 'locales/general_fields.slim', "app/views/admin/#{table_name}/_general_fields.slim" #unless attributes.map(&:locale).delete_if{|e| e == true}.blank?
       remove_file "app/views/admin/#{table_name}/_fields.slim"
@@ -69,17 +74,15 @@ module Adminos::Generators
       if File.exist?("app/models/#{file_name}.rb")
         inject_into_file "app/models/#{file_name}.rb", erb_file_content('locales/model.rb.erb'), before: /^\Snd\n/
       end
-      comment_lines "app/models/#{file_name}.rb", /validates :name/
 
-      if File.exist?("app/controllers/admin/#{table_name}_controller.rb")
-        inject_into_file "app/controllers/admin/#{table_name}_controller.rb", "            filter_by_locale: true,\n", before: /.*find_by_slug.*\n/
+      locale_attributes.each do |f|
+        gsub_file(file, /(t.string|t.text).+:(#{f})/, "t.jsonb    :#{f}")
       end
 
-      migration_template 'locales/migration.rb.erb', "db/migrate/add_translation_table_to_#{file_name}.rb"
+      comment_lines "app/models/#{file_name}.rb", /validates :name/
 
-      unless options.seo?
-        file = Dir.glob('db/migrate/*.rb').grep(/\d+_add_translation_table_to_#{file_name}.rb$/).first
-        gsub_file(file, /.+(meta_description|meta_title).+/, '')
+      if File.exist?("app/controllers/admin/#{table_name}_controller.rb")
+        inject_into_file "app/controllers/admin/#{table_name}_controller.rb", "            filter_by_locale: true,\n", before: /.*find_by_slug.*\n/
       end
     end
 

data/lib/generators/adminos/feedback_generator.rb

@@ -0,0 +1,39 @@
+require 'rails/generators/active_record'
+
+module Adminos::Generators
+  class FeedbackGenerator < Rails::Generators::Base
+    include ActiveRecord::Generators::Migration
+
+    desc 'Set up feedbacks'
+    source_root File.expand_path '../../templates/feedback', __FILE__
+
+    def auto
+      directory 'auto', '.', mode: :preserve
+    end
+
+    def route
+      insert_into_file "config/routes.rb", after: "namespace :admin do\n" do
+        <<~ROUT.indent(4)
+
+          resources :feedbacks, except: :show do
+            collection { post :batch_action }
+          end
+
+        ROUT
+      end
+    end
+
+    def migration
+      migration_template 'feedbacks_migration.rb', 'db/migrate/create_feedbacks.rb'
+    end
+
+    def sidebar_link
+      insert_into_file "app/views/shared/admin/_sidebar.slim", before: "\n        = top_menu_item active: 'admin/settings#' do" do
+        <<~SLIM.indent(8)
+          = top_menu_item active: 'admin/feedbacks#' do
+            = link_to t('admin.feedbacks.actions.index.header'), admin_feedbacks_path, class: 'nav__link'
+        SLIM
+      end
+    end
+  end
+end

data/lib/generators/adminos/i18n_generator.rb

@@ -53,11 +53,19 @@ module Adminos::Generators
 
     def localize_pages
       return unless options.pages?
+      file = Dir.glob('db/migrate/*.rb').grep(/\d+_create_pages.rb$/).first
+      model = 'app/models/page.rb'
 
-      migration_template 'add_translation_table_to_page.rb', 'db/migrate/add_translation_table_to_page.rb'
-      inject_into_file 'app/models/page.rb', file_content('page.rb'), before: /.*BEHAVIORS = .*/
-      comment_lines 'app/models/page.rb', /validates :name/
-      inject_into_file 'app/models/page.rb', ', :translations_attributes', after: /.*:parent_id, :published/
+      %w(name nav_name body meta_description meta_title).each do |f|
+        gsub_file(file, /(t.string|t.text).+:#{f}/, "t.jsonb    :#{f}")
+      end
+
+      inject_into_file model, file_content('page.rb'), before: /.*BEHAVIORS = .*/
+
+      gsub_file(model, 'has_rich_text :content', 'I18n.available_locales.each { |locale| has_rich_text(:"content_#{locale}") }')
+
+      comment_lines model, /validates :name/
+      inject_into_file model, ', :translations_attributes', after: /.*:parent_id, :published/
       inject_into_file 'app/controllers/admin/pages_controller.rb', "            filter_by_locale: true,\n", after: /.*[:sorted],\n/
       inject_into_file 'app/controllers/application_controller.rb', "  before_action :check_page_name_locale, unless: -> { controller_path.split('/').first == 'admin' }", after: /.*before_action.*\n/
       remove_file 'app/views/admin/pages/_fields.slim'
@@ -67,6 +75,10 @@ module Adminos::Generators
       directory 'auto', '.'
     end
 
+    def setup_tolk
+      rake 'tolk:setup'
+    end
+
     private
 
     def available_locales

data/lib/generators/adminos/install_generator.rb

@@ -16,6 +16,7 @@ module Adminos::Generators
     class_option :locales, type: :string
     class_option :is_test, type: :boolean, default: false
     class_option :ci, type: :boolean, default: true, desc: 'Set up Gitlab CI'
+    class_option :search, type: :string, enum: %w[elastic pg_search], default: 'pg_search', desc: 'Set up Search'
 
     def questions
       @settings = {}
@@ -53,6 +54,10 @@ module Adminos::Generators
       append_file 'db/seeds.rb', file_content('prepare_settings.rb')
     end
 
+    def readme
+      append_file 'README.md', file_content('README.md')
+    end
+
     def templates
       template 'deploy.rb.erb', 'config/deploy.rb'
       template 'database.yml', 'config/database.yml'
@@ -91,10 +96,27 @@ module Adminos::Generators
       run 'bundle exec rails action_text:copy_migrations'
     end
 
+    def run_binstubs
+      run 'bundle binstubs puma'
+    end
+
     def install_adminos_assets
       run "yarn add adminos"
     end
 
+    def setup_search
+      case options[:search]
+      when 'elastic'
+        gsub_file 'config/initializers/adminos.rb', /config.search_engine.+/ do
+          'config.search_engine = Adminos::Search::Elastic'
+        end
+
+        gsub_file 'Gemfile', "gem 'pg_search'", ''
+
+        inject_into_file 'Gemfile',  "gem 'searchkick'\n", after: /gem 'adminos'.+\n/
+      end
+    end
+
     def install_devise
       return unless @settings[:install_devise]
       generate 'devise:install'

data/lib/generators/adminos/profile_generator.rb

@@ -0,0 +1,34 @@
+require 'rails/generators/active_record'
+
+module Adminos::Generators
+  class ProfileGenerator < Rails::Generators::Base
+    include ActiveRecord::Generators::Migration
+
+    desc 'Set up admin profile page'
+    source_root File.expand_path '../../templates/profile', __FILE__
+
+    def auto
+      directory 'auto', '.', mode: :preserve
+    end
+
+    def route
+      insert_into_file "config/routes.rb", after: "resource  :settings, only: [:edit, :update]\n" do
+        <<~ROUT.indent(6)
+          resource  :profile, only: [:edit, :update]
+        ROUT
+      end
+    end
+
+    def sidebar_link
+      insert_into_file "app/views/shared/admin/_sidebar.slim", before: "\n        = top_menu_item active: 'admin/settings#' do" do
+        <<~SLIM.indent(8)
+
+          = top_menu_item active: 'admin/profiles#' do
+            = link_to edit_admin_profile_path, class: 'nav__link' do
+              span.link.link--settings
+                = t('admin.profile.actions.index.header')
+        SLIM
+      end
+    end
+  end
+end

data/lib/generators/adminos/search_generator.rb

@@ -0,0 +1,38 @@
+
+module Adminos::Generators
+  class SearchGenerator < Rails::Generators::NamedBase
+    desc 'Helps you setup your search.'
+
+    def configure_model
+      inject_into_class model_path, model do
+        <<~MODEL.indent(2)
+          include Adminos::Searchable
+
+          searchable
+        MODEL
+      end
+    end
+
+    def add_partial
+      insert_into_file partial_path, after: /collection_header\n/ do
+        <<~SLIM
+        = render 'shared/admin/search_form'
+        SLIM
+      end
+    end
+
+    private
+
+    def model_path
+      "app/models/#{model.underscore}.rb"
+    end
+
+    def partial_path
+      "app/views/admin/#{model.underscore.pluralize}/index.slim"
+    end
+
+    def model
+      "#{file_path.tr('/', '_').singularize.classify}"
+    end
+  end
+end

data/lib/generators/adminos/two_factor_auth_generator.rb

@@ -0,0 +1,81 @@
+require 'rails/generators/active_record'
+require "adminos/generators/utilities"
+
+module Adminos::Generators
+  class TwoFactorAuthGenerator < Rails::Generators::Base
+    include ActiveRecord::Generators::Migration
+    include Utilities
+
+    desc 'Set up 2fa for users'
+    source_root File.expand_path '../../templates/two_facto_auth', __FILE__
+
+    def auto
+      directory 'auto', '.', mode: :preserve
+    end
+
+    def bundle_dependencies
+      merge_gemfile_with('Gemfile')
+      install_dependencies
+    end
+
+    def generate_two_factor
+      generate 'devise_two_factor user OTP_SECRET_ENCRYPTION_KEY'
+    end
+
+    def routes
+      insert_into_file "config/routes.rb", after: "resource  :profile, only: [:edit, :update]\n" do
+        <<~ROUT.indent(6)
+          resource  :profile, only: [] do
+            member { post :toggle_two_factor }
+          end
+        ROUT
+      end
+
+      insert_into_file "config/routes.rb", after: "devise_for :users, skip: :omniauth_callbacks" do
+        <<~ROUT
+          ,
+                controllers: { sessions: 'users/sessions'}
+        ROUT
+      end
+    end
+
+    def add_toggle_two_factor_action
+      insert_into_file "app/controllers/admin/profiles_controller.rb", before: "\n  private" do
+        <<~RUBY.indent(2)
+
+          def toggle_two_factor
+            if resource.otp_required_for_login
+              resource.update(otp_required_for_login: false)
+            else
+              resource.update(otp_required_for_login: true, otp_secret: User.generate_otp_secret)
+            end
+            redirect_to action: :edit
+          end
+        RUBY
+      end
+    end
+
+    def add_2fa_to_profile_page
+      insert_into_file "app/views/admin/profiles/edit.slim", after: "= f.input :current_password, hint: 'Введите текущий пароль'\n" do
+        <<~SLIM.indent(6)
+          = render '2fa', resource: resource
+        SLIM
+      end
+    end
+
+    def add_qrcode_helper
+      insert_into_file "app/helpers/application_helper.rb", after: "module ApplicationHelper\n" do
+        <<~RUBY.indent(2)
+          def google_authenticator_qrcode(devise_resource)
+            issuer = '' # TODO: issuer name
+            label = "\#{issuer}:\#{devise_resource.email}"
+            data = devise_resource.otp_provisioning_uri(label, issuer: issuer)
+            escaped_data = Rack::Utils.escape(data)
+            url = "https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl=\#{escaped_data}"
+            image_tag(url, alt: 'Google Authenticator QRCode')
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/generators/templates/adminos/fields.slim

@@ -13,7 +13,7 @@
   = f.input :<%= attribute.name %>
 <% end -%>
 
-<% unless options.seo? -%>
+<% if options.seo? -%>
 .f__fieldset
   .f__legend= t 'labels.admin.legend.seo'
   = f.input :meta_title

data/lib/generators/templates/adminos/locales/locale_fields.slim

@@ -1,10 +1,13 @@
 .f__fieldset
-  = f.input :name<%= "\n  = f.input :nav_name" if options.type == 'section' %>
+  = f.input :name, locale: locale
+<%= "\n  = f.input :nav_name, locale: locale" if options.type == 'section' %>
 <% attributes.each do |attribute| -%>
-<%= "  = f.input :#{attribute.name}\n" if attribute.locale -%>
+<%= "  = f.input :#{attribute.name}, locale: locale\n" if attribute.locale -%>
 <% end -%>
 
+<% if options.seo? -%>
 .f__fieldset
   .f__legend= t 'labels.admin.legend.seo'
-  = f.input :meta_title
-  = f.input :meta_description, as: :string
+  = f.input :meta_title, locale: locale
+  = f.input :meta_description, as: :string, locale: locale
+<% end -%>

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

@@ -1,6 +1,5 @@
+  extend Mobility
 
-  translates :name, <%= attributes.map{|a| ":#{a.name}, " if a.locale }.compact.join %><%= ':nav_name, ' if options.type == 'section' %>:meta_description, :meta_title
-
-  accepts_nested_attributes_for :translations
+  translates :name, <%= attributes.map{|a| ":#{a.name}, " if a.locale }.compact.join %><%= ':nav_name, ' if options.type == 'section' %><%= ':meta_description, :meta_title, ' if options.seo? %>locale_accessors: true, ransack: true
 
   validates_with LocaleValidator

data/lib/generators/templates/ci/.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
 before_script:
   - rvm install $(cat .ruby-version)
   - rvm use $(cat .ruby-version)
-  - gem install bundler --no-ri --no-rdoc
+  - gem install bundler --no-document
   - bundle config build.pg --with-pg-config=/usr/pgsql-9.4/bin/pg_config
   - bin/setup
 

data/lib/generators/templates/feedback/auto/app/controllers/admin/feedbacks_controller.rb

@@ -0,0 +1,17 @@
+class Admin::FeedbacksController < Admin::BaseController
+  authorize_resource
+
+  resource( Feedback,
+            collection_scope: [:sorted],
+            location: proc { params[:stay_in_place] ?
+                            edit_polymorphic_path([:admin, resource]) :
+                            polymorphic_path([:admin, resource.class]) })
+
+  private
+
+  alias_method :collection_orig, :collection
+  def collection
+    @collection ||= collection_orig
+      .page(params[:page]).per(settings.per_page)
+  end
+end

data/lib/generators/templates/feedback/auto/app/controllers/feedbacks_controller.rb

@@ -0,0 +1,11 @@
+class FeedbacksController < ApplicationController
+  def create
+    @feedback = Feedback.create(feedback_params)
+  end
+
+  private
+
+  def feedback_params
+    params.require(:feedback).permit(:name, :phone, :email, :message)
+  end
+end

data/lib/generators/templates/feedback/auto/app/models/feedback.rb

@@ -0,0 +1,6 @@
+class Feedback < ActiveRecord::Base
+
+  scope :sorted, -> { order('created_at DESC') }
+
+  validates :name, :message, presence: true
+end

data/lib/generators/templates/feedback/auto/app/views/admin/feedbacks/_fields.slim

@@ -0,0 +1,5 @@
+.f__fieldset
+  = f.input :name
+  = f.input :email
+  = f.input :phone
+  = f.input :message

data/lib/generators/templates/feedback/auto/app/views/admin/feedbacks/index.slim

@@ -0,0 +1,28 @@
+- collection_title
+= collection_header
+
+- if collection.present?
+  - list = capture do
+    /= render partial: 'objects', object: collection
+    .table-list
+      table.table.table-hover.table-sm.table--feedback
+        tbody
+          - collection.each do |object|
+            tr
+              td.table__details
+                = object.name
+                span title="#{resource_class.human_attribute_name(:email)}"= link_to object.email, "mailto:#{object.email}"
+                span title="#{resource_class.human_attribute_name(:phone)}"= object.phone
+              td.table__text
+                = simple_format(object.message)
+              td.table-list__controls
+                = object_link_edit(object)
+              td.table-list__check
+                = admin_cb(object)
+
+  - if controller.respond_to?(:batch_action)
+    = batch_actions_tag publication: (collection.respond_to?(:set_each_published_on)),
+      nav_publication: (collection.respond_to?(:set_nav_published_on)) do
+      = list
+  - else
+    = list

data/lib/generators/templates/feedback/feedbacks_migration.rb

@@ -0,0 +1,13 @@
+class CreateFeedbacks < ActiveRecord::Migration[5.1]
+  def change
+    create_table :feedbacks do |t|
+      t.string   :name
+
+      t.string :email
+      t.string :phone
+      t.text :message
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/generators/templates/field/locales/locale_fields.slim

@@ -1,4 +1,4 @@
 .f__fieldset
 <% attributes.select(&:locale).each do |attribute| -%>
-<%= "  = f.input :#{attribute.name}\n" -%>
+<%= "  = f.input :#{attribute.name} locale: locale\n" -%>
 <% end -%>

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

@@ -1,6 +1,5 @@
+  extend Mobility
 
-  translates :name, <%= attributes.map{|a| ":#{a.name}" }.compact.join(', ') %>
-
-  accepts_nested_attributes_for :translations
+  translates :name, <%= attributes.map{|a| ":#{a.name}" }.compact.join(', ') %>, locale_accessors: true, ransack: true
 
   validates_with LocaleValidator

data/lib/generators/templates/i18n/Gemfile

@@ -1 +1,6 @@
-gem 'globalize'
+gem 'mobility'
+gem 'mobility-ransack', '~> 0.2.2'
+gem 'devise-i18n'
+gem 'kaminari-i18n'
+gem 'rails-i18n'
+gem 'tolk'

data/lib/generators/templates/i18n/auto/app/validators/locale_validator.rb

@@ -13,9 +13,13 @@ class LocaleValidator < ActiveModel::Validator
 
   def validations(field, record)
     validate_name = false
+
     I18n.available_locales.each do |locale|
-      validate_name = true unless record.translation_for(locale).send(field).blank?
+      Mobility.with_locale(locale) do
+        validate_name = true unless record.send(field).blank?
+      end
     end
+
     validate_name = true if record.send(field).presence
 
     record.errors.add(field, 'Укажите Название хотя бы в одной локали') unless validate_name

data/lib/generators/templates/i18n/auto/app/views/admin/base/_pills.slim

@@ -12,8 +12,4 @@ ul.nav.nav-tabs.with-togglable-navigation
 .tab-content
   - I18n.available_locales.each_with_index do |locale, i|
     .tab-pane id="pill_#{locale}" class=('active' if locale == :ru)
-      - if locale == I18n.default_locale
-        = render 'locale_fields', locale: locale, f: f
-      - else
-        = f.globalize_fields_for locale, wrapper: :admin do |g|
-          = render 'locale_fields', locale: locale, f: g
+      = render 'locale_fields', locale: locale, f: f

data/lib/generators/templates/i18n/auto/app/views/admin/pages/_locale_fields.slim

@@ -1,13 +1,13 @@
 .f__fieldset
-  = f.input :name
-  = f.input :nav_name
+  = f.input :name, locale: locale
+  = f.input :nav_name, locale: locale
 
-  = f.rich_text_area :content
+  = f.rich_text_area "content_#{locale}"
   / = f.input :body
   /.kaya-please
     = f.input_field :body, as: :text, id: 'kaya-editor', value: f.object.read_attribute(:body)
 
 .f__fieldset
   .f__legend= t 'labels.admin.legend.seo'
-  = f.input :meta_title
-  = f.input :meta_description, as: :string
+  = f.input :meta_title, locale: locale
+  = f.input :meta_description, as: :string, locale: locale