hancock_cms_pages 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df1e024159d2a4e0fd87514fb997a63e6fe8417
-  data.tar.gz: 105ab60abf6d5ce295777269cd8cf56b352d4847
+  metadata.gz: 4430da0d6feb96e83d1442a5c2c2dac7799bb924
+  data.tar.gz: ab34ce6ae8968be301e39944a3f3b5092c801daf
 SHA512:
-  metadata.gz: b01a03fa00d94eeeee6260b335d931dabd438b655cd4f97c33b02820f5b44fc4020c86e7f4387dfa8963299439c2c612e182ff4d40ca3bd1e51be20784d022fe
-  data.tar.gz: a8243f8ba5ec40debc06e99a94a0c72f236c6a58c5b1467ace1f2e33c81b3552d9a7a414fc5b9e180bb1b57fc21e564eba11747726c2e352d816f7572702739a
+  metadata.gz: 4e8ef56da42309a3a8805173bd68d3709c3d72a332279b7b379d81ce1128e8f6d55b84bf73951e6e0a83b5ef2607c06a47aeec75a32ae9e697352fce70610a65
+  data.tar.gz: 97eedb3d142c691a1345a8ff3bbf67aaa6f15b1b4c9720d5a18f5570fc3e5590a20e83bbc9f07a671bde986fab3bc12e859d394ba62606b41b91ca473442725c

data/app/controllers/concerns/hancock/pages/blocksetable.rb

@@ -5,7 +5,6 @@ module Hancock::Pages::Blocksetable
     helper_method :blockset_navigation
   end
 
-  private
   def blockset_navigation(type)
     Proc.new do |primary|
       SimpleNavigation.config.autogenerate_item_ids = false
@@ -23,36 +22,63 @@ module Hancock::Pages::Blocksetable
         Rails.logger.error exception.backtrace.join("\n")
         puts exception.message
         puts exception.backtrace.join("\n")
-        capture_exception(exception) if respond_to?(:capture_exception)
+        Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
         items || []
       end
     end
   end
 
-  def render_blockset(view, type)
+  def render_blockset(*opts, &block)
+    if opts.length == 1 and opts[0].is_a?(Hash)
+      type = opts.delete[:type]
+    else
+      if opts[-1].is_a?(Hash)
+        type = opts[-2] #backward compatibility
+        opts = opts[-1]
+      else
+        type = opts[-1] #backward compatibility
+        opts = {}
+      end
+    end
     ret = []
+    need_render_blockset = true
     begin
       blockset = get_blockset(type)
-      blocks = blockset_get_blocks_for_render(blockset)
-      blocks.each do |block|
-        ret << block.render_or_content_html(view) do |html|
-          after_render_blockset_block block, html
-        end
+      if block_given? and (blockset.new_record? or opts[:overwrite])
+
+        # include ::Hancock::Pages::BlocksetsHelper
+
+        need_render_blockset = false
+        blockset.blocks.delete_all if opts[:overwrite]
+        _block = blockset.blocks.new
+        _block.content_html = helpers.capture(&block) if block
+        # _block.content_html = helpers.capture_block(&block)
+        _block.render_file = false
+        _block.save
       end
-      ret = blockset.render(view, ret.join.html_safe) do |html|
-        after_render_blockset blockset, html
+      if need_render_blockset
+        blocks = blockset_get_blocks_for_render(blockset)
+        blocks.each do |block|
+          ret << block.render_or_content_html(self, opts) do |html|
+            after_render_blockset_block block, html
+          end
+        end
+        ret = blockset.render(self, ret.join.html_safe) do |html|
+          after_render_blockset blockset, html
+        end
       end
     rescue Exception => exception
       Rails.logger.error exception.message
       Rails.logger.error exception.backtrace.join("\n")
       puts exception.message
       puts exception.backtrace.join("\n")
-      capture_exception(exception) if respond_to?(:capture_exception)
+      Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
       # ret << blocks || []
     end
-    ret.is_a?(Array) ? ret.join.html_safe : ret
+    return (ret.is_a?(Array) ? ret.join.html_safe : ret)
   end
 
+  private
   def after_render_blockset_block(block, html)
     html
   end
@@ -62,7 +88,15 @@ module Hancock::Pages::Blocksetable
   end
 
   def get_blockset(type)
-    type.is_a?(Hancock::Pages::Blockset) ? type : blockset_class.find(type.to_s)
+    if type.is_a?(blockset_class)
+      type
+    else
+      begin
+        blockset_class.find(type.to_s)
+      rescue
+        blockset_class.new(name: type.to_s, text_slug: type.to_s)
+      end
+    end
   end
 
   def blockset_get_blocks(type)
