hancock_cms 2.0.0.2 → 2.0.1.1

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}, path: '/home/ack/www/hancock_cms' #'~> 0.3.7'
+#{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}
 
 gem 'devise'
 
@@ -20,9 +20,6 @@ gem 'cancancan'
 gem 'unicorn'
 gem 'x-real-ip'
 
-#temp
-#gem 'sentry-raven'
-
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
@@ -57,7 +54,7 @@ group :test do
   gem 'factory_girl_rails'
 end
 
-#{if mongoid then "gem 'mongo_session_store-rails4'" else "gem 'activerecord-session_store'" end}
+#{if mongoid then "gem 'mongo_session_store-rails5'" else "gem 'activerecord-session_store'" end}
 
 gem 'slim'
 gem 'sprockets'
@@ -65,5 +62,7 @@ gem 'sprockets'
 gem 'uglifier'
 
 group :production do
+  #temp
+  #gem 'sentry-raven'
   gem "god"
 end

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

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

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

@@ -1,7 +1,12 @@
 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!
+RailsAdminSettings.track_history! if Hancock.config.history_tracking
 <% end %>
 
 RailsAdmin.config do |config|
@@ -39,8 +44,10 @@ RailsAdmin.config do |config|
     edit
     delete
 
-    history_index
-    history_show
+    if Hancock.config.history_tracking
+      history_index
+      history_show
+    end
 
     toggle
     # toggle_menu # for Hancock::Pages
@@ -54,10 +61,11 @@ RailsAdmin.config do |config|
   config.excluded_models ||= []
   config.excluded_models << [
       'RailsAdmin::CustomShowInApp', 'HistoryTracker',
-      'Ckeditor::Asset', 'Ckeditor::AttachmentFile', 'Ckeditor::Picture',
+      'Ckeditor::Asset', 'Ckeditor::AttachmentFile', 'Ckeditor::Picture', 'Ckeditor::Folder',
       '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/hancock_cms.erb

@@ -3,7 +3,8 @@ Hancock.configure do |config|
   # config.main_index_layout = 'application'
   # config.error_layout = 'application'
   #
-  # config.localize = false
+  # config.localize = !!defined?(RailsAdminMongoidLocalizeField) #false
+  # config.raven_support = !!defined?(Raven)
   #
   # config.ability_manager_config = []
   ### example ###
@@ -20,8 +21,8 @@ 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
@@ -29,4 +30,6 @@ Hancock.configure do |config|
   # config.captcha_on_development = false
   #
   # config.history_tracking = false
+  #
+  # config.mongoid_single_collection = nil # or set colection_name or `true` for default (:hancock_master_collection)
 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,7 +36,6 @@ 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/raven.erb

@@ -0,0 +1,13 @@
+if defined?(Raven)
+  Raven.configure do |config|
+    config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
+
+    # config.dsn = 'https://%public%:%secret%@sentry.io/%id%'
+    config.environments = ['production']
+
+    config.async = lambda { |event|
+      Thread.new { Raven.send_event(event) }
+    }
+
+  end
+end

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

@@ -1,5 +1,9 @@
-Host: <%= app_name.downcase %>.ru
+Host: https://<%= app_name.downcase %>.ru
 User-Agent: *
 Allow: /
 Disallow: /admin
-Sitemap: http://<%= app_name.downcase %>.ru/sitemap.xml.gz
+# Disallow: /account
+Disallow: /ckeditor/*
+# Disallow: /goto
+# Disallow: /users
+Sitemap: https://<%= 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.downcase %>
+mongodump --db <%= app_name.underscore %>

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

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

data/lib/hancock/admin.rb

@@ -1,18 +1,67 @@
 module Hancock
   module Admin
-    def self.map_config(is_active = false)
+    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)
+
       Proc.new {
         active is_active
-        label I18n.t('hancock.map')
-        field :address, :string
-        field :map_address, :string
-        field :map_hint, :string
+        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]
+
         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
-        field :lat
-        field :lon
+      }
+    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])
 
         if block_given?
           yield self
@@ -20,12 +69,21 @@ module Hancock
       }
     end
 
-    def self.caching_block(is_active = false)
+    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)
+
       Proc.new {
         active is_active
-        label I18n.t('hancock.cache')
-        field :perform_caching, :toggle
-        field :cache_keys_str, :text
+        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] || {})
 
         if block_given?
           yield self
@@ -33,28 +91,102 @@ module Hancock
       }
     end
 
-    def self.url_block(is_active = false)
+    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)
+
       Proc.new {
         active is_active
-        label I18n.t('hancock.url')
-        field :slugs, :hancock_slugs
-        field :text_slug
+        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
       }
     end
 
-    def self.content_block(is_active = false, options = {})
+
+    def self.insertions_block(is_active = false, options = {})
       if is_active.is_a?(Hash)
-        is_active, fields = (is_active[:active] || false), is_active
+        is_active, options = (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 I18n.t('hancock.content')
-        field :excerpt, :hancock_html unless _excluded_fields.include?(:excerpt)
-        field :content, :hancock_html unless _excluded_fields.include?(:content)
+        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
       }
     end
 
+    def self.user_defined_field_block(field_name, is_active = false, options = {})
+      if field_name.is_a?(Hash)
+        field_name, is_active, options = (field_name[:field_name] || field_name[:field]), (field_name[:active] || false), field_name
+      elsif is_active.is_a?(Hash)
+        is_active, options = (is_active[:active] || false), is_active
+      end
+      field_name = field_name.to_sym
+      render_method = options[:render_method] || "render_#{field_name}"
+
+      fields = (options[:fields] ||= {})
+      field_names = [field_name, render_method]
+      field_showings = get_field_showings(fields, field_names)
+
+      Proc.new {
+        active is_active
+        label options[:label]# || I18n.t('hancock.user_defined_field')
+        field @abstract_model.model.user_defined_fields[field_name][:render_method], :toggle if field_showings[render_method]
+        field field_name, :ck_editor if field_showings[field_name]
+
+        Hancock::RailsAdminGroupPatch::hancock_cms_group(self, options[:fields] || {})
+
+        if block_given?
+          yield self
+        end
+      }
+    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/admin/embedded_element.rb

@@ -1,21 +1,25 @@
 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
+          end if field_showings[:enabled]
           field :name, :string do
             searchable true
-          end
+          end if field_showings[:name]
 
           Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
 
@@ -24,6 +28,7 @@ module Hancock
           end
         }
       end
+
     end
   end
 end