hancock_cms 1.0.2.3 → 2.0.0

data/app/controllers/concerns/hancock/errors.rb

@@ -1,6 +1,5 @@
 module Hancock::Errors
   extend ActiveSupport::Concern
-
   included do
     if Rails.env.production? || Rails.env.staging? || (respond_to?(:hancock_check_errors) and hancock_check_errors)
       rescue_from Exception, with: :render_500
@@ -26,10 +25,12 @@ module Hancock::Errors
         unless exception.nil?
           Rails.logger.error exception.message
           Rails.logger.error exception.backtrace.join("\n")
-          Raven.capture_exception(exception) if defined?(Raven)
+          capture_exception(exception) if defined?(Raven)
         end
         Rails.logger.error "__________________________"
         if !user_signed_in?
+          #scope = rails_admin? ? main_app : self
+          #redirect_to scope.new_user_session_path, alert: "Необходимо авторизоваться"
           authenticate_user!
         else
           if rails_admin? and can?(:access, :rails_admin)
@@ -42,7 +43,7 @@ module Hancock::Errors
     end
 
     rescue_from ActionController::InvalidAuthenticityToken do |exception|
-      redirect_back(fallback_location: root_path, alert: t('hancock.errors.form_expired'))
+      redirect_to :back, alert: t('hancock.errors.form_expired')
     end
   end
 
@@ -55,7 +56,7 @@ module Hancock::Errors
     unless exception.nil?
       Rails.logger.error exception.message
       Rails.logger.error exception.backtrace.join("\n")
-      Raven.capture_exception(exception) if defined?(Raven)
+      capture_exception(exception) if defined?(Raven)
     end
     Rails.logger.error "__________________________".freeze
     render_error(404)
@@ -74,7 +75,7 @@ module Hancock::Errors
     Rails.logger.error "__________________________".freeze
     begin
       if rails_admin?
-        render plain: t('hancock.errors.internal_error_full', klass: exception.class.name, message: exception.message), status: 500
+        render text: t('hancock.errors.internal_error_full', klass: exception.class.name, message: exception.message), status: 500
         return
       end
     rescue Exception => e
@@ -89,5 +90,5 @@ module Hancock::Errors
   def render_error(code = 500)
     render template: "hancock/errors/error_#{code}", formats: [:html], handlers: [:slim], layout: Hancock.config.error_layout, status: code
   end
-
+  
 end

data/app/controllers/concerns/hancock/no_cache.rb

@@ -0,0 +1,12 @@
+module Hancock::NoCache
+  extend ActiveSupport::Concern
+  included do
+    before_filter :set_cache_buster
+  end
+
+  protected
+  def set_cache_buster
+    expires_now()
+    response.headers["Pragma"] = "no-cache"
+  end
+end

data/app/controllers/hancock/registrations_controller.rb

@@ -1,15 +1,20 @@
 class Hancock::RegistrationsController < Devise::RegistrationsController
   prepend_before_action :check_recaptcha, only: [:create]
 
-  # private :check_recaptcha
+  private
   def check_recaptcha
     if Hancock.config.recaptcha_support and (!Rails.env.development? or Hancock.config.captcha_on_development)
-      unless verify_recaptcha
+      if verify_recaptcha
+        true
+      else
         self.resource = resource_class.new sign_up_params
         self.resource.valid?
         @recaptcha_error = "Вы робот?".freeze
         respond_with_navigational(resource) { render :new }
       end
+
+    else
+      true
     end
   end
 

data/app/controllers/hancock/sessions_controller.rb

@@ -1,17 +1,21 @@
 class Hancock::SessionsController < Devise::SessionsController
   prepend_before_action :check_recaptcha, only: [:create]
-  prepend_before_action :require_no_authentication, :only => [ :new, :create ]
 
-  # private :check_recaptcha
+  private
   def check_recaptcha
     if Hancock.config.recaptcha_support and (!Rails.env.development? or Hancock.config.captcha_on_development)
-      unless verify_recaptcha
+      if verify_recaptcha
+        true
+      else
         self.resource = resource_class.new sign_in_params
         resource.errors.add(:email, "Неверный e-mail или пароль".freeze)
         resource.errors.add(:password, "Неверный e-mail или пароль".freeze)
         @recaptcha_error = "Вы робот?".freeze
         respond_with_navigational(resource) { render :new }
       end
