hancock_cms_pages 1.0.0 → 1.0.2

data/lib/generators/hancock/pages/config/templates/hancock_pages.erb

@@ -2,13 +2,26 @@ Hancock::Pages.configure do |config|
   ##### defaults #####
   # config.menu_max_depth = 2
   #
-  # config.seo_support = defined? Hancock::Seo
+  # config.seo_support = !!defined? Hancock::Seo
+  # config.cache_support  = !!defined?(Hancock::Cache)
+  # config.insertions_support = true
   #
-  # config.localize   = Hancock.config.localize
+  # config.localize = Hancock.config.localize
   #
-  # config.breadcrumbs_on_rails_support = defined?(BreadcrumbsOnRails)
+  # config.breadcrumbs_on_rails_support = !!defined?(BreadcrumbsOnRails)
   #
-  # config.model_settings_support = defined?(RailsAdminModelSettings)
-  # config.user_abilities_support = defined?(RailsAdminUserAbilities)
-  # config.ra_comments_support = defined?(RailsAdminComments)
+  # config.model_settings_support = !!defined?(RailsAdminModelSettings)
+  # config.user_abilities_support = !!defined?(RailsAdminUserAbilities)
+  # config.ra_comments_support = !!defined?(RailsAdminComments)
+  #
+  # config.renderer_lib_extends = [
+  # #  ::ActionController::Base,
+  #   ::ActionView::Helpers::TagHelper,
+  #   ::ActionView::Context
+  # ]
+  #
+  # config.verbose_render = Rails.env.development? or Rails.env.test?
+  # config.raven_support = !!(Hancock.config.respond_to?(:raven_support) ? Hancock.config.raven_support : defined?(Raven))
+  #
+  # config.available_layouts = ["application"]
 end

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

@@ -0,0 +1,24 @@
+require 'rails/generators'
+
+module Hancock::Pages::Controllers
+  class DecoratorsGenerator < Rails::Generators::Base
+    source_root File.expand_path('../../../../../../app/controllers/concerns/hancock/pages/decorators', __FILE__)
+    argument :controllers, type: :array, default: []
+
+    desc 'Hancock::Pages Controllers generator'
+    def decorators
+      copied = false
+      (controllers == ['all'] ? permitted_controllers : controllers & permitted_controllers).each do |c|
+        copied = true
+        copy_file "#{c}.rb", "app/controllers/concerns/hancock/pages/decorators/#{c}.rb"
+      end
+      puts "U need to set controllers`s name. One of this: #{permitted_controllers.join(", ")}." unless copied
+    end
+
+    private
+    def permitted_controllers
+      ['pages']
+    end
+
+  end
+end

data/lib/generators/hancock/pages/{migration_generator.rb → migrations/migrations_generator.rb}

@@ -2,12 +2,12 @@ require 'rails/generators'
 require 'rails/generators/active_record'
 
 module Hancock::Pages
-  class MigrationGenerator < Rails::Generators::Base
+  class MigrationsGenerator < Rails::Generators::Base
     include ActiveRecord::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
 
-    desc 'Hancock Pages migration generator'
-    def install
+    desc 'Hancock Pages migrations generator'
+    def migrations
       if Hancock.active_record?
         %w(pages blocks).each do |table_name|
           migration_template "migration_#{table_name}.rb", "db/migrate/hancock_create_#{table_name}.rb"

data/lib/generators/hancock/pages/models/templates/block.erb

@@ -15,19 +15,19 @@ class <%= camelcased_class_name %> < Hancock::Pages::Block
     #super(config)
   end
 
-  def admin_can_user_defined_actions
+  def self.admin_can_user_defined_actions
     [].freeze
   end
-  def admin_cannot_user_defined_actions
+  def self.admin_cannot_user_defined_actions
     [].freeze
   end
-  def manager_can_user_defined_actions
+  def self.manager_can_user_defined_actions
     [].freeze
   end
-  def manager_cannot_user_defined_actions
+  def self.manager_cannot_user_defined_actions
     [].freeze
   end
-  def rails_admin_user_defined_visible_actions
+  def self.rails_admin_user_defined_visible_actions
     [].freeze
   end
 

data/lib/generators/hancock/pages/models/templates/blockset.erb

@@ -12,19 +12,19 @@ class <%= camelcased_class_name %> < Hancock::Pages::Blockset
     #super(config)
   end
 
-  def admin_can_user_defined_actions
+  def self.admin_can_user_defined_actions
     [].freeze
   end
-  def admin_cannot_user_defined_actions
+  def self.admin_cannot_user_defined_actions
     [].freeze
   end
-  def manager_can_user_defined_actions
+  def self.manager_can_user_defined_actions
     [].freeze
   end
-  def manager_cannot_user_defined_actions
+  def self.manager_cannot_user_defined_actions
     [].freeze
   end
-  def rails_admin_user_defined_visible_actions
+  def self.rails_admin_user_defined_visible_actions
     [].freeze
   end
 

data/lib/generators/hancock/pages/models/templates/menu.erb

