hancock_cms_pages 1.0.0 → 1.0.2

data/lib/hancock/pages/configuration.rb

@@ -9,6 +9,8 @@ module Hancock::Pages
     attr_accessor :menu_max_depth
 
     attr_accessor :seo_support
+    attr_accessor :cache_support
+    attr_accessor :insertions_support
 
     attr_accessor :localize
 
@@ -18,18 +20,39 @@ module Hancock::Pages
     attr_accessor :user_abilities_support
     attr_accessor :ra_comments_support
 
+    attr_accessor :renderer_lib_extends
+
+    attr_accessor :verbose_render
+    attr_accessor :raven_support
+
+    attr_accessor :available_layouts
+
     def initialize
       @menu_max_depth = 2
 
-      @seo_support = defined? Hancock::Seo
+      @seo_support        = !!defined? Hancock::Seo
+      @cache_support      = !!defined?(Hancock::Cache)
+      @insertions_support = true
 
       @localize   = Hancock.config.localize
 
-      @breadcrumbs_on_rails_support = defined?(BreadcrumbsOnRails)
+      @breadcrumbs_on_rails_support = !!defined?(BreadcrumbsOnRails)
+
+      @model_settings_support = !!defined?(RailsAdminModelSettings)
+      @user_abilities_support = !!defined?(RailsAdminUserAbilities)
+      @ra_comments_support = !!defined?(RailsAdminComments)
+
+      @renderer_lib_extends = [
+        # ::ActionController::Base,
+        ::ActionView::Helpers::TagHelper,
+        ::ActionView::Context
+      ]
+
+      @verbose_render = Rails.env.development? or Rails.env.test?
+      @raven_support = !!(Hancock.config.respond_to?(:raven_support) ? Hancock.config.raven_support : defined?(Raven))
+
+      @available_layouts = ["application"]
 
-      @model_settings_support = defined?(RailsAdminModelSettings)
-      @user_abilities_support = defined?(RailsAdminUserAbilities)
-      @ra_comments_support = defined?(RailsAdminComments)
     end
   end
 end

data/lib/hancock/pages/controllers/pages.rb

@@ -3,6 +3,11 @@ module Hancock::Pages
     module Pages
       extend ActiveSupport::Concern
 
+      included do
+        include ActionView::Helpers::TagHelper
+        include ActionView::Context
+      end
+
       def show
         if @seo_page.nil? || !@seo_page.persisted?
           if !params[:id].blank? or !params[:slug].blank?
@@ -18,6 +23,10 @@ module Hancock::Pages
         if Hancock::Pages.config.breadcrumbs_on_rails_support
           add_breadcrumb @seo_page.name, @seo_page.slug
         end
+
+        if Hancock::Pages.config.available_layouts.include?(@seo_page.layout_name)
+          render layout: @seo_page.layout_name
+        end
       end
 
       private
@@ -27,7 +36,7 @@ module Hancock::Pages
 
       def after_initialize
       end
-      
+
     end
   end
 end

data/lib/hancock/pages/engine.rb

@@ -1,5 +1,64 @@
 module Hancock::Pages
   class Engine < ::Rails::Engine
     # isolate_namespace Hancock::Pages
+
+    # initializer "hancock_cms_pages.blocksets_settings" do
+    #   # Write default email settings to DB so they can be changed.
+    #
+    #   #temp
+    #   begin
+    #     if Settings and Settings.table_exists?
+    #       Settings.hancock_pages_blocks_whitelist(default: '', kind: :text, label: 'Белый список блоков')
+    #       Settings.hancock_pages_blocks_human_names(default: '', kind: :yaml, label: 'Имена блоков')
+    #     end
+    #
+    #     # if Settings and Settings.table_exists? and Hancock::Pages.model_settings_support
+    #     #   Hancock::Pages::Blockset.settings.blocks_whitelist(default: '', kind: :text, label: 'Белый список блоков')
+    #     #   Hancock::Pages::Blockset.settings.blocks_human_names(default: '', kind: :yaml, label: 'Имена блоков')
+    #     #
+    #     #
+    #     #   _setting_existed = !Hancock::Cache::Fragment.settings.getnc('detecting').nil?
+    #     #   unless _setting_existed
+    #     #     Hancock::Pages::Blockset.settings.blocks_whitelist(kind: :text, default: '', label: 'Белый список блоков')
+    #     #     Hancock::Pages::Blockset.settings.unload!
+    #     #     _setting = Hancock::Pages::Blockset.settings.getnc('blocks_whitelist')
+    #     #     if _setting
+    #     #       _setting.for_admin = true
+    #     #       _setting.perform_caching = false
+    #     #       _setting.save
+    #     #     end
+    #     #   end
+    #     #
+    #     #
+    #     #   _setting_existed = !Hancock::Cache::Fragment.settings.getnc('detecting').nil?
+    #     #   unless _setting_existed
+    #     #     Hancock::Pages::Blockset.settings.blocks_human_names(default: '', kind: :yaml, label: 'Имена блоков')
+    #     #     Hancock::Pages::Blockset.settings.unload!
+    #     #     _setting = Hancock::Pages::Blockset.settings.getnc('blocks_human_names')
+    #     #     if _setting
+    #     #       _setting.for_admin = true
+    #     #       _setting.perform_caching = false
+    #     #       _setting.save
+    #     #     end
+    #     #   end
+    #     #
+    #     # end
+    #   rescue
+    #   end
+    # end
+
+    config.after_initialize do
+      # Write default email settings to DB so they can be changed.
+      begin
+        if Settings and Settings.table_exists?
+          Settings.hancock_pages_blocks_whitelist(default: '', kind: :text, label: 'Белый список блоков') unless RailsAdminSettings::Setting.ns("main").where(key: "hancock_pages_blocks_whitelist").exists?
+          Settings.hancock_pages_blocks_human_names(default: '', kind: :yaml, label: 'Имена блоков') unless RailsAdminSettings::Setting.ns("main").where(key: "hancock_pages_blocks_human_names").exists?
+
+          Settings.ns('admin').hancock_pages_blocks_blacklist(default: '', kind: :text, label: 'Черный список блоков') unless RailsAdminSettings::Setting.ns("admin").where(key: "hancock_pages_blocks_blacklist").exists?
+        end
+      rescue
+      end
+    end
+
   end
 end

