enjoy_cms 0.3.7.4 → 0.4.0.beta3

data/enjoy_cms.gemspec

@@ -20,36 +20,23 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rails', '4.2.4' #'~> 5.0.0.beta3'
+  spec.add_dependency 'rails', '4.2.6' #'~> 5.0.0.rc1'
 
   spec.add_dependency 'jquery-rails'
   spec.add_dependency 'simple_form'
-  spec.add_dependency 'glebtv-simple_captcha'
+  # spec.add_dependency 'glebtv-simple_captcha'
+  # spec.add_dependency 'galetahub-simple_captcha'
   spec.add_dependency 'coffee-rails'
   spec.add_dependency 'devise'
-  spec.add_dependency 'turbolinks'
-  spec.add_dependency 'validates_email_format_of'
+
+  spec.add_dependency 'ckeditor'
+  spec.add_dependency 'geocoder'
+
   spec.add_dependency 'rails_admin', '~> 0.8.1'
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
 
-  spec.add_dependency 'ckeditor'
   spec.add_dependency 'rails_admin_settings'
 
-  spec.add_dependency 'geocoder'
-  spec.add_dependency 'simple-navigation'
-  spec.add_dependency 'sitemap_generator'
   spec.add_dependency 'kaminari'
-  spec.add_dependency 'addressable'
-
-  spec.add_dependency 'x-real-ip'
-
-  spec.add_dependency "rails_admin_mongoid_localize_field"
-  spec.add_dependency "ack_rails_admin_jcrop"
-
-  spec.add_dependency 'stringex'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'smart_excerpt'
-
-  spec.add_dependency 'rails_admin_sort_embedded'
 end

data/lib/enjoy/configuration.rb

@@ -11,61 +11,45 @@ module Enjoy
   end
 
   class Configuration
-    attr_accessor :news_image_styles
-    attr_accessor :news_per_page
-    attr_accessor :news_excerpt
-    attr_accessor :news_content_required
-
     attr_accessor :main_index_layout
     attr_accessor :error_layout
     attr_accessor :menu_max_depth
 
-    attr_accessor :search_enabled
-    attr_accessor :search_per_page
-    attr_accessor :search_models
-
-    attr_accessor :contacts_captcha
-    attr_accessor :contacts_fields
-    attr_accessor :contacts_message_required
-    attr_accessor :contacts_captcha_error_message
-
     attr_accessor :localize
 
-    attr_accessor :recreate_contact_message_action
+    attr_accessor :ability_manager_config
+    attr_accessor :ability_admin_config
 
-    def initialize
-      @news_image_styles = {
-          main:  '400x200>',
-          thumb: '200x100>'
-      }
-      @news_per_page = 10
-      @news_excerpt = 12
-      @news_content_required = true
+    attr_accessor :admin_enter_captcha
+    attr_accessor :registration_captcha
+    attr_accessor :recaptcha_support
+    attr_accessor :simple_captcha_support
 
+    def initialize
       @main_index_layout = 'application'
       @error_layout = 'application'
       @menu_max_depth = 2
 
-      @search_enabled = false
-      @search_per_page = 10
-      @search_models = []
-
-      @contacts_captcha = false
-      @contacts_fields = {}
-      @contacts_message_required = true
+      @localize = false
 
-      @contacts_captcha_error_message = "Код проверки введен неверно"
-      @recreate_contact_message_action = "new"
+      @ability_manager_config = []
+      @ability_manager_config << {
+        method: :can,
+        model: RailsAdminSettings::Setting,
+        actions: [:edit, :update]
+      }
+      @ability_admin_config = []
+      @ability_admin_config << {
+        method: :can,
+        model: RailsAdminSettings::Setting,
+        actions: :manage
+      }
 
-      @localize = false
-    end
+      @recaptcha_support = defined?(Recaptcha)
+      @simple_captcha_support = defined?(SimpleCaptcha)
 
-    def search_enabled=(val)
-      @search_enabled = val
-      if @search_enabled
-        @search_models << 'Page'
-        @search_models << 'News'
-      end
+      @admin_enter_captcha = @recaptcha_support or @simple_captcha_support
+      @registration_captcha = @admin_enter_captcha
     end
   end
 end

data/lib/enjoy/controller.rb

@@ -2,10 +2,12 @@ module Enjoy::Controller
   extend ActiveSupport::Concern
   included do
     include Enjoy::Errors