@@ -15,19 +15,19 @@ class <%= camelcased_class_name %> < Hancock::Pages::Menu
     #super(config)
   end
 
-  def admin_can_user_defined_actions
+  def self.admin_can_user_defined_actions
     [].freeze
   end
-  def admin_cannot_user_defined_actions
+  def self.admin_cannot_user_defined_actions
     [].freeze
   end
-  def manager_can_user_defined_actions
+  def self.manager_can_user_defined_actions
     [].freeze
   end
-  def manager_cannot_user_defined_actions
+  def self.manager_cannot_user_defined_actions
     [].freeze
   end
-  def rails_admin_user_defined_visible_actions
+  def self.rails_admin_user_defined_visible_actions
     [].freeze
   end
 

data/lib/generators/hancock/pages/models/templates/page.erb

@@ -3,9 +3,9 @@ class <%= camelcased_class_name %> < Hancock::Pages::Page
   # has_and_belongs_to_many :menus, inverse_of: :pages, class_name: "Hancock::Pages::Menu"
 
   # if Hancock.rails4?
-  #   belongs_to :connectable, polymorphic: true, overwrite: true
+  #   belongs_to :hancock_connectable, polymorphic: true, overwrite: true
   # else
-  #   belongs_to :connectable, polymorphic: true, overwrite: true, optional: true
+  #   belongs_to :hancock_connectable, polymorphic: true, overwrite: true, optional: true
   # end
 
   # def nav_options_additions
@@ -21,19 +21,19 @@ class <%= camelcased_class_name %> < Hancock::Pages::Page
     #super(config)
   end
 
-  def admin_can_user_defined_actions
+  def self.admin_can_user_defined_actions
     [].freeze
   end
-  def admin_cannot_user_defined_actions
+  def self.admin_cannot_user_defined_actions
     [].freeze
   end
-  def manager_can_user_defined_actions
+  def self.manager_can_user_defined_actions
     [].freeze
   end
-  def manager_cannot_user_defined_actions
+  def self.manager_cannot_user_defined_actions
     [].freeze
   end
-  def rails_admin_user_defined_visible_actions
+  def self.rails_admin_user_defined_visible_actions
     [].freeze
   end
 

data/lib/hancock/pages/admin.rb

@@ -1,21 +1,34 @@
 module Hancock::Pages
   module Admin
 
-    def self.menu_block(is_active = false)
+    def self.menu_block(is_active = false, options = {})
+      if is_active.is_a?(Hash)
+        is_active, options = (is_active[:active] || false), is_active
+      end
+
       Proc.new {
         active false
-        label I18n.t('hancock.menu_title')
-        field :menus
+        label options[:label] || I18n.t('hancock.menu_title')
+        field :menus, :hancock_multiselect do
+          searchable :name, :text_slug
+        end
         field :fullpath, :string do
           help I18n.t('hancock.with_final_slash')
+          searchable true
         end
         field :regexp, :string do
           help I18n.t('hancock.page_url_regex')
+          searchable true
         end
         field :redirect, :string do
           help I18n.t('hancock.final_in_menu')
+          searchable true
+        end
+        field :text_slug do
+          searchable true
         end
-        field :text_slug
+
+        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields] || {})
 
         if block_given?
           yield self
@@ -23,19 +36,33 @@ module Hancock::Pages
       }
     end
 
-    def self.wrapper_block(is_active = false)
+    def self.wrapper_block(is_active = false, options = {})
+      if is_active.is_a?(Hash)
+        is_active, options = (is_active[:active] || false), is_active
+      end
+
       Proc.new {
         active is_active
+        options[:label] and label(options[:label])
         field :use_wrapper, :toggle
-        field :wrapper_tag, :string
-        field :wrapper_class, :string
-        field :wrapper_id, :string
+        field :wrapper_tag, :string do
+          searchable true
+        end
+        field :wrapper_class, :string do
+          searchable true
+        end
+        field :wrapper_id, :string do
+          searchable true
+        end
         field :wrapper_attributes, :text do
+          searchable true
           formatted_value do
             bindings[:object] and bindings[:object].wrapper_attributes ? bindings[:object].wrapper_attributes.to_json : "{}"
           end
         end
 
+        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields] || {})
+
         if block_given?
           yield self
         end

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

@@ -7,8 +7,10 @@ module Hancock::Pages
         elsif nav_label.is_a?(Array)
           nav_label, fields = nil, nav_label
         end