+
+    else
+      true
     end
   end
 

data/app/helpers/hancock/powered_helper.rb

@@ -15,7 +15,7 @@ module Hancock::PoweredHelper
   #         "hancock-goto-disabled": true
   #       }
   #     }
-  #     ret << link_to("Hancock CMS", "https://hancock.redrocks.pro/", _attrs)
+  #     ret << link_to("Hancock CMS", "http://hancock.redrocks.pro/", _attrs)
   #     ret.join.html_safe
   #   end
   # end
@@ -29,12 +29,12 @@ module Hancock::PoweredHelper
       _attrs = {
         class: "created_by",
         target: "_blank",
-        title: "Redrocks Creative studio",
+        title: "Hancock Creative studio",
         data: {
           "hancock-goto-disabled": true
         }
       }.freeze
-      ret << link_to("Redrocks studio".freeze, "https://redrocks.pro/".freeze, _attrs)
+      ret << link_to("Redrocks studio".freeze, "http://redrocks.pro/".freeze, _attrs)
       ret.join.html_safe
     end
   end

data/app/models/concerns/hancock/boolean_field.rb

@@ -1,13 +1,11 @@
 module Hancock::BooleanField
   extend ActiveSupport::Concern
-
-  class_methods do
-
+  module ClassMethods
     def boolean_field(name, default = true)
       if default.is_a?(Hash)
         default = default[:default]
       end
-
+      
       if Hancock.mongoid?
         field name, type: Mongoid::Boolean, default: default
       end
@@ -18,9 +16,6 @@ module Hancock::BooleanField
       elsif name == 'enabled'
         scope :disabled,  -> { where(enabled: false) }
       end
-      
     end
-
   end
-
 end

data/app/models/concerns/hancock/cacheable.rb

@@ -0,0 +1,33 @@
+if Hancock.mongoid?
+
+  module Hancock::Cacheable
+    extend ActiveSupport::Concern
+
+    included do
+      field :cache_keys_str, type: String, default: -> { default_cache_keys.join("\n") }
+      def self.default_cache_keys
+        []
+      end
+      def default_cache_keys
+        self.class.default_cache_keys
+      end
+      
+      def cache_keys
+        cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
+      end
+      field :perform_caching, type: Boolean, default: true
+
+      after_save :clear_cache
+      after_destroy :clear_cache
+      def clear_cache
+        if perform_caching
+          cache_keys.each do |k|
+            Rails.cache.delete(k)
+          end
+        end
+      end
+
+    end
+  end
+
+end

data/app/models/concerns/hancock/decorators/embedded_element.rb

@@ -3,7 +3,15 @@ module Hancock::Decorators
     extend ActiveSupport::Concern
 
     included do
-      
+
+      # def image_styles
+      #   super
+      # end
+      #
+      # def image_jcrop_options
+      #   super
+      # end
+      #
       # ############# rails_admin ##############
       # def self.rails_admin_add_fields
       #   [] #super

data/app/models/concerns/hancock/enableable.rb

@@ -5,5 +5,4 @@ module Hancock::Enableable
   included do
     boolean_field(:enabled)
   end
-  
 end

data/app/models/concerns/hancock/hash_field.rb

@@ -2,7 +2,7 @@ if Hancock.mongoid?
   module Hancock::HashField
     extend ActiveSupport::Concern
 
-    class_methods do
+    module ClassMethods
       def hancock_cms_hash_field(name, opts = {})
         opts.merge!({type: Hash, default: {}})
         field "#{name}_hash", opts
@@ -14,7 +14,7 @@ if Hancock.mongoid?
         if opts[:localize]
           meth_str_t = "#{meth_str}_translations".freeze
           meth_hsh_t = "#{meth_hsh}_translations".freeze
-          class_eval <<-RUBY
+          class_eval <<-EVAL
             def #{meth_str_t}=(val)
               return self.#{meth_hsh_t} = {} if val.blank?
               _hash = {}
@@ -63,10 +63,10 @@ if Hancock.mongoid?
               end
               true
             end
-          RUBY
+          EVAL
 
         else
-          class_eval <<-RUBY
+          class_eval <<-EVAL
             def #{meth_str}=(val)
               return self.#{meth_hsh} = {} if val.blank?
               if val.is_a?(String)
@@ -105,10 +105,9 @@ if Hancock.mongoid?
                 true
               end
             end