-    include Enjoy::SeoPages
-    include Enjoy::NavMenu
     include Enjoy::Fancybox
-    include Enjoy::Blocksetable
+    if defined?(Enjoy::Pages)
+      include Enjoy::Pages::SeoPages
+      include Enjoy::Pages::NavMenu
+      include Enjoy::Pages::Blocksetable
+    end
     protect_from_forgery with: :exception
     helper_method :page_title
     helper_method :hide_ym_ga

data/lib/enjoy/engine.rb

@@ -1,46 +1,46 @@
 module Enjoy
-  class Engine < ::Rails::Engine
-    # isolate_namespace Enjoy
+    class Engine < ::Rails::Engine
+      # isolate_namespace Enjoy
 
-    rake_tasks do
-      require File.expand_path('../tasks', __FILE__)
-    end
+    # rake_tasks do
+    #   require File.expand_path('../tasks', __FILE__)
+    # end
 
     initializer "enjoy_cms.email_defaults" do
       # Write default email settings to DB so they can be changed.
 
       #temp
-      begin
-        if Settings.table_exists?
-          Settings.default_email_from(default: 'noreply@site.domain')
-          Settings.form_email(default: 'admin@site.domain')
-          Settings.email_topic(default: 'с сайта')
-        end
-      rescue
-      end
+      # begin
+      #   if Settings and Settings.table_exists?
+      #     Settings.default_email_from(default: 'noreply@site.domain')
+      #     Settings.form_email(default: 'admin@site.domain')
+      #     Settings.email_topic(default: 'с сайта')
+      #   end
+      # rescue
+      # end
     end
     initializer 'enjoy_cms.paperclip' do
-      require 'paperclip/style'
-      module ::Paperclip
-        class Style
-          alias_method :processor_options_without_auto_orient, :processor_options
-          def processor_options
-            processor_options_without_auto_orient.merge(auto_orient: false)
-          end
-        end
-      end
+      # require 'paperclip/style'
+      # module ::Paperclip
+      #   class Style
+      #     alias_method :processor_options_without_auto_orient, :processor_options
+      #     def processor_options
+      #       processor_options_without_auto_orient.merge(auto_orient: false)
+      #     end
+      #   end
+      # end
     end
 
     config.after_initialize do
       # trigger autoload so models are registered in Mongoid::Elasticearch
-      Enjoy.config.search_models.map(&:constantize)
+      # Enjoy.config.search_models.map(&:constantize)
 
       # Write default email settings to DB so they can be changed.
-      if Settings.table_exists?
-        Settings.default_email_from(default: 'noreply@site.domain')
-        Settings.form_email(default: 'admin@site.domain')
-        Settings.email_topic(default: 'с сайта')
-      end
+      # if Settings and Settings.table_exists?
+      #   Settings.default_email_from(default: 'noreply@site.domain')
+      #   Settings.form_email(default: 'admin@site.domain')
+      #   Settings.email_topic(default: 'с сайта')
+      # end
     end
   end
 end

data/lib/enjoy/migration.rb

@@ -2,24 +2,6 @@ module Enjoy
   module Migration
     extend self
 
-    def seo_fields(t)
-      if Enjoy.config.localize
-        t.column :h1_translations, 'hstore', default: {}
-        t.column :title_translations, 'hstore', default: {}
-        t.column :keywords_translations, 'hstore', default: {}
-        t.column :description_translations, 'hstore', default: {}
-        t.column :og_title_translations, 'hstore', default: {}
-      else
-        t.string :h1
-        t.string :title
-        t.text :keywords
-        t.text :description
-        t.string :og_title
-      end
-      t.string :robots
-      t.attachment :og_image
-    end
-
     def map_fields(t)
       t.text :address
       t.text :map_address
@@ -31,4 +13,3 @@ module Enjoy
     end
   end
 end
-

data/lib/enjoy/model.rb

@@ -15,8 +15,10 @@ module Enjoy
       include Enjoy::BooleanField
       include Enjoy::SortField
 
-      include SmartExcerpt
-      include SimpleCaptcha::ModelHelpers
+      if Enjoy.mongoid? and defined?(RailsAdminComments)
+        include RailsAdminComments::Commentable
+        include RailsAdminComments::ModelCommentable
+      end
 
       if Enjoy.mongoid? && defined?(Trackable)
         include Trackable
