enjoy_cms_faq 0.3.5 → 0.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c4f104fce776355a25b9073e42aa96a4643d8d
-  data.tar.gz: 2e4422d8ec654c5b0c9e6f41dbc9b8b70db52b9d
+  metadata.gz: 61d83964ea24eb0baa90091655042615b1a4cc2c
+  data.tar.gz: 3a84569c09aa468a409248f4dc78b1a844e1cfa1
 SHA512:
-  metadata.gz: 3ee95207fb2d6a8f3b174214b4920976d0ae31df2034bfb123c302caa64f40e2cfccedd758a586cdbf68ed15f5ca0126badfad7001971be9433a78af1fe7abd7
-  data.tar.gz: 4c97c0f2c58c34e8fffc037809b476114478e51a696b70c3ac5fe5a87c1422e4db84c99a2a32f63bd92ebbf14c35f02fd54f11a10c1ebe484987bd81d080a9f2
+  metadata.gz: 2cab60407097ea2c3e5c6ba12a2ff4d9633da8c0b3152ff89707ad5bf117d2520e1185052465edd526c1d292850819f5d0774139a4b365b874421456a01ff907
+  data.tar.gz: 35553b82ee52b5f334f9de00b271fd32677830da380da9867422e0b0f59af85e2db08520da6adae2bf6af3e993b96403ab65115f3e46de3d563e87e766523652

data/.ruby-gemset

@@ -0,0 +1 @@
+enjoy_cms_faq

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/app/assets/javascripts/enjoy/faq.coffee

@@ -0,0 +1,6 @@
+#= require ./faq/init
+#= require ./faq/form
+
+#= require_self
+
+window.enjoy_cms.faq.create_ajax_form()

data/app/assets/javascripts/enjoy/faq/form.coffee

@@ -0,0 +1,9 @@
+window.enjoy_cms.faq.create_ajax_form = (form_selector = "#new_enjoy_faq_question", wrapper_selector = "#enjoy_faq_form" )->
+
+  $(document).delegate form_selector, "ajax:complete", (event, xhr, status)->
+    $(event.currentTarget).closest(wrapper_selector).html(xhr.responseText)
+
+  $(document).delegate form_selector + " .input", 'click', (e) ->
+    e.preventDefault()
+    $(e.currentTarget).removeClass("field_with_errors").find('span.error').hide()
+    return false

data/app/assets/javascripts/enjoy/faq/init.coffee

@@ -0,0 +1,2 @@
+window.enjoy_cms ||= {}
+window.enjoy_cms.faq ||= {}

data/app/{models/concerns/enjoy/faq/decorators/question_category.rb → controllers/concerns/enjoy/faq/decorators/categories.rb}

@@ -1,5 +1,5 @@
 module Enjoy::Faq::Decorators
-  module QuestionCategory
+  module Categories
     extend ActiveSupport::Concern
   end
 end

data/app/controllers/enjoy/faq/categories_controller.rb

@@ -0,0 +1,7 @@
+module Enjoy::Faq
+  class CategoriesController < ApplicationController
+    include Enjoy::Faq::Controllers::Categories
+
+    include Enjoy::Faq::Decorators::Categories
+  end
+end

data/app/{controllers/concerns/enjoy/catalog/decorators/questions.rb → models/concerns/enjoy/faq/decorators/category.rb}

@@ -1,5 +1,5 @@
 module Enjoy::Faq::Decorators
-  module Questions
+  module Category
     extend ActiveSupport::Concern
   end
 end

data/app/models/enjoy/faq/category.rb

@@ -0,0 +1,11 @@
+module Enjoy::Faq
+  class Category
+    include Enjoy::Faq::Models::Category
+
+    include Enjoy::Faq::Decorators::Category
+
+    rails_admin(&Enjoy::Faq::Admin::Category.config(rails_admin_add_fields) { |config|
+      rails_admin_add_config(config)
+    })
+  end
+end