@@ -79,7 +113,7 @@ module Hancock::Pages::Blocksetable
     "Hancock::Pages::Blockset"
   end
   def blockset_class
-    blockset_class_name.constantize
+    @blockset_class ||= blockset_class_name.constantize
   end
 
   def blockset_navigation_item(primary, item, block=nil)

data/app/controllers/concerns/hancock/pages/localizeable.rb

@@ -1,7 +1,7 @@
 module Hancock::Pages::Localizeable
   extend ActiveSupport::Concern
   included do
-    before_filter do
+    before_action do
       I18n.locale = params[:locale] || I18n.default_locale
       Settings.ns_default = "main_#{I18n.locale}".freeze
       Settings.ns_fallback = "main".freeze
@@ -21,7 +21,7 @@ module Hancock::Pages::Localizeable
     pages.sorted.to_a
   end
   def nav_get_url(item)
-    _connectable = item.connectable
+    _connectable = item.hancock_connectable
     if _connectable and _connectable.enabled
       begin
         _routes_namespace = _connectable.respond_to?(:routes_namespace) ? _connectable.routes_namespace : :main_app
@@ -31,7 +31,7 @@ module Hancock::Pages::Localizeable
         Rails.logger.error exception.backtrace.join("\n")
         puts exception.message
         puts exception.backtrace.join("\n")
-        capture_exception(exception) if respond_to?(:capture_exception)
+        Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
 
         _url = item.redirect.blank? ? item.fullpath : item.redirect
       end
@@ -54,13 +54,13 @@ module Hancock::Pages::Localizeable
     "Hancock::Pages::Page"
   end
   def page_class
-    page_class_name.constantize
+    @page_class ||= page_class_name.constantize
   end
 
   def menu_class_name
     "Hancock::Pages::Menu"
   end
   def menu_class
-    menu_class_name.constantize
+    @menu_class ||= menu_class_name.constantize
   end
 end

data/app/controllers/concerns/hancock/pages/nav_menu.rb

@@ -45,14 +45,14 @@ module Hancock::Pages::NavMenu
         Rails.logger.error exception.backtrace.join("\n")
         puts exception.message
         puts exception.backtrace.join("\n")
-        capture_exception(exception) if respond_to?(:capture_exception)
+        Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
         items || []
       end
     end
   end
 
   def nav_get_url(item)
-    _connectable = item.connectable
+    _connectable = item.hancock_connectable
     if _connectable and _connectable.enabled
       begin
         _routes_namespace = _connectable.respond_to?(:routes_namespace) ? _connectable.routes_namespace : :main_app
@@ -63,7 +63,7 @@ module Hancock::Pages::NavMenu
         Rails.logger.error exception.backtrace.join("\n")
         puts exception.message
         puts exception.backtrace.join("\n")
-        capture_exception(exception) if respond_to?(:capture_exception)
+        Raven.capture_exception(exception) if Hancock::Pages.config.raven_support
 
         item.redirect.blank? ? item.fullpath : item.redirect
       end
@@ -72,7 +72,12 @@ module Hancock::Pages::NavMenu
     end
   end
   def nav_get_menu_items(type)
-    menu = menu_class.find(type.to_s)
+    if type.is_a?(blockset_class)
+      type
+    else
+      menu = menu_class.find(type.to_s) rescue menu_class.create(name: type.to_s, text_slug: type.to_s)
+    end
+
     menu.pages.enabled.sorted.to_a if menu
   end
   def nav_extra_data_before(type, primary)
@@ -86,6 +91,6 @@ module Hancock::Pages::NavMenu
     "Hancock::Pages::Menu"
   end
   def menu_class
-    menu_class_name.constantize
+    @menu_class ||= menu_class_name.constantize
   end
 end

data/app/controllers/concerns/hancock/pages/seo_pages.rb

@@ -1,7 +1,7 @@
 module Hancock::Pages::SeoPages
   extend ActiveSupport::Concern
   included do
-    before_filter :find_page
+    before_action :find_page
   end
 
   private
@@ -35,7 +35,7 @@ module Hancock::Pages::SeoPages
     if page.nil?
       do_redirect = true
       spath = path.chomp(File.extname(path))
-      if spath != path and spath != "/" + params[:slug]
+      if spath and spath != path and (!params[:slug].blank? and spath != "/" + params[:slug])
         page = page_class.enabled.where(fullpath: spath).first
       end
     end
@@ -90,7 +90,7 @@ module Hancock::Pages::SeoPages
     "Hancock::Pages::Page"
   end
   def page_class
-    page_class_name.constantize
+    @page_class ||= page_class_name.constantize
   end
 
   def rails_admin?

data/app/helpers/hancock/pages/blocksets_helper.rb