data/lib/hancock/pages/models/active_record/blockset.rb

@@ -11,7 +11,8 @@ module Hancock::Pages
             translates :name
           end
 
-          has_many :page_blocks, class_name: "Hancock::Pages::Blockset"
+          has_many :blocks, class_name: "Hancock::Pages::Blockset", inverse_of: :blockset
+          accepts_nested_attributes_for :blocks, allow_destroy: true
         end
       end
     end

data/lib/hancock/pages/models/block.rb

@@ -6,6 +6,10 @@ module Hancock::Pages
       include Hancock::Enableable
       include ManualSlug
 
+      if Hancock::Pages.config.insertions_support
+        include Hancock::InsertionField
+      end
+
       include Hancock::Pages.orm_specific('Block')
 
       included do
@@ -21,6 +25,93 @@ module Hancock::Pages
         after_initialize do
           self.file_pathname = Pathname.new(file_path) unless file_path.nil?
         end
+
+        def can_render?
+          Hancock::Pages::can_render_in_block?(self.file_path)
+        end
+
+        if Hancock::Pages.config.insertions_support
+          # insertions_for(:content)
+          insertions_for(:content_html)
+          alias :block_content :page_content
+          alias :block_content_html :page_content_html
+        end
+        def block_content(clear_insertions = true)
+          if clear_insertions.is_a?(Hash)
+            clear_insertions = clear_insertions[:clear_insertions]
+          end
+          if @content_used.nil?
+            if content.nil?
+              @content_used = true
+              ''
+            else
+              # content.gsub(/\{\{(.*?)\}\}/) do
+              # {{"some_text"}} #temporary disabled - need tests
+              # _content = content.gsub(/\{\{(['"])(.*?)(\1)\}\}/) do
+              #   $2
+              # end.gsub(/(\{\{(([^\.]*?)\.)?(.*?)\}\})/) do
+              _content = content.gsub(/(\{\{(([^\.]*?)\.)?(.*?)\}\})/) do
+                if $4 == "FILE" and $3.blank?
+                  clear_insertions ? "" : $1
+                elsif $4 =~ /\ABS\|(.*?)\Z/ and $3.blank?
+                  clear_insertions ? "" : $1
+                elsif $3 == "self" and !$4.blank?
+                  if clear_insertions
+                    ""
+                  elsif Hancock::Pages.config.insertions_support
+                    get_insertion($4)
+                  else
+                    $1
+                  end
+                else
+                  (Settings and !$4.blank? and $3 != "self") ? Settings.ns($3).get($4).val : "" #temp
+                end
+              end
+              @content_used = true
+              _content
+            end
+          else
+            ''
+          end
+        end
+        def block_content_html(clear_insertions = true)
+          if clear_insertions.is_a?(Hash)
+            clear_insertions = clear_insertions[:clear_insertions]
+          end
+          if @content_html_used.nil?
+            if content_html.nil?
+              @content_html_used = true
+              ''
+            else
+              # content.gsub(/\{\{(.*?)\}\}/) do
+              # {{"some_text"}} #temporary disabled - need tests
+              # _content_html = content_html.gsub(/\{\{(['"])(.*?)(\1)\}\}/) do
+              #   $2
+              # end.gsub(/(\{\{(([^\.]*?)\.)?(.*?)\}\})/) do
+              _content_html = content_html.gsub(/(\{\{(([^\.]*?)\.)?(.*?)\}\})/) do
+                if $4 == "FILE" and $3.blank?
+                  clear_insertions ? "" : $1
+                elsif $4 =~ /\ABS\|(.*?)\Z/ and $3.blank?
+                  clear_insertions ? "" : $1
+                elsif $3 == "self" and !$4.blank?
+                  if clear_insertions
+                    ""
+                  elsif Hancock::Pages.config.insertions_support
+                    get_insertion($4)
+                  else
+                    $1
+                  end
+                else
+                  (Settings and !$4.blank? and $3 != "self") ? Settings.ns($3).get($4).val : "" #temp
+                end
+              end
+              @content_html_used = true
+              _content_html
+            end
+          else
+            ''
+          end
+        end
       end
 
       def file_pathname_as_partial