-          RUBY
-        end #if opts[:localize]
-      end #def hancock_cms_hash_field(name, opts = {})
-    end # class_methods do
-
+          EVAL
+        end
+      end
+    end
   end
 end

data/app/models/concerns/hancock/html_field.rb

@@ -2,7 +2,7 @@ if Hancock.mongoid?
   module Hancock::HtmlField
     extend ActiveSupport::Concern
 
-    class_methods do
+    module ClassMethods
       def hancock_cms_html_field(name, opts = {})
         clear_by_default = opts.delete(:clear_by_default)
         clear_by_default = false unless clear_by_default == true
@@ -12,9 +12,7 @@ if Hancock.mongoid?
         field _html_field_name, opts
         field "#{name}_clear", type: Boolean, default: clear_by_default, localize: opts[:localize]
 
-        insertions_for(name) if respond_to?(:insertions_for)
-
-        class_eval <<-RUBY
+        class_eval <<-EVAL
           def #{name}
             self.#{_html_field_name} ||= ""
             return self.#{_html_field_name} unless self.#{name}_clear
@@ -28,9 +26,8 @@ if Hancock.mongoid?
             self.#{_html_field_name} ||= ""
             Rails::Html::FullSanitizer.new.sanitize(self.#{_html_field_name}.strip)
           end
-        RUBY
+        EVAL
       end
     end
-
   end
 end

data/app/models/concerns/hancock/mappable.rb

@@ -88,5 +88,4 @@ module Hancock::Mappable
       map_address
     end
   end
-  
 end

data/app/models/concerns/hancock/model_localizeable.rb

@@ -1,14 +1,12 @@
 module Hancock::ModelLocalizeable
   extend ActiveSupport::Concern
 
-  class_methods do
-    
+  module ClassMethods
     def convert2localize
       self.all.to_a.map do |p|
         p.convert2localize
       end
     end
-
   end
 
   def convert2localize(save_it = true)
@@ -32,5 +30,4 @@ module Hancock::ModelLocalizeable
     end
     self.save if save_it
   end
-
 end

data/app/models/concerns/hancock/rails_admin_patch.rb

@@ -5,25 +5,9 @@ module Hancock::RailsAdminPatch
     self.class.rails_admin_model
   end
 
-  def admin_can_actions
-    self.class.admin_can_actions
-  end
-  def admin_cannot_actions
-    self.class.admin_cannot_actions
-  end
-  def manager_can_actions
-    self.class.manager_can_actions
-  end
-  def manager_cannot_actions
-    self.class.manager_cannot_actions
-  end
-
-  class_methods do
+  module ClassMethods
     def rails_admin_model
-      name.split('::').collect(&:underscore).join('~')
-    end
-    def rails_admin_param_key
-      name.split('::').collect(&:underscore).join('_')
+      to_param.gsub("::", "~").underscore
     end
 
     def rails_admin_add_fields
@@ -33,9 +17,6 @@ module Hancock::RailsAdminPatch
     def rails_admin_add_config(config)
     end
 
-    def rails_admin_name_synonyms
-      ''.freeze
-    end
 
 
     def admin_can_default_actions
@@ -76,7 +57,7 @@ module Hancock::RailsAdminPatch
       (manager_can_default_actions + manager_can_add_actions + manager_can_user_defined_actions).uniq.freeze
     end
     def manager_cannot_default_actions
-      [:model_accesses, :user_abilities].freeze
+      [].freeze
     end
     def manager_cannot_add_actions
       [].freeze

data/app/models/concerns/hancock/sort_field.rb

@@ -1,17 +1,12 @@
 module Hancock::SortField
   extend ActiveSupport::Concern
 
-  class_methods do
-
-    def sort_field(prefix = '', opts = {type: Integer, default: 0})
-      if prefix.is_a?(Hash)
-        opts = prefix
-        prefix = opts.delete(:prefix) || ""
-      end
+  module ClassMethods
+    def sort_field(prefix = '')
       prefix = "#{prefix}_" unless prefix == ''
 
       if Hancock.mongoid?
-        field "#{prefix}order".to_sym, opts
+        field "#{prefix}order".to_sym, type: Integer
         alias_method "#{prefix}sort", "#{prefix}order"
         scope "#{prefix}ordered".to_sym,  -> { asc("#{prefix}order".to_sym) }
         scope "#{prefix}sorted".to_sym,   -> { asc("#{prefix}order".to_sym) }
@@ -20,24 +15,6 @@ module Hancock::SortField
         scope "#{prefix}ordered".to_sym,  -> { order("#{prefix}order".to_sym => :asc) }
         scope "#{prefix}sorted".to_sym,   -> { order("#{prefix}order".to_sym => :asc) }
       end
-
-
-      class_eval <<-RUBY
-        def set_default_#{prefix}order_value
-          if (_embed_method = self.try(:embed_method_for_parent))
-            begin
-              if (self.#{prefix}order.nil? or self.#{prefix}order == 0) and (_parent = self._parent)
-                self.#{prefix}order = _parent.send(_embed_method).max("#{prefix}order").to_i + 1
-              end
-            rescue
-            end
-          end
-          self.#{prefix}order ||= 0
-          self
-        end
-      RUBY
     end
-
   end
-
 end

data/app/models/concerns/hancock/sortable.rb

@@ -4,8 +4,5 @@ module Hancock::Sortable
 
   included do
     sort_field
-
-    before_create :set_default_order_value
   end
-
 end

data/app/views/blocks/_footer.html.slim

@@ -1 +1 @@
-p = Settings.copyright(default: "© Copyright {{year|2017}} | Etc", kind: :html).html_safe
+p = Settings.copyright(default: "© Copyright {{year|2016}} | Etc", kind: :html).html_safe

data/app/views/devise/passwords/edit.html.slim

@@ -1,3 +1,4 @@
+/ h2 Change your password
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
@@ -14,6 +15,7 @@
       
       .form-group
         / = f.label :password_confirmation
+        / br
         / .form-control = f.password_field :password_confirmation, label: I18n.t("shared.password_confirmation"), autocomplete: "off", placeholder: I18n.t("shared.password_confirmation")
         = f.input :password_confirmation, as: :password, autocomplete: 'off', title: I18n.t("shared.password_confirmation"), placeholder: I18n.t("shared.password_confirmation"), label: false, wrapper_html: {class: "form-control"}
     

data/app/views/devise/passwords/new.html.slim

@@ -1,3 +1,4 @@
+/ h2 Forgot your password?
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
@@ -5,6 +6,7 @@
       h2.title Забыли пароль?
       .form-group
         / = f.label :email
+        / br/
         / .form-control = f.email_field :email, autofocus: true, placeholder: I18n.t("shared.email")
         = f.input :email, as: :email, autocomplete: 'off', title: I18n.t("shared.email"), placeholder: I18n.t("shared.email"), label: false, wrapper_html: {class: "form-control"}
 

data/app/views/devise/registrations/edit.html.slim

@@ -1,3 +1,4 @@
+/ h2 Редактирование профиля
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: user_registration_path) do |f|
@@ -17,6 +18,7 @@
       
       .form-group
         / = f.label :password_confirmation
+        / br
         / .form-control = f.password_field :password_confirmation, label: I18n.t("shared.password_confirmation"), autocomplete: "off", placeholder: I18n.t("shared.password_confirmation")
         = f.input :password_confirmation, as: :password, autocomplete: 'off', title: I18n.t("shared.password_confirmation"), placeholder: I18n.t("shared.password_confirmation"), label: false, wrapper_html: {class: "form-control"}
       

data/app/views/devise/registrations/new.html.slim

@@ -1,3 +1,4 @@
+/h2 Регистрация
 .devise-box
   .white-box
     = simple_form_for(resource, as: resource_name, url: user_registration_path) do |f|
@@ -17,6 +18,7 @@
       
       .form-group
         / = f.label :password_confirmation
+        / br
         / .form-control = f.password_field :password_confirmation, label: I18n.t("shared.password_confirmation"), autocomplete: "off", placeholder: I18n.t("shared.password_confirmation")
         = f.input :password_confirmation, as: :password, autocomplete: 'off', title: I18n.t("shared.password_confirmation"), placeholder: I18n.t("shared.password_confirmation"), label: false, wrapper_html: {class: "form-control"}
       

data/app/views/devise/sessions/new.html.slim

@@ -1,4 +1,6 @@
+/ h2= I18n.t("shared.enter_site")
 .devise-box
+  / = resource.errors.inspect if resource
   .white-box
     = simple_form_for(resource, as: resource_name, url: user_session_path) do |f|
       / = devise_error_messages!

data/app/views/hancock/home/index.html.slim

@@ -1,4 +1 @@
-div Hancock CMS Application
-
-- if defined?(Hancock::Pages) and @seo_page
-  = render file: "hancock/pages/pages/show"
+div hancock_cms test app

data/app/views/layouts/application.html.slim

@@ -6,28 +6,19 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    
-    / - cache 'favicons', skip_digest: true do
-    /   = render partial: 'blocks/favicon'
-    
+    = render partial: 'blocks/favicon'
+
     - async = false #Rails.env.production?
-    - defer = true #Rails.env.production?
-    = stylesheet_link_tag "application", media: "all", async: async, defer: defer
-    = javascript_include_tag "application", async: async, defer: defer
+    = stylesheet_link_tag "application", media: "all", async: async
+    = javascript_include_tag "application", async: async
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async, defer: defer
-    - cache 'layouts/application/custom_head', skip_digest: true do
-      - _cache_key = ['views/layouts/application/custom_head']
-      css:
-        #{{Settings.ns('application_layout').custom_css(default: '', kind: :css, label: "Дополнительный CSS", cache_keys: _cache_key)}}
-      javascript:
-        #{{Settings.ns('application_layout').custom_js(default: '', kind: :js, label: "Дополнительный JS", cache_keys: _cache_key)}}
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
+    css:
+      #{Settings.custom_css(default: '', kind: :css, label: "Дополнительный CSS")}
+    javascript:
+      #{Settings.custom_js(default: '', kind: :js, label: "Дополнительный JS")}
 
-  body{class="application_layout #{controller_name} #{action_name} #{controller_name}_#{action_name}"}
-
-    - cache 'preloader', skip_digest: true do
-      = render partial: 'blocks/preloader'
-      
+  body{class="#{controller_name} #{action_name} #{controller_name}_#{action_name}"}
     #root role="main"
     
       header#header
@@ -41,4 +32,4 @@ html lang="ru"
     footer#footer
       = render partial: 'blocks/footer'
 
-    = render partial: 'hancock/toplink/toplink'
+    = render partial: 'hancock/toplink/toplink'

data/app/views/layouts/hancock/devise/confirmations.html.slim

@@ -6,16 +6,13 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    
-    / - cache 'favicons', skip_digest: true do
-    /   = render partial: 'blocks/favicon'
+    = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    - defer = false #Rails.env.production?    
-    = stylesheet_link_tag "application", media: "all", defer: defer
-    = javascript_include_tag "application", defer: defer
+    = stylesheet_link_tag "application", media: "all", async: async
+    = javascript_include_tag "application", async: async
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
       
   body
     #preloader

data/app/views/layouts/hancock/devise/passwords.html.slim

@@ -6,16 +6,13 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    
-    / - cache 'favicons', skip_digest: true do
-    /   = render partial: 'blocks/favicon'
+    = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    - defer = false #Rails.env.production?    
-    = stylesheet_link_tag "application", media: "all", defer: defer
-    = javascript_include_tag "application", defer: defer
+    = stylesheet_link_tag "application", media: "all", async: async
+    = javascript_include_tag "application", async: async
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
       
   body
     #preloader

data/app/views/layouts/hancock/devise/registrations.html.slim

@@ -6,16 +6,13 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    
-    / - cache 'favicons', skip_digest: true do
-    /   = render partial: 'blocks/favicon'
+    = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    - defer = false #Rails.env.production?    
-    = stylesheet_link_tag "application", media: "all", defer: defer
-    = javascript_include_tag "application", defer: defer
+    = stylesheet_link_tag "application", media: "all", async: async
+    = javascript_include_tag "application", async: async
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
       
   body
     #preloader

data/app/views/layouts/hancock/devise/sessions.html.slim

@@ -6,16 +6,13 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    
-    / - cache 'favicons', skip_digest: true do
-    /   = render partial: 'blocks/favicon'
+    = render partial: 'blocks/favicon'
     
     - async = false #Rails.env.production?
-    - defer = false #Rails.env.production?    
-    = stylesheet_link_tag "application", media: "all", defer: defer
-    = javascript_include_tag "application", defer: defer
+    = stylesheet_link_tag "application", media: "all", async: async
+    = javascript_include_tag "application", async: async
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", defer: defer
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
       
   body
     #preloader