@@ -0,0 +1,26 @@
+module Hancock::Pages::BlocksetsHelper
+
+  # def capture_block(&block)
+  #   capture(&block)
+  # end
+
+  def hancock_pages_blocks_can_render_me(name = "", opts = {})
+    if name.is_a?(Hash)
+      name, opts = (name.delete(:name) || ""), name
+    end
+    _virtual_path = Hancock::Pages::format_virtual_path(@virtual_path, opts[:is_partial])
+    Hancock::Pages::add_view_in_whitelist(_virtual_path, name)
+  end
+  alias_method :hancock_pages_blocks_can_render_me_as, :hancock_pages_blocks_can_render_me
+
+  def hancock_pages_blocks_can_render_me?(opts = {})
+    _virtual_path = Hancock::Pages::format_virtual_path(@virtual_path, opts[:is_partial])
+    Hancock::Pages::whitelist_as_array(opts[:exclude_blacklist]).include?(_virtual_path)
+  end
+
+  def hancock_pages_blocks_cannot_render_me(opts = {})
+    _virtual_path = Hancock::Pages::format_virtual_path(@virtual_path)
+    Hancock::Pages::add_view_in_blacklist(_virtual_path)
+  end
+
+end

data/app/helpers/hancock/pages/pages_helper.rb

@@ -0,0 +1,11 @@
+module Hancock::Pages::PagesHelper
+
+  def cached_navigation(menu_key = :main)
+    render partial: 'blocks/cached_navigation', locals: {menu_key: menu_key}
+  end
+
+  def cached_blockset_navigation(blockset_key = :main)
+    render partial: 'blocks/cached_blockset_navigation', locals: {blockset_key: blockset_key}
+  end
+
+end

data/app/models/concerns/hancock/pages/connectable.rb

@@ -25,7 +25,7 @@ module Hancock::Pages::Connectable
             if [true, 1, "1", "true", "t"].include?(self.hancock_connectable_autocreate_page)
               _p = #{class_name}.new
               _p.#{_name_attr} = self.#{_name_attr}
-              _p.connectable = self
+              _p.hancock_connectable = self
               _p.save
             end
           end

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

@@ -0,0 +1,26 @@
+- _cache_helper = (Hancock::Pages.config.cache_support ? :hancock_cache : :cache)
+- blockset_key ||= :main
+- blockset_key = blockset_key.to_s
+
+- if @seo_page 
+  - blockset = Hancock::Pages::Blockset.find(blockset_key)
+  - if Hancock::Pages.config.cache_support
+    - [blockset, @seo_page].compact.each do |obj|
+      - if obj.respond_to?(:cache_keys_str) and obj.respond_to?(:cache_keys) and obj.respond_to?(:cache_keys=)
+        - obj.cache_keys |= hancock_cache_views_keys
+        - obj.save if obj.cache_keys_str_changed?
+  - send _cache_helper, [blockset, @seo_page] do
+    = render_navigation &blockset_navigation(blockset_key)
+    
+- elsif @seo_parent_page
+  - blockset = Hancock::Pages::Blockset.find(blockset_key)
+  - if Hancock::Pages.config.cache_support
+    - [blockset, @seo_parent_page].compact.each do |obj|
+      - if obj.respond_to?(:cache_keys_str) and obj.respond_to?(:cache_keys) and obj.respond_to?(:cache_keys=)
+        - obj.cache_keys |= hancock_cache_views_keys
+        - obj.save if obj.cache_keys_str_changed?
+  - send _cache_helper, [blockset, @seo_parent_page] do
+    = render_navigation &blockset_navigation(blockset_key)
+    
+- else
+  = render_navigation &blockset_navigation(blockset_key)

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

@@ -0,0 +1,26 @@
+- _cache_helper = (Hancock::Pages.config.cache_support ? :hancock_cache : :cache)
+- menu_key ||= :main
+- menu_key = menu_key.to_s
+
+- if @seo_page 
+  - menu = Hancock::Pages::Menu.find(menu_key)
+  - if Hancock::Pages.config.cache_support
+    - [menu, @seo_page].compact.each do |obj|
+      - if obj.respond_to?(:cache_keys_str) and obj.respond_to?(:cache_keys) and obj.respond_to?(:cache_keys=)
+        - obj.cache_keys |= hancock_cache_views_keys
+        - obj.save if obj.cache_keys_str_changed?
+  - send _cache_helper, [menu, @seo_page] do
+    = render_navigation &navigation(menu_key)
+    
+- elsif @seo_parent_page
+  - menu = Hancock::Pages::Menu.find(menu_key)
+  - if Hancock::Pages.config.cache_support
+    - [menu, @seo_parent_page].compact.each do |obj|
+      - if obj.respond_to?(:cache_keys_str) and obj.respond_to?(:cache_keys) and obj.respond_to?(:cache_keys=)
+        - obj.cache_keys |= hancock_cache_views_keys
+        - obj.save if obj.cache_keys_str_changed?
+  - send _cache_helper, [menu, @seo_parent_page] do
+    = render_navigation &navigation(menu_key)
+    
+- else
+  = render_navigation &navigation(menu_key)

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