@@ -37,70 +128,97 @@ module Hancock::Pages
         self.file_pathname_for_fs.to_s
       end
 
-
-      def has_content?
-        @content_used.nil? && !content.blank?
-      end
-      def block_content(clear_insertions = true)
-        if clear_insertions.is_a?(Hash)
-          clear_insertions = clear_insertions[:clear_insertions]
-        end
-        if @content_used.nil?
-          @content_used = true
-          if content.nil?
-            ''
+      def rails_admin_label
+        if !self.name.blank?
+          self.name
+        elsif self.render_file and !self.file_path.blank?
+          _human_name = Hancock::Pages.whitelist_human_names[self.file_path]
+          if _human_name.blank?
+            self.file_path_for_fs
           else
-            # content.gsub(/\{\{(.*?)\}\}/) do
-            content.gsub(/\{\{(([^\.]*?)\.)?(.*?)\}\}/) do
-              if $3 == "FILE" and $2.blank?
-                clear_insertions ? "" : $0
-              else
-                (Settings and !$3.blank?) ? Settings.ns($2).get($3).val : "" #temp
-              end
-            end
+            _human_name
           end
         else
-          ''
+          self.id
         end
       end
+
+      def has_content?
+        @content_used.nil? && !content.blank?
+      end
       def has_content_html?
         @content_html_used.nil? && !content_html.blank?
       end
-      def block_content_html(clear_insertions = true)
-        if clear_insertions.is_a?(Hash)
-          clear_insertions = clear_insertions[:clear_insertions]
+
+      def render_or_content_html(view = Hancock::Pages::PagesController.new, opts = {})
+        if view.is_a?(Hash)
+          view, opts = view.delete(:view) || Hancock::Pages::PagesController.new, view
         end
-        if @content_html_used.nil?
-          @content_html_used = true
-          if content_html.nil?
-            ''
-          else
-            # content.gsub(/\{\{(.*?)\}\}/) do
-            content_html.gsub(/\{\{(([^\.]*?)\.)?(.*?)\}\}/) do
-              if $3 == "FILE" and $2.blank?
-                clear_insertions ? "" : $0
-              else
-                (Settings and !$3.blank?) ? Settings.ns($2).get($3).val : "" #temp
-              end
+        Hancock::Pages.config.renderer_lib_extends.each do |lib_extends|
+          unless view.class < lib_extends
+            if view.respond_to?(:prepend)
+              view.prepend lib_extends
+            else
+              view.extend lib_extends
             end
           end
-        else
-          ''
         end
-      end
 
-      def render_or_content_html(view, opts = {})
-        if view.is_a?(Hash)
-          view, opts = view.delete(:view), view
-        end
         ret = ""
+        hancock_env = {block: self, called_from: [{object: self, method: :render_or_content_html}]}
+        hancock_env[:called_from].unshift(opts.delete(:called_from)) if opts and opts[:called_from].present?
+        locals = {}
+        locals[:hancock_env] = hancock_env
+
         if self.render_file and !self.file_path.blank?
-          opts.merge!(partial: self.file_path, locals: {hancock_block: self, called_from: :render})
-          ret = view.render(opts) rescue self.content_html.html_safe
+          opts.merge!(partial: self.file_path, locals: locals)
+          # ret = view.render_to_string(opts) rescue self.content_html.html_safe
+          ret = begin
+            view.render_to_string(opts) if can_render?
+          rescue Exception => exception
+            if Hancock::Pages.config.verbose_render
+              Rails.logger.error exception.message
+              Rails.logger.error exception.backtrace.join("\n")
+              puts exception.message
+              puts exception.backtrace.join("\n")
+            end
+            Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
+            self.content_html.html_safe
+          end
         else
-          opts.merge!(partial: self.file_path, locals: {hancock_block: self, called_from: :content_html})
+          opts.merge!(partial: self.file_path, locals: locals)
+          # ret = self.block_content_html(false).gsub(/(\{\{(([^\.]*?)\.)?(.*?)\}\})/) do
           ret = self.block_content_html(false).gsub("{{FILE}}") do