@@ -24,5 +26,6 @@ module Enjoy
 
       include Enjoy::RailsAdminPatch
     end
+
   end
 end

data/lib/enjoy/rails_admin_ext/config.rb

@@ -0,0 +1,112 @@
+module Enjoy
+  class << self
+    def rails_admin_configuration
+      @rails_admin_configuration ||= RailsAdminConfiguration.new
+    end
+    def rails_admin_config
+      @rails_admin_configuration ||= RailsAdminConfiguration.new
+    end
+    def rails_admin_configure
+      yield rails_admin_configuration
+    end
+
+    def action_visible_for(action_name, model_name)
+      rails_admin_config.action_visible_for action_name, model_name
+    end
+    def action_unvisible_for(action_name, model_name)
+      rails_admin_config.action_unvisible_for action_name, model_name
+    end
+
+    def rails_admin_config_for_actions(actions)
+      rails_admin_config.actions_config(actions)
+    end
+
+    def cancancan_admin_rules(ability_object)
+      rails_admin_config.cancancan_admin_rules(ability_object)
+    end
+    def cancancan_manager_rules(ability_object)
+      rails_admin_config.cancancan_manager_rules(ability_object)
+    end
+  end
+
+  class RailsAdminConfiguration
+
+    attr_reader :actions_list
+    attr_reader :actions_visibility
+
+    def initialize
+      @actions_list ||= []
+      @actions_visibility ||= {}
+
+      action_unvisible_for(:custom_show_in_app, Proc.new { false })
+    end
+
+    def add_action(action_name)
+      @actions_list << action_name
+      @actions_list.uniq
+    end
+
+    def remove_action(action_name)
+      @remove_action.delete remove_action
+      @actions_list.uniq
+    end
+
+    def action_visible_for(action_name, model_name)
+      action_name = action_name.to_sym
+      model_name = model_name.to_s
+      add_action(action_name) unless @actions_list.include?(action_name)
+
+      if model_name.is_a?(Proc)
+        @actions_visibility[action_name] = model_name
+      else
+        @actions_visibility[action_name] = [] if @actions_visibility[action_name].is_a?(Proc)
+        @actions_visibility[action_name] ||= []
+        @actions_visibility[action_name] << model_name.to_s
+      end
+    end
+
+    def action_unvisible_for(action_name, model_name)
+      action_name = action_name.to_sym
+      model_name = model_name.to_s
+      add_action(action_name) unless @actions_list.include?(action_name)
+
+      if model_name.is_a?(Proc)
+        # @actions_visibility[action_name] = model_name
+      else
+        @actions_visibility[action_name] = [] if @actions_visibility[action_name].is_a?(Proc)
+        @actions_visibility[action_name] ||= []
+        @actions_visibility[action_name].delete model_name.to_s
+      end
+    end
+
+    def actions_config(rails_admin_actions)
+      @actions_list.each do |action|
+        rails_admin_actions.send(action) do
+          visible do
+            if Enjoy.rails_admin_config.actions_visibility[action].is_a?(Proc)
+              Enjoy.rails_admin_config.actions_visibility[action]
+            else
+              Enjoy.rails_admin_config.actions_visibility[action].include? bindings[:abstract_model].model_name
+            end
+          end
+        end
+      end
+    end
+
+    def cancancan_admin_rules(ability_object)
+      Enjoy.config.ability_admin_config.each do |config|
+        _model = config[:model]
+        _model = _model.constantize if _model.is_a?(String)
+        ability_object.send(config[:method], config[:actions], _model)
+      end
+    end
+    def cancancan_manager_rules(ability_object)
+      Enjoy.config.ability_manager_config.each do |config|
+        _model = config[:model]
+        _model = _model.constantize if _model.is_a?(String)
+        ability_object.send(config[:method], config[:actions], _model)
+      end
+    end
+
+  end
+end

data/lib/enjoy/rails_admin_ext/enjoy_hash.rb

@@ -54,8 +54,6 @@ module RailsAdmin
 
           register_instance_option :formatted_value do
             if localized?
-              puts bindings[:object].send((hash_method.to_s + '_translations').to_sym)
-              puts '__'
               _val = bindings[:object].send((hash_method.to_s + '_translations').to_sym)
               _val.each_pair { |l, _hash|
                 begin

data/lib/enjoy/rails_admin_ext/enjoy_slugs.rb

@@ -0,0 +1,31 @@
+require 'rails_admin/config/fields/types/enum'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class EnjoySlugs < RailsAdmin::Config::Fields::Types::Enum
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          register_instance_option :enum_method do
+            :slugs
+          end
+
+          register_instance_option :visible do
+            bindings[:view].current_user.admin?
+          end
+
+          register_instance_option :multiple do
+            true
+          end
+
+          register_instance_option :pretty_value do
+            value.join("<br>").html_safe if value
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/rails_admin_ext/group_patch.rb

@@ -8,7 +8,7 @@ module Enjoy::RailsAdminGroupPatch
           config.group _group[:name] do
             active (_group[:active] || false)
             _group[:fields].each_pair do |name, type|
-              if type.nil?
+              if type.blank?
                 field name
               else
                 if type.is_a?(Array)
@@ -20,6 +20,7 @@ module Enjoy::RailsAdminGroupPatch
             end
           end
         end
+
       else
         fields.each_pair do |name, type|
           if type.nil?

data/lib/enjoy/rails_admin_settings_patch.rb

@@ -0,0 +1,7 @@
+module RailsAdminSettings
+  module_eval <<-EVAL
+    def self.kinds
+      #{RailsAdminSettings.kinds.to_a.to_s} + ['js', 'css']
+    end
+  EVAL
+end

data/lib/enjoy/routes.rb

@@ -3,40 +3,15 @@ module ActionDispatch::Routing
 
     def enjoy_cms_routes(config = {})
       routes_config = {
-        use_contacts_path: true,
-        use_search_path: true,
-        use_news_path: true,
-        root_path: "home#index",
-        use_slug_path: true,
-        use_pages_path: true
+        root_path: "home#index"
       }
       routes_config.merge!(config)
 
       scope module: 'enjoy' do
-        if routes_config[:use_contacts_path]
-          get 'contacts' => 'contacts#new', as: :enjoy_contacts
-          post 'contacts' => 'contacts#create', as: :create_enjoy_contacts
-          get 'contacts/sent' => 'contacts#sent', as: :enjoy_contacts_sent
-        end
-
-        if routes_config[:use_search_path]
-          get 'search' => 'search#index', as: :enjoy_search
-        end
-
-        if routes_config[:use_news_path]
-          resources :news, only: [:index, :show], as: :enjoy_news
-        end
 
         if routes_config[:root_path]
           root to: routes_config[:root_path]
         end
-
-        if routes_config[:use_slug_path]
-          get '*slug' => 'pages#show'
-        end
-        if routes_config[:use_pages_path]
-          resources :pages, only: [:show], as: :enjoy_pages
-        end
       end
 
     end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.7.4"
+  VERSION = "0.4.0.beta3"
 end

data/lib/enjoy_cms.rb

@@ -4,6 +4,7 @@ unless defined?(Enjoy) && Enjoy.respond_to?(:orm) && [:active_record, :mongoid].
 end
 
 require 'enjoy/version'
+require 'enjoy/configuration'
 require 'devise'
 require 'enjoy/routes'
 
@@ -12,37 +13,32 @@ require 'enjoy/simple_form_patch'
 
 require 'geocoder'
 
-require 'glebtv-simple_captcha'
-require 'validates_email_format_of'
-require 'smart_excerpt'
+# require 'simple_captcha'
+# require 'validates_email_format_of'
 require 'filename_to_slug'
 
 require 'rails_admin'
+require 'enjoy/rails_admin_ext/config'
 
-require 'enjoy/rails_admin_ext/enjoy_connectable'
 require 'enjoy/rails_admin_ext/enjoy_hash'
 require 'enjoy/rails_admin_ext/enjoy_html'
+require 'enjoy/rails_admin_ext/enjoy_slugs'
 require 'enjoy/rails_admin_ext/group_patch'
-require 'enjoy/rails_admin_ext/menu'
 
 require 'rails_admin_nested_set'
 require 'rails_admin_toggleable'
+
 require 'rails_admin_settings'
-require 'rails_admin_sort_embedded'
+require 'enjoy/rails_admin_settings_patch'
 
-require 'x-real-ip'
+# require 'x-real-ip'
 
 require 'ckeditor'
 
-require 'sitemap_generator'
-require 'kaminari'
-require 'addressable/uri'
-require 'turbolinks'
-require 'simple-navigation'
-require 'ack_rails_admin_jcrop'
+# require 'kaminari'
+# require 'addressable/uri'
+# require 'turbolinks'
 
-require 'enjoy/configuration'
-require 'enjoy/elastic_search'
 require 'enjoy/model'
 require 'enjoy/engine'
 require 'enjoy/controller'
@@ -62,83 +58,41 @@ module Enjoy
     def orm_specific(name)
       "#{model_namespace}::#{name}".constantize
     end
+
+    def clear_history_from_empty_objects
+      ::HistoryTracker.all.map do |h|
+        begin
+          begin
+            h.delete if h.trackable.nil?
+          rescue
+            h.delete
+          end
+        rescue
+        end
+      end
+    end
+
   end
 
   autoload :Migration, 'enjoy/migration'
 
-  # module Mongoid
-  #   autoload :Paperclip  'enjoy/mongoid/paperlcip'
-  # end
-
   autoload :Admin,  'enjoy/admin'
   module Admin
-    autoload :SitemapData,  'enjoy/admin/sitemap_data'
-    autoload :Seo,  'enjoy/admin/seo'
-    autoload :Menu, 'enjoy/admin/menu'
-    autoload :Page, 'enjoy/admin/page'
-    autoload :News, 'enjoy/admin/news'
-    autoload :ContactMessage, 'enjoy/admin/contact_message'
-
     autoload :EmbeddedElement,      'enjoy/admin/embedded_element'
-
-    autoload :EmbeddedGalleryImage, 'enjoy/admin/embedded_gallery_image'
-    autoload :GalleryImage,         'enjoy/admin/gallery_image'
-    autoload :Gallery,              'enjoy/admin/gallery'
-
-    autoload :PageBlock,            'enjoy/admin/page_block'
-    autoload :PageBlockset,         'enjoy/admin/page_blockset'
   end
 
   module Models
-    autoload :SitemapData,  'enjoy/models/sitemap_data'
-    autoload :Seo,  'enjoy/models/seo'
-    autoload :Menu, 'enjoy/models/menu'
-    autoload :Page, 'enjoy/models/page'
-    autoload :News, 'enjoy/models/news'
-    autoload :ContactMessage, 'enjoy/models/contact_message'
-
     autoload :EmbeddedElement,      'enjoy/models/embedded_element'
 
-    autoload :EmbeddedGalleryImage, 'enjoy/models/embedded_gallery_image'
-    autoload :GalleryImage,         'enjoy/models/gallery_image'
-    autoload :Gallery,              'enjoy/models/gallery'
-
-    autoload :PageBlock,             'enjoy/models/page_block'
-    autoload :PageBlockset,          'enjoy/models/page_blockset'
-
     module Mongoid
-      autoload :SitemapData,  'enjoy/models/mongoid/sitemap_data'
-      autoload :Seo,  'enjoy/models/mongoid/seo'
-      autoload :Menu, 'enjoy/models/mongoid/menu'
-      autoload :Page, 'enjoy/models/mongoid/page'
-      autoload :News, 'enjoy/models/mongoid/news'
-      autoload :ContactMessage, 'enjoy/models/mongoid/contact_message'
-
       autoload :EmbeddedElement,      'enjoy/models/mongoid/embedded_element'
-
-      autoload :EmbeddedGalleryImage, 'enjoy/models/mongoid/embedded_gallery_image'
-      autoload :GalleryImage,         'enjoy/models/mongoid/gallery_image'
-      autoload :Gallery,              'enjoy/models/mongoid/gallery'
-
-      autoload :PageBlock,             'enjoy/models/mongoid/page_block'
-      autoload :PageBlockset,          'enjoy/models/mongoid/page_blockset'
     end
 
     module ActiveRecord
-      autoload :SitemapData,  'enjoy/models/active_record/sitemap_data'
-      autoload :Seo,  'enjoy/models/active_record/seo'
-      autoload :Menu, 'enjoy/models/active_record/menu'
-      autoload :Page, 'enjoy/models/active_record/page'
-      autoload :News, 'enjoy/models/active_record/news'
-      autoload :ContactMessage, 'enjoy/models/active_record/contact_message'
     end
   end
 
   module Controllers
-    autoload :Contacts, 'enjoy/controllers/contacts'
-    autoload :News, 'enjoy/controllers/news'
-    autoload :Pages, 'enjoy/controllers/pages'
-    autoload :Search, 'enjoy/controllers/search'
   end
 end