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

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, 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

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

@@ -0,0 +1,92 @@
+Mobility.configure do |config|
+  # Sets the default backend to use in models. This can be overridden in models
+  # by passing +backend: ...+ to +translates+.
+  config.default_backend = :jsonb
+
+  # By default, Mobility uses the +translates+ class method in models to
+  # describe translated attributes, but you can configure this method to be
+  # whatever you like. This may be useful if using Mobility alongside another
+  # translation gem which uses the same method name.
+  config.accessor_method = :translates
+
+  # To query on translated attributes, you need to append a scope to your
+  # model. The name of this scope is +i18n+ by default, but this can be changed
+  # to something else.
+  config.query_method    = :i18n
+
+  # Uncomment and remove (or add) items to (from) this list to completely
+  # disable/enable plugins globally (so they cannot be used and are never even
+  # loaded). Note that if you remove an item from the list, you will not be
+  # able to use the plugin at all, and any options for the plugin will be
+  # ignored by models. (In most cases, you probably don't want to change this.)
+  #
+  # config.plugins = %i[
+  #   query
+  #   cache
+  #   dirty
+  #   fallbacks
+  #   presence
+  #   default
+  #   attribute_methods
+  #   fallthrough_accessors
+  #   locale_accessors
+  # ]
+
+  config.plugins += [:ransack]
+
+  # The translation cache is on by default, but you can turn it off by
+  # uncommenting this line. (This may be helpful in debugging.)
+  #
+  # config.default_options[:cache] = false
+
+  # Dirty tracking is disabled by default. Uncomment this line to enable it.
+  # If you enable this, you should also enable +locale_accessors+ by default
+  # (see below).
+  #
+  # config.default_options[:dirty] = true
+
+  # No fallbacks are used by default. To define default fallbacks, uncomment
+  # and set the default fallback option value here. A "true" value will use
+  # whatever is defined by +I18n.fallbacks+ (if defined), or alternatively will
+  # fallback to your +I18n.default_locale+.
+  #
+  # config.default_options[:fallbacks] = true
+
+  # The Presence plugin converts empty strings to nil when fetching and setting
+  # translations. By default it is on, uncomment this line to turn it off.
+  #
+  # config.default_options[:presence] = false
+
+  # Set a default value to use if the translation is nil. By default this is
+  # off, uncomment and set a default to use it across all models (you probably
+  # don't want to do that).
+  #
+  # config.default_options[:default] = ...
+
+  # Uncomment to enable locale_accessors by default on models. A true value
+  # will use the locales defined either in
+  # Rails.application.config.i18n.available_locales or I18n.available_locales.
+  # If you want something else, pass an array of locales instead.
+  #
+  # config.default_options[:locale_accessors] = true
+
+  # Uncomment to enable fallthrough accessors by default on models. This will
+  # allow you to call any method with a suffix like _en or _pt_br, and Mobility
+  # will catch the suffix and convert it into a locale in +method_missing+. If
+  # you don't need this kind of open-ended fallthrough behavior, it's better
+  # to use locale_accessors instead (which define methods) since method_missing
+  # is very slow. (You can use both fallthrough and locale accessor plugins
+  # together without conflict.)
+  #
+  # Note: The dirty plugin enables fallthrough_accessors by default.
+  #
+  # config.default_options[:fallthrough_accessors] = true
+
+  # You can also include backend-specific default options. For example, if you
+  # want to default to using the text-type translation table with the KeyValue
+  # backend, you can set that as a default by uncommenting this line, or change
+  # it to :string to default to the string-type translation table instead. (For
+  # other backends, this option is ignored.)
+  #
+  # config.default_options[:type] = :text
+end

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

@@ -1,5 +1,5 @@
-  translates :name, :nav_name, :body, :meta_description, :meta_title
+  extend Mobility
 
-  accepts_nested_attributes_for :translations
+  translates :name, :nav_name, :body, :meta_description, :meta_title, locale_accessors: true, ransack: true
 
   validates_with LocaleValidator

data/lib/generators/templates/install/Gemfile

@@ -10,17 +10,14 @@ gem 'webpacker', '~> 3.5'
 gem "actiontext", github: "rails/actiontext", require: "action_text", ref: "cfe4674d3637c746cdb3c2b5131e2de498775529"
 gem "image_processing", "~> 1.2" # for Active Storage variants
 
-group :production, :staging do
-  gem 'unicorn'
-end
-
 group :development do
   # gem 'spring'
   gem 'capistrano', require: false
   gem 'capistrano-bundler', require: false
   gem 'capistrano-rails', require: false
   gem 'capistrano-rvm', require: false
-  gem 'capistrano3-unicorn', require: false
+  gem 'capistrano3-puma'
+  gem 'capistrano-systemd-multiservice', '~> 0.1.0.beta6', require: false
 
   gem 'guard'
   gem 'guard-livereload', '~> 2.5', require: false
@@ -47,6 +44,7 @@ gem 'paper_trail'
 gem 'postal-rails', '~> 1.0'
 
 gem 'scoped_search'