-            view.render(opts) rescue nil
+            # view.render(opts) rescue nil
+            begin
+              view.render(opts) if can_render?
+            rescue Exception => exception
+              if Hancock::Pages.config.verbose_render
+                Rails.logger.error exception.message
+                Rails.logger.error exception.backtrace.join("\n")
+                puts exception.message
+                puts exception.backtrace.join("\n")
+              end
+              Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
+              nil
+            end
+          end.gsub(/\{\{BS\|(.*?)\}\}/) do
+            bs = Hancock::Pages::Blockset.enabled.where(name: $1).first
+            # view.render_blockset(bs, called_from: :render_or_content_html) rescue nil if bs
+            if bs
+              begin
+                view.render_blockset(bs, called_from: {object: self, method: :render_or_content_html})
+              rescue Exception => exception
+                if Hancock::Pages.config.verbose_render
+                  Rails.logger.error exception.message
+                  Rails.logger.error exception.backtrace.join("\n")
+                  puts exception.message
+                  puts exception.backtrace.join("\n")
+                end
+                Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
+                nil
+              end
+            end
           end.html_safe
         end
         if use_wrapper
@@ -111,25 +229,86 @@ module Hancock::Pages
           ret = view.content_tag wrapper_tag, ret, _attrs
         end
         ret = yield ret if block_given?
-        return ret
+        return (ret.is_a?(Array) ? ret.join.html_safe : ret)
+        # return ret
       end
 
-      def render_or_content(view, opts = {})
+      def render_or_content(view = Hancock::Pages::PagesController.new, opts = {})
         if view.is_a?(Hash)
-          view, opts = view.delete(:view), view
+          view, opts = view.delete(:view) || Hancock::Pages::PagesController.new, view
+        end
+        Hancock::Pages.config.renderer_lib_extends.each do |lib_extends|
+          unless view.class < lib_extends
+            if view.respond_to?(:prepend)
+              view.prepend lib_extends
+            else
+              view.extend lib_extends
+            end
+          end
         end
+
         ret = ""
+        hancock_env = {block: self, called_from: [{object: self, method: :render_or_content}]}
+        hancock_env[:called_from].unshift(opts.delete(:called_from)) if opts and opts[:called_from].present?
+        locals = {}
+        locals[:hancock_env] = hancock_env
+
         unless self.file_path.blank?
-          opts.merge!(partial: self.file_path, locals: {hancock_block: self, called_from: :render})
-          ret = view.render(opts) rescue self.content
+          opts.merge!(partial: self.file_path, locals: locals)
+
+          # ret = view.render_to_string(opts) rescue self.content
+          ret = begin
+            view.render_to_string(opts) if can_render?
+          rescue Exception => exception
+            if Hancock::Pages.config.verbose_render
+              Rails.logger.error exception.message
+              Rails.logger.error exception.backtrace.join("\n")
+              puts exception.message
+              puts exception.backtrace.join("\n")
+            end
+            Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
+            self.content
+          end
+          # ret = view.render(opts) rescue self.content
         else
-          opts.merge!(partial: self.file_path, locals: {hancock_block: self, called_from: :content})
+          opts.merge!(partial: self.file_path, locals: locals)
           ret = self.block_content(false).gsub("{{FILE}}") do
-            view.render(opts) rescue nil
+            # view.render_to_string(opts) rescue nil
+            begin
+              view.render_to_string(opts) if can_render?
+            rescue Exception => exception
+              if Hancock::Pages.config.verbose_render
+                Rails.logger.error exception.message
+                Rails.logger.error exception.backtrace.join("\n")
+                puts exception.message
+                puts exception.backtrace.join("\n")
+              end
+              Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
+              nil
+            end
+            # view.render(opts) rescue nil
+          end.gsub(/\{\{BS\|(.*?)\}\}/) do
+            bs = Hancock::Pages::Blockset.enabled.where(name: $1).first
+            # view.render_blockset(bs, called_from: :render_or_content) rescue nil if bs
+            if bs
+              begin
+                view.render_blockset(bs, called_from: {object: self, method: :render_or_content})
+              rescue Exception => exception
+                if Hancock::Pages.config.verbose_render
+                  Rails.logger.error exception.message
+                  Rails.logger.error exception.backtrace.join("\n")
+                  puts exception.message
+                  puts exception.backtrace.join("\n")
+                end
+                Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
+                nil
+              end
+            end
           end
         end
         ret = yield ret if block_given?
-        return ret
+        return (ret.is_a?(Array) ? ret.join.html_safe : ret)
+        # return ret
       end
 
       def file_fullpath(with_ext = false, ext = ".html.slim")