data/app/views/enjoy/faq/categories/index.html.slim

@@ -0,0 +1,6 @@
+- @categories.each do |c|
+  p= link_to c.name, c, title: c.name
+
+.newquestionform
+  p.newquestiontitle Задать свой вопрос:
+  = render partial: "enjoy/faq/questions/form_with_wrapper"

data/app/views/enjoy/faq/{question_categories → categories}/show.html.slim

@@ -1,3 +1,3 @@
-h1= @question_category.name
+h1= @category.name
 - @questions.each do |q|
   = link_to q.name, q, title: q.name

data/app/views/enjoy/faq/questions/{_new_question_form.html.slim → _form.html.slim}

@@ -1,6 +1,6 @@
 - @question ||= Enjoy::Faq::Question.new
 - if @question.new_record?
-  = simple_form_for @question, url: enjoy_questions_path do |f|
+  = simple_form_for @question, url: enjoy_faq_questions_path do |f|
     - unless @message.blank?
       h3= @message
     .inputtextblock_q

data/app/views/enjoy/faq/questions/_form_with_wrapper.html.slim

@@ -0,0 +1,2 @@
+#enjoy_faq_form
+  = render partial: "enjoy/faq/questions/form"

data/app/views/enjoy/faq/questions/_question_block.html.slim

@@ -1,7 +1,7 @@
 .qtable
-  - _question_category = q.question_category
-  -  if _question_category
-    = link_to _question_category.name, _question_category, title: _question_category.name
+  - _category = q.category
+  -  if _category
+    = link_to _category.name, _category, title: _category.name
 
   .qtext_block
     .questionblock

data/app/views/enjoy/faq/questions/create.html.slim

@@ -1 +1 @@
-= render partial: "enjoy/faq/questions/new_question_form"
+= render partial: "enjoy/faq/questions/form_with_wrapper"

data/app/views/enjoy/faq/questions/index.html.slim

@@ -4,4 +4,4 @@
 
 .newquestionform
   p.newquestiontitle Задать свой вопрос:
-  = render partial: "enjoy/faq/questions/new_question_form"
+  = render partial: "enjoy/faq/questions/form_with_wrapper"

data/app/views/enjoy/faq/questions/new.html.slim

@@ -1,3 +1,3 @@
 .newquestionform
   p.newquestiontitle Задать свой вопрос:
-    = render partial: "enjoy/faq/questions/new_question_form"
+    = render partial: "enjoy/faq/questions/form_with_wrapper"

data/config/locales/enjoy.faq.ru.yml

@@ -0,0 +1,39 @@
+ru:
+  enjoy:
+    faq: FAQ
+    breadcrumbs:
+      faq: FAQ
+    errors:
+      faq:
+        recaptcha: Вы робот?
+
+  mongoid:
+    models:
+      enjoy/faq/question: Вопросы
+      enjoy/faq/category: Категории
+    attributes:
+      enjoy/faq/question:
+        question_text: Текст вопроса
+        question_text_after_editing: Текст вопроса (редактированный)
+        author_name: Имя автора
+        author_name_after_editing: Имя автора (редактированное)
+        author_email: E-mail автора
+
+        answered: Есть ответ
+        answer_text: Текст ответа
+        answered_time: Время ответа
+        answer_author_name: Имя автора ответа
+
+        categories: Категории
+        category_ids: Категории
+
+      enjoy/faq/category:
+        questions: Вопросы
+
+
+    errors:
+      models:
+        enjoy/faq/question:
+          attributes:
+            author_email:
+              invalid_email_address: "Некорректный e-mail"

data/enjoy_cms_faq.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'enjoy_cms', "~> 0.3.5"
+  spec.add_dependency 'enjoy_cms', "~> 0.4.0.beta3"
 end

data/lib/enjoy/faq/admin/{question_category.rb → category.rb}

@@ -1,6 +1,6 @@
 module Enjoy::Faq
   module Admin