+
         Proc.new {
           navigation_label(!nav_label.blank? ? nav_label : I18n.t('hancock.pages'))
+          object_label_method :rails_admin_label
 
           field :enabled, :toggle do
             searchable false
@@ -32,7 +34,14 @@ module Hancock::Pages
             searchable true
           end
 
-          field :file_path, :string do
+          # field :file_path, :string do
+          #   searchable true
+          # end
+          field :file_path, :enum do
+            enum do
+              Hancock::Pages.whitelist_enum || []
+            end
+            multiple false
             searchable true
           end
           field :content, :hancock_html do
@@ -56,6 +65,10 @@ module Hancock::Pages
           # field :content_html, :ck_editor
           # field :content_clear, :toggle
 
+          if Hancock::Pages.config.insertions_support
+            group :insertions, &Hancock::Admin.insertions_block
+          end
+
           Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 
           # field :blocksets do

data/lib/hancock/pages/admin/blockset.rb

@@ -20,7 +20,37 @@ module Hancock::Pages
             searchable true
           end
 
-          group :wrapper, &Hancock::Pages::Admin.wrapper_block
+          group :blocks do
+            weight 10
+            active false
+            field :blocks do
+              eager_load(false) rescue nil
+              queryable true
+              searchable  do
+                [
+                  {blocks: :_id},
+                  {blocks: :name},
+                  {blocks: :menu_link_content},
+                  {blocks: :pageblock_selector},
+                  {blocks: :file_path},
+                  {blocks: :content_html}
+                ]
+              end
+              # searchable_columns do
+              #   [
+              #     { column: "#{abstract_model.table_name}.blocks.name",   type: :string },
+              #     { column: "#{abstract_model.table_name}.blocks.menu_link_content",  type: :string },
+              #     { column: "#{abstract_model.table_name}.blocks.pageblock_selector",  type: :string },
+              #     { column: "#{abstract_model.table_name}.blocks.file_path",  type: :string },
+              #     { column: "#{abstract_model.table_name}.blocks.content_html",  type: :string }
+              #   ]
+              # end
+            end
+          end
+
+          group(:wrapper, &Hancock::Pages::Admin.wrapper_block do
+            weight 5
+          end)
           # group :wrapper do
           #   active false
           #   field :use_wrapper, :toggle
@@ -34,13 +64,6 @@ module Hancock::Pages
           #   end
           # end
 
-          group :blocks do
-            active false
-            field :blocks do
-              searchable :name
-            end
-          end
-
           Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 
           # field :blocks do
@@ -57,9 +80,9 @@ module Hancock::Pages
           # end
 
           sort_embedded(
-              {
-                  fields: [:blocks]
-              }
+            {
+              fields: [:blocks]
+            }
           )
 
           if block_given?

data/lib/hancock/pages/admin/menu.rb

@@ -34,7 +34,9 @@ module Hancock::Pages
             formatted_value {}
           end
 
-          group :caching, &Hancock::Admin.caching_block
+          if Hancock::Pages.config.cache_support
+            group :caching, &Hancock::Cache::Admin.caching_block
+          end
 
           Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 

data/lib/hancock/pages/admin/page.rb

@@ -22,7 +22,7 @@ module Hancock::Pages
             field :name do
               searchable true
             end
-            field :connectable do
+            field :hancock_connectable do
               searchable :name
             end
             field :fullpath do
@@ -36,17 +36,33 @@ module Hancock::Pages
             end
             field :slug do
               searchable true
+              searchable_columns do
+                [{column: "#{abstract_model.table_name}._slugs", type: :string}]
+              end
+              queryable true
+            end
+
+            # group :content, &Hancock::Admin.content_block(excluded_fields: [:excerpt])
+            group :content, &Hancock::Admin.content_block(excerpt: false)
+            if Hancock::Pages.config.cache_support
+              group :caching, &Hancock::Cache::Admin.caching_block
             end
           end
 
           edit do
             field :enabled, :toggle
             field :name
-            field :connectable do
+            field :layout_name, :enum do
+              enum do
+                ::Hancock::Pages.config.available_layouts
+              end
+            end
+            field :hancock_connectable do
               read_only true
             end
 
-            group :content, &Hancock::Admin.content_block(excluded_fields: [:excerpt])
+            # group :content, &Hancock::Admin.content_block(excluded_fields: [:excerpt])
+            group :content, &Hancock::Admin.content_block(excerpt: false)
             # group :content do
             #   active false
             #   field :excerpt, :hancock_html
@@ -57,6 +73,8 @@ module Hancock::Pages
             #   # field :content_clear, :toggle
             # end
 
+            group :wrapper, &Hancock::Pages::Admin.wrapper_block
+
 
             group :menu, &Hancock::Pages::Admin.menu_block
             # group :menu do
@@ -75,9 +93,15 @@ module Hancock::Pages
             #   field :text_slug
             # end
 
+            if Hancock::Pages.config.cache_support
+              group :caching, &Hancock::Cache::Admin.caching_block
+            end
+
             Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 
-            group :seo_n_sitemap, &Hancock::Seo::Admin.seo_n_sitemap_block
+            if Hancock::Pages.config.seo_support
+              group :seo_n_sitemap, &Hancock::Seo::Admin.seo_n_sitemap_block
+            end
             # group :seo do
             #   active false
             #   field :seo
@@ -87,7 +111,13 @@ module Hancock::Pages
             #   field :sitemap_data
             # end
 
-            # group :caching, &Hancock::Admin.caching_block
+            if Hancock::Pages.config.cache_support
+              group :caching, &Hancock::Cache::Admin.caching_block
+            end
+
+            if Hancock::Pages.config.insertions_support
+              group :insertions, &Hancock::Admin.insertions_block
+            end
           end
 
           nested_set({