@@ -1,4 +1,12 @@
 #logo
   
 #main-nav
-  = render_navigation &navigation(:main)
+  = cached_navigation(:main)
+  / - if @seo_page 
+  /   - cache @seo_page do
+  /     = render_navigation &navigation(:main)
+  / - elsif @seo_parent_page
+  /   - cache @seo_parent_page do
+  /     = render_navigation &navigation(:main)
+  / - else
+  /   = render_navigation &navigation(:main)

data/app/views/hancock/pages/pages/show.html.slim

@@ -1 +1,14 @@
-= render 'shared/obj', obj: @seo_page
+- _cache_helper = (Hancock::Pages.config.cache_support ? :hancock_cache : :cache)
+- _partial_path = (Hancock::Pages.config.seo_support ? 'shared/obj_with_seo' : 'shared/obj')
+
+/ - send _cache_helper, @seo_page do
+- if @seo_page.use_wrapper
+  ruby: 
+    _attrs = {
+      class: @seo_page.wrapper_class,
+      id: @seo_page.wrapper_id
+    }.merge(@seo_page.wrapper_attributes)
+  = content_tag @seo_page.wrapper_tag, _attrs do
+    = render _partial_path, obj: @seo_page      
+- else
+  = render _partial_path, obj: @seo_page

data/app/views/shared/_obj.html.slim

@@ -1,26 +1,22 @@
+- obj ||= nil
 - unless obj.nil?
-  .text_content
-    - if obj.respond_to?(:seo)
-      - seo = obj.seo
-      - if (!defined?(h1) || h1) && seo and !seo.h1.blank?
-        h1= seo.h1
-        
-    - if obj.content.blank?
-      - unless @seo_page.nil?
-        = raw @seo_page.page_content
-    - else
-      = raw obj.content
-            
-    .admin_button
-      = render 'shared/admin_link', obj: obj
-    - if !@seo_page.nil? && (@seo_page.id != obj.id || @seo_page.class.name != obj.class.name)
-      = render 'shared/admin_link', obj: @seo_page
-
-  - content_for :meta do
-    - if obj.respond_to?(:seo) 
-      = render 'shared/meta', obj: obj
-      = render 'shared/og', title: obj.get_og_title, image: obj.og_image
-
-  - content_for :title do
-    - if obj.respond_to?(:title) and obj.title
-      = obj.title
+  - _cache_helper = (Hancock::Pages.config.cache_support ? :hancock_cache : :cache)
+  / - send _cache_helper [obj, @seo_page, (current_user and current_user.admin?).to_s].uniq do
+  - send _cache_helper [obj, @seo_page].uniq do
+    .text_content
+          
+      - if obj.content.blank?
+        - unless @seo_page.nil?
+          == @seo_page.page_content(self) rescue @seo_page.page_content
+      - else
+        - if obj.is_a?(Hancock::Pages::Page)
+          == obj.page_content(self) rescue obj.page_content
+        - else
+          - if obj.respond_to?(:page_content)
+            == obj.page_content rescue obj.content
+          - else
+            == obj.content
+              
+  / = render 'shared/admin_link', obj: obj
+  / - if !@seo_page.nil? && (@seo_page.id != obj.id || @seo_page.class.name != obj.class.name)
+  /   = render 'shared/admin_link', obj: @seo_page

data/config/locales/hancock.pages.ru.yml

@@ -52,3 +52,8 @@ ru:
 
   activerecord:
     <<: *mongoid
+
+  rails_admin:
+    sort_embedded:
+      hancock/pages/blocksets:
+        blocks: Блоки

data/hancock_cms_pages.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Alexander Kiseliev"]
   spec.email         = ["dev@redrocks.pro"]
 
-  spec.description   = %q{hancock_cms_pages }
+  spec.description   = %q{hancock_cms_pages}
   spec.summary       = %q{hancock_cms_pages}
   spec.homepage      = 'https://github.com/red-rocks/hancock_cms_pages'
   spec.license       = "MIT"
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'hancock_cms', [">=1.0", "<=2.0"]
-  # spec.add_dependency 'hancock_cms', ["~> 1.0", "~> 2.0"]
+  spec.add_dependency 'hancock_cms', [">=1.0.2", "<2.1.x"]
+  # spec.add_dependency 'hancock_cms', ["~> 1.0.2", "~> 2.0"]
 
   spec.add_dependency 'simple-navigation'
 end