-    module QuestionCategory
+    module Category
       def self.config(fields = {})
         Proc.new {
           navigation_label "FAQ"

data/lib/enjoy/faq/admin/question.rb

@@ -9,12 +9,12 @@ module Enjoy::Faq
             scopes [:by_date, :by_answered_date, :answered, :not_answered, :enabled, nil]
 
             field :enabled, :toggle
-            field :question_categories
+            field :categories
             field :full_name
           end
 
           edit do
-            field :question_categories
+            field :categories
             field :enabled, :toggle
 
             group :URL do

data/lib/enjoy/faq/configuration.rb

@@ -19,6 +19,13 @@ module Enjoy
       attr_accessor :save_with_captcha
       attr_accessor :captcha_error_message
 
+      attr_accessor :recaptcha_support
+      attr_accessor :simple_captcha_support
+
+      attr_accessor :seo_support
+
+      attr_accessor :localize
+
       def initialize
         @author_name_required = true
 
@@ -26,6 +33,15 @@ module Enjoy
 
         @save_with_captcha = true
         @captcha_error_message = "Код с картинки введен неверно"
+
+        @recaptcha_support = defined?(Recaptcha)
+        @simple_captcha_support = defined?(SimpleCaptcha)
+
+        @seo_support = defined?(Enjoy::Seo)
+
+        @breadcrumbs_on_rails_support = defined?(BreadcrumbsOnRails)
+
+        @localize = Enjoy.config.localize
       end
     end
   end

data/lib/enjoy/faq/controllers/{question_categories.rb → categories.rb}

@@ -1,40 +1,40 @@
 module Enjoy::Faq
   module Controllers
-    module QuestionCategories
+    module Categories
       extend ActiveSupport::Concern
 
       def index
-        @question_categories = question_category_class.enabled.sorted.to_a
-        @root_categories = question_category_class.enabled.roots.sorted.all.to_a
+        @categories = category_class.enabled.sorted.to_a
+        @root_categories = category_class.enabled.roots.sorted.all.to_a
         # index_crumbs
       end
 
       def show
-        @question_category = question_category_class.enabled.find(params[:id])
-        if !@question_category.text_slug.blank? and @question_category.text_slug != params[:id]
-          redirect_to @question_category, status_code: 301
+        @category = category_class.enabled.find(params[:id])
+        if !@category.text_slug.blank? and @category.text_slug != params[:id]
+          redirect_to @category, status_code: 301
           return
         end
         @seo_parent_page = find_seo_page(question_categories_path)
 
-        @children = @question_category.children.enabled.sorted.all.to_a
-        @questions = @question_category.questions.enabled.sorted.all.to_a
+        @children = @category.children.enabled.sorted.all.to_a
+        @questions = @category.questions.enabled.sorted.all.to_a
 
         # index_crumbs
         # category_crumbs
       end
 
       def page_title
-        if @question_category
-          @question_category.page_title
+        if @category
+          @category.page_title
         else
           super
         end
       end
 
       private
-      def question_category_class
-        Enjoy::Faq::QuestionCategory
+      def category_class
+        Enjoy::Faq::Category
       end
       def question_class
         Enjoy::Faq::Question

data/lib/enjoy/faq/controllers/questions.rb

@@ -29,7 +29,25 @@ module Enjoy::Faq
       def create
         @question = question_class.new(question_params)
 
-        _method = Enjoy::Faq.configuration.save_with_captcha ? :save_with_captcha : :save
+        if Enjoy::Faq.config.captcha
+          if Enjoy::Faq.config.recaptcha_support
+            if verify_recaptcha
+              meth = :save
+            else
+              meth = :valid?
+              @recaptcha_error = I18n.t('enjoy.errors.faq.recaptcha')
+            end
+
+          elsif Enjoy::Faq.config.simple_captcha_support
+            meth = :save_with_captcha
+
+          else
+            meth = :save
+          end
+        else
+          meth = :save
+        end
+
         if @question.send(_method)
           @message = "Успешно создано все"
         else
@@ -43,11 +61,11 @@ module Enjoy::Faq
 
       private
       def question_params
-        params[:question].permit(:question_text, :author_name, :author_email, :captcha, :captcha_key)
+        params[:enjoy_faq_question].permit(:question_text, :author_name, :author_email, :captcha, :captcha_key)
       end
 
-      def question_category_class
-        Enjoy::Faq::QuestionCategory
+      def category_class
+        Enjoy::Faq::Category
       end
       def question_class
         Enjoy::Faq::Question

data/lib/enjoy/faq/models/{question_category.rb → category.rb}

@@ -1,15 +1,17 @@
 module Enjoy::Faq
   module Models
-    module QuestionCategory
+    module Category
       extend ActiveSupport::Concern
       include Enjoy::Model
-
       include Enjoy::Enableable
-      include Enjoy::Seoable
-      include Enjoy::SitemapDataField
+
+      if Enjoy::Faq.config.seo_support
+        include Enjoy::Seo::Seoable
+        include Enjoy::Seo::SitemapDataField
+      end
       include ManualSlug
 
-      include Enjoy::Faq.orm_specific('QuestionCategory')
+      include Enjoy::Faq.orm_specific('Category')
 
       included do
         manual_slug :name

data/lib/enjoy/faq/models/mongoid/{question_category.rb → category.rb}

@@ -1,23 +1,20 @@
 module Enjoy::Faq
   module Models
     module Mongoid
-      module QuestionCategory
+      module Category
         extend ActiveSupport::Concern
 
         include Enjoy::HtmlField
 
         included do
-          if defined?(RailsAdminComments)
-            include RailsAdminComments::Commentable
-          end
-          
-          field :name,          type: String, localize: Enjoy.configuration.localize
+
+          field :name,          type: String, localize: Enjoy::Faq.configuration.localize
 
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }
 