+gem 'pg_search'
 
 gem 'omniauth'
 gem 'omniauth-facebook'

data/lib/generators/templates/install/README.md

@@ -0,0 +1,22 @@
+
+## Deployment
+
+For painless deployment, you should configure several sudo commands for specified deploy user
+to be executed without asking for password via `sudo visudo` command,
+as described in https://capistranorb.com/documentation/getting-started/authentication-and-authorisation/#authorisation
+
+Full list of sudo command could be obtained by running commands mentioned below with `--dry-run` option
+(e. g. `bin/cap --dry-run {stage_name} deploy:setup`
+
+1. Set up new deployment in `config/stages/{stage_name}.rb` file
+1. Set up new deployment (upload configurations):
+
+    `bin/cap {stage_name} deploy:setup`
+
+1. Deploy new version to `{stage_name}`:
+
+    `bin/cap {stage_name} deploy`
+
+2. On new deployment (or when systemd templates updated), update & enable systemd services for Puma & Sidekiq:
+
+    `bin/cap {stage_name} deploy:setup_systemd`

data/lib/generators/templates/install/auto/Capfile

@@ -3,12 +3,22 @@ require 'capistrano/setup'
 
 # Include default deployment tasks
 require 'capistrano/deploy'
+require 'capistrano/scm/git'
 require 'capistrano/rvm'
 require 'capistrano/bundler'
 require 'capistrano/rails'
-require 'capistrano3/unicorn'
+require 'capistrano/puma'
 require 'capistrano-db-tasks'
+require 'whenever/capistrano'
+require 'capistrano/systemd/multiservice'
 
+install_plugin Capistrano::SCM::Git
+install_plugin Capistrano::Puma
+install_plugin Capistrano::Puma::Nginx
+install_plugin Capistrano::Systemd::MultiService.new_service('puma')
+# install_plugin Capistrano::Systemd::MultiService.new_service('sidekiq')
+
+lib_dir = File.join(__dir__, 'lib')
+$LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
-Dir.glob('lib/capistrano/**/*.rb').each { |r| import r }

data/lib/generators/templates/install/auto/app/views/admin/base/_form.slim

@@ -7,7 +7,7 @@
 
 = resource_header
 
-= simple_form_for resource_form_object, wrapper: :admin do |f|
+= adminos_form_for resource_form_object, wrapper: :admin do |f|
   .f
     .f__wrapper
       / Родительский элемент

data/lib/generators/templates/install/auto/app/views/shared/helpers/admin/_collection_header.slim

@@ -2,3 +2,5 @@
   h1= label
   - if with_button_new
     = collection_button_new
+  = adminos_filters_form_for filters
+

data/lib/generators/templates/install/auto/app/views/shared/helpers/admin/_object_link_new.slim

@@ -1 +1 @@
-= link_to :new, polymorphic_path( [:admin, object.class], action: :new, parent_id: object.id )
+= link_to :new, polymorphic_path( [:admin, object.class], action: :new, parent_id: object.id ), class: 'icon icon--diff -diff', title: t('labels.admin.add_child')

data/lib/generators/templates/install/auto/config/deploy/staging.rb

@@ -1,12 +1,17 @@
-server "#{fetch(:application)}.staging.molinos.ru", user: 'deployer', roles: %w(web app db), primary: true
-set :deploy_user, :deployer
-set :server_name, "#{fetch(:application)}.staging.molinos.ru"
-set :app_name, fetch(:application)
-set :user_home_dir, "/home/#{fetch(:deploy_user)}"
-# set :god_port, PLACEHOLDER
+server "#{fetch(:application)}.staging.molinos.ru", user: 'app', roles: %w(web app db), primary: true
+
+set :domain, "#{fetch(:application)}.staging.molinos.ru"
 set :keep_releases, 5
 set :rails_env, 'staging'
-set :unicorn_env, 'staging'
-set :branch, :staging
-set :unicorn_worker_processes, 1
-set :deploy_to, "#{fetch(:user_home_dir)}/#{fetch(:application)}"
+set :branch, :develop
+
+set :user, :app
+set :deploy_to, "/home/#{fetch(:user)}/#{fetch(:application)}"
+
+# CentOS
+set :nginx_sites_available_path, "#{fetch(:deploy_to)}/shared"
+set :nginx_sites_enabled_path, '/etc/nginx/conf.d'
+
+# Ubuntu
+# set :nginx_sites_available_path, "/etc/nginx/sites-available"
+# set :nginx_sites_enabled_path, "/etc/nginx/sites-enabled"

data/lib/generators/templates/install/auto/config/deploy/{shared → templates}/database.yml.erb

@@ -5,6 +5,6 @@
   reconnect: false
   database: <%= "#{fetch(:application)}_#{fetch(:rails_env)}" %>
   pool: 5
-  username: <%= "dbu_#{fetch(:deploy_user)}" %>
+  username: <%= "dbu_#{fetch(:user)}" %>
   password:
   host: