hancock_cms 1.0.2.3 → 2.0.0

data/lib/generators/hancock/cms/templates/Gemfile.erb

@@ -8,7 +8,7 @@ gem 'sass-rails'
 gem 'compass-rails'
 gem 'compass'
 
-#{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}
+#{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, path: '/home/ack/www/hancock_cms' #'~> 0.3.7'
 
 gem 'devise'
 
@@ -20,6 +20,9 @@ gem 'cancancan'
 gem 'unicorn'
 gem 'x-real-ip'
 
+#temp
+#gem 'sentry-raven'
+
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'

data/lib/generators/hancock/cms/templates/ability.erb

@@ -14,7 +14,7 @@ class Ability
 
       can :index, :all
       can :read, :all
-      can :history, :all if Hancock.config.history_tracking
+      can :history, :all
       can :export, :all
       can :toggle, :all
 

data/lib/generators/hancock/cms/templates/admin.erb

@@ -1,12 +1,7 @@
 require 'rails_admin/custom_show_in_app'
 
-require_relative 'hancock_cms'
-# Add `require_relative '%hancock_plugin_name%'` here for configure it.
-# `require_relative 'hancock_cms'` reconfigure it by default.
-# So u need do it again. If u have some changes.
-
 <% if Hancock.mongoid? %>
-RailsAdminSettings.track_history! if Hancock.config.history_tracking
+RailsAdminSettings.track_history!
 <% end %>
 
 RailsAdmin.config do |config|
@@ -16,6 +11,8 @@ RailsAdmin.config do |config|
     #warden.authenticate! scope: :user
   #end
 
+  config.parent_controller = '::ApplicationController'
+
   config.current_user_method(&:current_user)
 
   ## == Cancan ==
@@ -42,10 +39,8 @@ RailsAdmin.config do |config|
     edit
     delete
 
-    if Hancock.config.history_tracking
-      history_index
-      history_show
-    end
+    history_index
+    history_show
 
     toggle
     # toggle_menu # for Hancock::Pages
@@ -59,11 +54,10 @@ RailsAdmin.config do |config|
   config.excluded_models ||= []
   config.excluded_models << [
       'RailsAdmin::CustomShowInApp', 'HistoryTracker',
-      'Ckeditor::Asset', 'Ckeditor::AttachmentFile', 'Ckeditor::Picture', 'Ckeditor::Folder',
+      'Ckeditor::Asset', 'Ckeditor::AttachmentFile', 'Ckeditor::Picture',
       'Hancock::EmbeddedElement'
   ]
   config.excluded_models.flatten!
-  config.excluded_models.uniq!
 end
 
 # [required] fix for timezones to be displayed in local time instead of UTC

data/lib/generators/hancock/cms/templates/assets/javascripts/application.coffee.erb

@@ -1,5 +1,5 @@
 #= require hancock/cms
 
-#= require hancock/app/back_to_top
+#= require_tree hancock/app
 
 # require_tree ./app

data/lib/generators/hancock/cms/templates/hancock_cms.erb

@@ -20,13 +20,11 @@ Hancock.configure do |config|
   #   actions: :manage
   # }
   #
-  # config.recaptcha_support = !!defined?(Recaptcha)
-  # config.simple_captcha_support = !!defined?(SimpleCaptcha)
+  # config.recaptcha_support = defined?(Recaptcha)
+  # config.simple_captcha_support = defined?(SimpleCaptcha)
   #
   # config.admin_enter_captcha = config.recaptcha_support or config.simple_captcha_support
   # config.registration_captcha = config.admin_enter_captcha
   #
   # config.captcha_on_development = false
-  #
-  # config.history_tracking = true
 end

data/lib/generators/hancock/cms/templates/model.erb

@@ -1,19 +1,19 @@
 class <%= camelcased_class_name %>
   include Hancock::Model
   # include Hancock::Enableable
+  # include Hancock::Cacheable
   # include ManualSlug
 
-  # include Hancock::Cache::Cacheable
-  # def self.default_cache_keys
-  #   []
-  # end
-
   # acts_as_nested_set
   # scope :sorted, -> { order_by([:lft, :asc]) }
 
   field :name
   # manual_slug :name
 
+  # def self.default_cache_keys
+  #   []
+  # end
+
   ############# rails_admin ##############
   #
   # def self.admin_can_user_defined_actions
@@ -36,6 +36,7 @@ class <%= camelcased_class_name %>
     # field :enabled, :toggle
     field :name
     # group :url, &Hancock::Admin.url_block
+    # group :cache, &Hancock::Admin.caching_block
   end
 
 end

data/lib/generators/hancock/cms/templates/robots.txt.erb

@@ -1,9 +1,5 @@
-Host: http://<%= app_name.downcase %>.ru
+Host: <%= app_name.downcase %>.ru
 User-Agent: *
 Allow: /
 Disallow: /admin
-# Disallow: /account
-Disallow: /ckeditor/*
-# Disallow: /goto
-# Disallow: /users
 Sitemap: http://<%= app_name.downcase %>.ru/sitemap.xml.gz

data/lib/generators/hancock/cms/templates/scripts/db_dump.sh.erb

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-mongodump --db <%= app_name.underscore %>
+mongodump --db <%= app_name.downcase %>

data/lib/generators/hancock/cms/templates/scripts/server.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 PORT=3000
-echo 'server will be started at '$PORT
+echo 'server will by started at '$PORT
 rails s -b 0.0.0.0 -p $PORT -e development

data/lib/generators/hancock/cms/templates/scripts/server_alt.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 PORT=4000
-echo 'server will be started at '$PORT
+echo 'server will by started at '$PORT
 rails s -b 0.0.0.0 -p $PORT -e development

data/lib/generators/hancock/cms/unicorn_god_generator.rb

@@ -11,6 +11,5 @@ module Hancock::Cms
       template 'unicorn.erb',     "config/unicorn.rb"
       template 'unicorn.god.erb', "config/unicorn.god"
     end
-    
   end
 end

data/lib/generators/hancock/cms/utils.rb

@@ -4,7 +4,6 @@ module Hancock::Cms
   module Generators
     module Utils
       module InstanceMethods
-
         def display(output, color = :green)
           say("           -  #{output}", color)
         end
@@ -16,7 +15,6 @@ module Hancock::Cms
             ask("           ?  #{wording} Press <enter> for [#{default_value}] >", :yellow).presence || default_value
           end
         end
-        
       end
     end
   end

data/lib/hancock/admin/embedded_element.rb

@@ -1,25 +1,18 @@
 module Hancock
   module Admin
     module EmbeddedElement
-
       def self.config(nav_label = nil, fields = {})
         if nav_label.is_a?(Hash)
-          nav_label, fields = nav_label[:nav_label], nav_label
-        elsif nav_label.is_a?(Array)
           nav_label, fields = nil, nav_label
         end
-        fields ||= {}
-        field_names = [:enabled, :name]
-        field_showings = Hancock::Admin.get_field_showings(fields, field_names)
-
         Proc.new {
           navigation_label(nav_label || I18n.t('hancock.cms'))
           field :enabled, :toggle do
             searchable false
-          end if field_showings[:enabled]
+          end
           field :name, :string do
             searchable true
-          end if field_showings[:name]
+          end
 
           Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 
@@ -28,7 +21,6 @@ module Hancock
           end
         }
       end
-
     end
   end
 end

data/lib/hancock/admin.rb

@@ -1,67 +1,18 @@
 module Hancock
   module Admin
-    def self.map_config(is_active = false, options = {})
-      if is_active.is_a?(Hash)
-        is_active, options = (is_active[:active] || false), is_active
-      end
-      fields = (options[:fields] ||= {})
-      field_names = [:slugs, :text_slug]
-      field_showings = get_field_showings(fields, field_names)
-
+    def self.map_config(is_active = false)
       Proc.new {
         active is_active
-        label options[:label] || I18n.t('hancock.map')
-
-        field :address, :string do
-          searchable true
-        end if field_showings[:address]
-
-        field :map_address, :string do
-          searchable true
-        end if field_showings[:map_address]
-
-        field :map_hint, :string do
-          searchable true
-        end if field_showings[:map_hint]
-
+        label I18n.t('hancock.map')
+        field :address, :string
+        field :map_address, :string
+        field :map_hint, :string
         field :coordinates, :string do
-          searchable true
           read_only true
           formatted_value{ bindings[:object].coordinates.to_json }
-        end if field_showings[:coordinates]
-
-        field :lat do
-          searchable true
-        end if field_showings[:lat]
-
-        field :lon do
-          searchable true
-        end if field_showings[:lon]
-
-
-        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields])
-
-        if block_given?
-          yield self
         end
-      }
-    end
-
-    def self.url_block(is_active = false, options = {})
-      if is_active.is_a?(Hash)
-        is_active, options = (is_active[:active] || false), is_active
-      end
-      fields = (options[:fields] ||= {})
-      field_names = [:slugs, :text_slug]
-      field_showings = get_field_showings(fields, field_names)
-
-      Proc.new {
-        active is_active
-        label options[:label] || I18n.t('hancock.url')
-        field :slugs, :hancock_slugs  if field_showings[:slugs]
-        field :text_slug              if field_showings[:text_slug]
-
-        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields])
+        field :lat
+        field :lon
 
         if block_given?
           yield self
@@ -69,21 +20,12 @@ module Hancock
       }
     end
 
-    def self.content_block(is_active = false, options = {})
-      if is_active.is_a?(Hash)
-        is_active, options = (is_active[:active] || false), is_active
-      end
-      fields = (options[:fields] ||= {})
-      field_names = [:excerpt, :content]
-      field_showings = get_field_showings(fields, field_names)
-
+    def self.caching_block(is_active = false)
       Proc.new {
         active is_active
-        label options[:label] || I18n.t('hancock.content')
-        field :excerpt, :hancock_html  if field_showings[:excerpt]
-        field :content, :hancock_html  if field_showings[:content]
-
-        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields] || {})
+        label I18n.t('hancock.cache')
+        field :perform_caching, :toggle
+        field :cache_keys_str, :text
 
         if block_given?
           yield self
@@ -91,81 +33,28 @@ module Hancock
       }
     end
 
-    def self.categories_block(is_active = false, options = {})
-      if is_active.is_a?(Hash)
-        is_active, options = (is_active[:active] || false), is_active
-      end
-      fields = (options[:fields] ||= {})
-      field_names = [:main_category, :categories]
-      field_showings = get_field_showings(fields, field_names)
-
+    def self.url_block(is_active = false)
       Proc.new {
         active is_active
-        label options[:label] || I18n.t('hancock.categories')
-
-        field :main_category do
-          inline_add false
-          inline_edit false
-        end if field_showings[:main_category]
-        field :categories, :hancock_multiselect if field_showings[:categories]
-
-        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields] || {})
-
-        if block_given?
-          yield self
-        end
+        label I18n.t('hancock.url')
+        field :slugs, :hancock_slugs
+        field :text_slug
       }
     end
 
-
-    def self.insertions_block(is_active = false, options = {})
+    def self.content_block(is_active = false, options = {})
       if is_active.is_a?(Hash)
-        is_active, options = (is_active[:active] || false), is_active
+        is_active, fields = (is_active[:active] || false), is_active
       end
-      fields = (options[:fields] ||= {})
-      field_names = [:possible_insertions]
-      field_showings = get_field_showings(fields, field_names)
 
+      _excluded_fields = options.delete(:excluded_fields) || []
       Proc.new {
         active is_active
-        label options[:label] || I18n.t('hancock.insertions')
-        field :possible_insertions do
-          read_only true
-          pretty_value do
-            ("<dl class='possible_insertions_list'>" + bindings[:object].possible_insertions.map do |_ins|
-              "<dt>#{_ins}</dt><dd>#{bindings[:object].send(_ins)}</dd>"
-            end.join + "</dl>").html_safe
-          end
-        end if field_showings[:possible_insertions]
-
-        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields] || {})
-
-        if block_given?
-          yield self
-        end
-
-        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields] || {})
-
-        if block_given?
-          yield self
-        end
+        label I18n.t('hancock.content')
+        field :excerpt, :hancock_html unless _excluded_fields.include?(:excerpt)
+        field :content, :hancock_html unless _excluded_fields.include?(:content)
       }
     end
 
-    def self.get_field_showings(fields, field_names)
-      field_showings = field_names.map { |f| {f => true } }.inject(&:merge) || {}
-      if fields.is_a?(Hash)
-        field_names.each do |f|
-          field_showings[f] = (fields[f] != false)
-        end
-      elsif fields.is_a?(Array)
-        _fields = fields.map { |f| f[:fields] }.inject(&:merge) || {}
-        field_names.each do |f|
-          field_showings[f] = (_fields[f] != false)
-        end
-      end
-      field_showings
-    end
-
   end
 end

data/lib/hancock/configuration.rb

@@ -27,8 +27,6 @@ module Hancock
 
     attr_accessor :captcha_on_development
 
-    attr_accessor :history_tracking
-
     def initialize
       @main_index_layout = 'application'
       @error_layout = 'application'
@@ -38,15 +36,13 @@ module Hancock
       @ability_manager_config = []
       @ability_admin_config = []
 
-      @recaptcha_support = !!defined?(Recaptcha)
-      @simple_captcha_support = !!defined?(SimpleCaptcha)
+      @recaptcha_support = defined?(Recaptcha)
+      @simple_captcha_support = defined?(SimpleCaptcha)
 
       @admin_enter_captcha = @recaptcha_support or @simple_captcha_support
       @registration_captcha = @admin_enter_captcha
 
       @captcha_on_development = false
-
-      @history_tracking = true
     end
   end
 end

data/lib/hancock/controller.rb

@@ -2,7 +2,7 @@ module Hancock::Controller
   extend ActiveSupport::Concern
   included do
     include Hancock::Errors
-    include Hancock::Fancybox
+    # include Hancock::Fancybox
     if defined?(Hancock::Pages)
       include Hancock::Pages::SeoPages
       include Hancock::Pages::NavMenu
@@ -27,13 +27,4 @@ module Hancock::Controller
   def hide_ym_ga
     false
   end
-
-  # HARD Rails5 compatibility
-  def redirect_back(fallback_location:, **args)
-    if referer = request.headers["Referer"]
-      redirect_to referer, **args
-    else
-      redirect_to fallback_location, **args
-    end
-  end
 end

data/lib/hancock/engine.rb

@@ -1,48 +1,48 @@
 module Hancock
-  class Engine < ::Rails::Engine
-    # isolate_namespace Hancock
+    class Engine < ::Rails::Engine
+      # isolate_namespace Hancock
 
     # rake_tasks do
     #   require File.expand_path('../tasks', __FILE__)
     # end
 
-
-    initializer "RailsAdminSettingsPatch (CMS)" do
-      ::RailsAdminSettings::Setting.send(:include, Hancock::RailsAdminSettingsPatch)
+    initializer "hancock_cms.email_defaults" do
+      # Write default email settings to DB so they can be changed.
+
+      #temp
+      # 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
-
-
-    config.to_prepare do
-      require 'rails_admin/hancock/form_builder'
-
-      ::RailsAdmin::MainController.send(:include, ::RailsAdmin::Application::HancockHelper)
-      ::RailsAdmin::MainController.send(:include, ::RailsAdmin::Main::HancockHelper)
-      # ::RailsAdmin::ApplicationHelper.send(:include, ::RailsAdmin::Hancock::FormBuilder)
-
-      ::RailsAdmin::ApplicationController.send(:helper, ::RailsAdmin::Application::HancockHelper)
-      ::RailsAdmin::ApplicationController.send(:helper, ::RailsAdmin::Main::HancockHelper)
+    initializer 'hancock_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
     end
 
     config.after_initialize do
-
-      begin
-        if Settings and Settings.table_exists?
-          if Settings.file_uploads_supported
-            if !RailsAdminSettings::Setting.ns("main").where(key: "logo_image").exists?
-              Settings.logo_image(kind: :image)
-            end
-          end
-        end
-      rescue
-      end
-
-      # clear empty history for prevent admin panel crashs
-      begin
-        ::Hancock.clear_history_from_empty_objects
-      rescue
+      # trigger autoload so models are registered in Mongoid::Elasticearch
+      # Hancock.config.search_models.map(&:constantize)
+
+      # Write default email settings to DB so they can be changed.
+      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: 'с сайта')
+        #
+        Settings.logo_image(kind: :image)
       end
-
     end
-
   end
 end

data/lib/hancock/model.rb

@@ -4,12 +4,6 @@ module Hancock
     included do
       Hancock.register_model(self)
 
-      def self.inherited(base)
-        super
-        Hancock.register_model(base)
-        Hancock.register_model(self)
-      end
-
       if Hancock.mongoid?
         include Mongoid::Document
         include Mongoid::Timestamps::Short
@@ -17,22 +11,6 @@ module Hancock
         if Hancock.config.localize
           include Hancock::ModelLocalizeable
         end
-
-        _collection_name = collection_name.to_s
-        if _collection_name =~ /^hancock_/
-          enjoy_collection_name = _collection_name.sub(/^hancock_/, 'enjoy_')
-          if Mongoid.client('default').collections.map(&:name).include?(enjoy_collection_name)
-            modules = []
-            self.name.sub("Hancock", "Enjoy").split("::").each do |mod|
-              modules << mod
-              eval("::#{modules.join("::")} ||= #{modules.join("::").sub("Enjoy", "Hancock")}")
-            end
-            store_in collection: enjoy_collection_name
-          end
-        end
-
-        def self.goto_hancock
-        end
       end
 
       include ActiveModel::ForbiddenAttributesProtection
@@ -44,13 +22,11 @@ module Hancock
         include RailsAdminComments::ModelCommentable
       end
 
-      if Hancock.config.history_tracking
-        if Hancock.mongoid?
-          if defined?(TrackablePatch)
-            include TrackablePatch
-          elsif defined?(Trackable)
-            include Trackable
-          end
+      if Hancock.mongoid?
+        if defined?(TrackablePatch)
+          include TrackablePatch
+        elsif defined?(Trackable)
+          include Trackable
         end
       end
 

data/lib/hancock/models/embedded_element.rb

@@ -2,13 +2,11 @@ module Hancock
   module Models
     module EmbeddedElement
       extend ActiveSupport::Concern
-
       include Hancock::Model
       include Hancock::Enableable
       include Hancock::Sortable
 
       include Hancock.orm_specific('EmbeddedElement')
-      
     end
   end
 end

data/lib/hancock/models/mongoid/embedded_element.rb

@@ -4,29 +4,10 @@ module Hancock
       module EmbeddedElement
         extend ActiveSupport::Concern
 
-        include Hancock::EmbeddedFindable
-
         included do
           field :name, type: String, localize: Hancock.configuration.localize, default: ""
-
-          # stolen from https://github.com/mongoid/mongoid-history/blob/master/lib/mongoid/history/trackable.rb#L171
-          def embed_method_for_parent
-            ret = nil
-            if self._parent
-              ret = self._parent.relations.values.find do |relation|
-                if ::Mongoid::Compatibility::Version.mongoid3?
-                  relation.class_name == self.metadata.class_name.to_s && relation.name == self.metadata.name
-                else
-                  relation.class_name == self.relation_metadata.class_name.to_s &&
-                  relation.name == self.relation_metadata.name
-                end
-              end
-            end
-            ret and ret.name
-          end
-
         end
-
+        
       end
     end
   end

data/lib/hancock/plugin_configuration.rb

@@ -5,7 +5,7 @@ module Hancock::PluginConfiguration
       @configuration ||= config_class.new if config_class
     end
     def config
-      configuration
+      @configuration ||= config_class.new if config_class
     end
 
     def configure