-          enjoy_cms_html_field :excerpt,   type: String, localize: Enjoy.configuration.localize, default: ""
-          enjoy_cms_html_field :content,   type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :excerpt,   type: String, localize: Enjoy::Faq.configuration.localize, default: ""
+          enjoy_cms_html_field :content,   type: String, localize: Enjoy::Faq.configuration.localize, default: ""
         end
 
         def questions

data/lib/enjoy/faq/models/mongoid/question.rb

@@ -7,23 +7,19 @@ module Enjoy::Faq
         include Enjoy::HtmlField
 
         included do
-          if defined?(RailsAdminComments)
-            include RailsAdminComments::Commentable
-          end
 
           field :question_text
-          enjoy_cms_html_field :question_text_after_editing, localize: Enjoy.configuration.localize
+          enjoy_cms_html_field :question_text_after_editing, localize: Enjoy::Faq.configuration.localize
           field :author_name
-          field :author_name_text_after_editing, localize: Enjoy.configuration.localize
+          field :author_name_text_after_editing, localize: Enjoy::Faq.configuration.localize
           field :author_email
 
           field :answered, type: Boolean, default: false
-          enjoy_cms_html_field :answer_text, localize: Enjoy.configuration.localize
+          enjoy_cms_html_field :answer_text, localize: Enjoy::Faq.configuration.localize
           field :answered_time, type: Time
           field :answer_author_name, default: Enjoy::Faq.configuration.default_answer_author_name
 
-          has_and_belongs_to_many :question_categories, class_name: "Enjoy::Faq::QuestionCategory", inverse_of: nil
-          alias :categories :question_categories
+          has_and_belongs_to_many :categories, class_name: "Enjoy::Faq::Category", inverse_of: nil
 
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }
@@ -37,8 +33,8 @@ module Enjoy::Faq
           scope :recent, ->(count = 5) { enabled.after_now.by_date.limit(count) }
         end
 
-        def question_category
-          self.question_categories.enabled.sorted.first
+        def category
+          self.categories.enabled.sorted.first
         end
 
         def question_text_output

data/lib/enjoy/faq/models/question.rb

@@ -5,8 +5,10 @@ module Enjoy::Faq
       include Enjoy::Model
       include Enjoy::Enableable
 
-      include Enjoy::Seoable
-      include Enjoy::SitemapDataField
+      if Enjoy::Faq.config.seo_support
+        include Enjoy::Seo::Seoable
+        include Enjoy::Seo::SitemapDataField
+      end
       include ManualSlug
 
       include Enjoy::Faq.orm_specific('Question')
@@ -14,7 +16,10 @@ module Enjoy::Faq
       included do
         manual_slug :full_name
 
-        apply_simple_captcha message: Enjoy::Faq.configuration.captcha_error_message
+        if Enjoy::Faq.config.simple_captcha_support
+          include SimpleCaptcha::ModelHelpers
+          apply_simple_captcha message: Enjoy::Faq.configuration.captcha_error_message
+        end
 
         validates_email_format_of :author_email
         if Enjoy::Faq.config.author_name_required
@@ -31,8 +36,8 @@ module Enjoy::Faq
         "#{self.author_name_output}: \"#{self.question_text_output}\""
       end
 
-      def question_category_class
-        Enjoy::Faq::QuestionCategory
+      def category_class
+        Enjoy::Faq::Category
       end
 
     end

data/lib/enjoy/faq/routes.rb

@@ -1,33 +1,77 @@
 module ActionDispatch::Routing
   class Mapper
-
     def enjoy_cms_faq_routes(config = {})
       routes_config = {
         use_questions_path: true,
-        use_question_categories_path: true,
-        use_faq_path: true
+        use_categories_path: true,
+        use_faq_path: true,
+        faq_path: 'faq',
+        classes: {
+          questions: :questions,
+          categories: :categories,
+          faq_controller: :categories
+        },
+        paths: {
+          questions: :questions,
+          categories: :categories
+        },
+        pagination: {
+          questions: true,
+          categories: true,
+          category_questions: true
+        },
+        actions: {
+          questions: [:show, :create],
+          categories: [:show],
+        }
       }
-      routes_config.merge!(config)
+      routes_config.deep_merge!(config)
+
+      generate_enjoy_faq_user_routes(routes_config)
+      generate_enjoy_faq_cms_routes(routes_config)
+    end
+
+
+    private
+    def generate_enjoy_faq_user_routes(routes_config)
+      if !routes_config[:use_questions_path] and !routes_config[:classes][:questions].nil?
+        resources routes_config[:classes][:questions].to_sym, only: routes_config[:actions][:questions], path: routes_config[:paths][:questions] do
+          get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:questions]
+        end
+      end
 
+      if !routes_config[:use_categories_path] and !routes_config[:classes][:categories].nil?
+        resources routes_config[:classes][:categories].to_sym, only: routes_config[:actions][:categories], path: routes_config[:paths][:categories] do
+          get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:categories]
+          get 'questions(/page/:page)', action: :questions, on: :member, as: :questions if routes_config[:pagination][:category_questions]
+        end
+      end
+
+      if !routes_config[:use_faq_path] and !routes_config[:classes][:faq_controller].nil?
+        get "#{routes_config[:faq_path]}" => "#{routes_config[:classes][:faq_controller]}#index"
+      end
+    end
+
+    def generate_enjoy_faq_cms_routes(routes_config)
       scope module: 'enjoy' do
         scope module: 'faq' do
-          if routes_config[:use_questions_path]
-            resources :questions, only: [:show, :new, :create], as: :enjoy_faq_questions do
-              get '(/page/:page)', action: :index, on: :collection, as: ""
+          if routes_config[:use_questions_path] and !routes_config[:classes][:questions].nil?
+            resources routes_config[:classes][:questions].to_sym, only: routes_config[:actions][:questions], path: routes_config[:paths][:questions], as: :enjoy_faq_questions do
+              get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:questions]
             end
           end
 
-          if routes_config[:use_question_categories_path]
-            resources :question_categories, only: [:index, :show], as: :enjoy_faq_question_categories do
-              get 'questions(/page/:page)', action: :questions, on: :member, as: :questions
+          if routes_config[:use_categories_path] and !routes_config[:classes][:categories].nil?
+            resources routes_config[:classes][:categories].to_sym, only: routes_config[:actions][:categories], path: routes_config[:paths][:categories], as: :enjoy_catalog_categories do
+              get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:categories]
+              get 'questions(/page/:page)', action: :items, on: :member, as: :questions if routes_config[:pagination][:category_questions]
             end
           end
-          if routes_config[:use_faq_path]
-            get 'faq' => 'question_categories#index', as: :enjoy_faq
+          if routes_config[:use_faq_path] and !routes_config[:classes][:faq_controller].nil?
+            get "#{routes_config[:faq_path]}" => "#{routes_config[:classes][:faq_controller]}#index", as: :enjoy_faq
           end
         end
       end
-
     end
 
   end

data/lib/enjoy/faq/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Faq
-    VERSION = "0.3.5"
+    VERSION = "0.4.0.beta3"
   end
 end

data/lib/enjoy_cms_faq.rb

@@ -2,11 +2,6 @@ require "enjoy/faq/version"
 
 require 'enjoy/faq/routes'
 
-require 'enjoy_cms'
-
-require 'rails_admin_sort_embedded'
-require 'rails_admin_jcrop'
-
 require 'enjoy/faq/configuration'
 require 'enjoy/faq/engine'
 
@@ -23,7 +18,7 @@ module Enjoy
         Enjoy::Faq.orm == :active_record
       end
       def model_namespace
-        "Enjoy::Faq::Models::#{Enjoy::Catalog.orm.to_s.camelize}"
+        "Enjoy::Faq::Models::#{Enjoy::Faq.orm.to_s.camelize}"
       end
       def orm_specific(name)
         "#{model_namespace}::#{name}".constantize
@@ -33,22 +28,22 @@ module Enjoy
     autoload :Admin,  'enjoy/faq/admin'
     module Admin
       autoload :Question,               'enjoy/faq/admin/question'
-      autoload :QuestionCategory,       'enjoy/faq/admin/question_category'
+      autoload :Category,               'enjoy/faq/admin/category'
     end
 
     module Models
       autoload :Question,               'enjoy/faq/models/question'
-      autoload :QuestionCategory,       'enjoy/faq/models/question_category'
+      autoload :Category,               'enjoy/faq/models/category'
 
       module Mongoid
         autoload :Question,               'enjoy/faq/models/mongoid/question'
-        autoload :QuestionCategory,       'enjoy/faq/models/mongoid/question_category'
+        autoload :Category,               'enjoy/faq/models/mongoid/category'
       end
     end
 
     module Controllers
       autoload :Questions,                'enjoy/faq/controllers/questions'
-      autoload :QuestionCategories,       'enjoy/faq/controllers/question_categories'
+      autoload :Categories,               'enjoy/faq/controllers/categories'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_faq
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0.beta3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0.beta3
 description: FAQ system with EnjoyCMS support.
 email:
 - dev@enjoycreate.ru
@@ -60,24 +60,29 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/concerns/enjoy/catalog/decorators/question_categories.rb
-- app/controllers/concerns/enjoy/catalog/decorators/questions.rb
-- app/controllers/concerns/enjoy/faq/decorators/question_categories.rb
+- app/assets/javascripts/enjoy/faq.coffee
+- app/assets/javascripts/enjoy/faq/form.coffee
+- app/assets/javascripts/enjoy/faq/init.coffee
+- app/assets/stylesheets/enjoy/faq.sass
+- app/controllers/concerns/enjoy/faq/decorators/categories.rb
 - app/controllers/concerns/enjoy/faq/decorators/questions.rb
-- app/controllers/enjoy/faq/question_categories_controller.rb
+- app/controllers/enjoy/faq/categories_controller.rb
 - app/controllers/enjoy/faq/questions_controller.rb
+- app/models/concerns/enjoy/faq/decorators/category.rb
 - app/models/concerns/enjoy/faq/decorators/question.rb
-- app/models/concerns/enjoy/faq/decorators/question_category.rb
+- app/models/enjoy/faq/category.rb
 - app/models/enjoy/faq/question.rb
-- app/models/enjoy/faq/question_category.rb
-- app/views/enjoy/faq/question_categories/index.html.slim
-- app/views/enjoy/faq/question_categories/show.html.slim
-- app/views/enjoy/faq/questions/_new_question_form.html.slim
+- app/views/enjoy/faq/categories/index.html.slim
+- app/views/enjoy/faq/categories/show.html.slim
+- app/views/enjoy/faq/questions/_form.html.slim
+- app/views/enjoy/faq/questions/_form_with_wrapper.html.slim
 - app/views/enjoy/faq/questions/_question_block.html.slim
 - app/views/enjoy/faq/questions/create.html.slim
 - app/views/enjoy/faq/questions/index.html.slim
@@ -86,18 +91,19 @@ files:
 - bin/console
 - bin/setup
 - config/initializers/rails_admin.rb
+- config/locales/enjoy.faq.ru.yml
 - enjoy_cms_faq.gemspec
 - lib/enjoy/faq/admin.rb
+- lib/enjoy/faq/admin/category.rb
 - lib/enjoy/faq/admin/question.rb
-- lib/enjoy/faq/admin/question_category.rb
 - lib/enjoy/faq/configuration.rb
-- lib/enjoy/faq/controllers/question_categories.rb
+- lib/enjoy/faq/controllers/categories.rb
 - lib/enjoy/faq/controllers/questions.rb
 - lib/enjoy/faq/engine.rb
+- lib/enjoy/faq/models/category.rb
+- lib/enjoy/faq/models/mongoid/category.rb
 - lib/enjoy/faq/models/mongoid/question.rb
-- lib/enjoy/faq/models/mongoid/question_category.rb
 - lib/enjoy/faq/models/question.rb
-- lib/enjoy/faq/models/question_category.rb
 - lib/enjoy/faq/routes.rb
 - lib/enjoy/faq/version.rb
 - lib/enjoy_cms_faq.rb
@@ -117,12 +123,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: FAQ system with EnjoyCMS support.

data/app/controllers/concerns/enjoy/catalog/decorators/question_categories.rb

@@ -1,5 +0,0 @@
-module Enjoy::Faq::Decorators
-  module QuestionCategories
-    extend ActiveSupport::Concern
-  end
-end

data/app/controllers/concerns/enjoy/faq/decorators/question_categories.rb

@@ -1,5 +0,0 @@
-module Enjoy::Faq::Decorators
-  module QuestionCategories
-    extend ActiveSupport::Concern
-  end
-end

data/app/controllers/enjoy/faq/question_categories_controller.rb

@@ -1,7 +0,0 @@
-module Enjoy::Faq
-  class QuestionCategoriesController < ApplicationController
-    include Enjoy::Faq::Controllers::QuestionCategories
-
-    include Enjoy::Faq::Decorators::QuestionCategories
-  end
-end

data/app/models/enjoy/faq/question_category.rb

@@ -1,11 +0,0 @@
-module Enjoy::Faq
-  class QuestionCategory
-    include Enjoy::Faq::Models::QuestionCategory
-
-    include Enjoy::Faq::Decorators::QuestionCategory
-
-    rails_admin(&Enjoy::Faq::Admin::QuestionCategory.config(rails_admin_add_fields) { |config|
-      rails_admin_add_config(config)
-    })
-  end
-end

data/app/views/enjoy/faq/question_categories/index.html.slim

@@ -1,2 +0,0 @@
-- @question_categories.each do |qc|
-  p= link_to qc.name, qc, title: qc.name