hancock_cms 1.0.0.3 → 1.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8048a48f1d926cdbafa92b70bdde1121b9b9aabe
-  data.tar.gz: b62cfdc5efc681a63654bab5d24d2ba9d9406807
+  metadata.gz: c73c9919e423af71ff0ea336d745c1cf035c5bac
+  data.tar.gz: 438396bab11dc25461ac958065000a3b40f1c971
 SHA512:
-  metadata.gz: a6ee9eed742e29caa87904fc2c34c6cce43cff69a64a7ef77d484e11eaa5b1a47da43a06a11eec91ce1845ac636112db5f474d6bc14ff0d01a467f8c212f6d84
-  data.tar.gz: cf940e65c678485fb3744b9721d1e8c82aad881082a2594093497fd1fba4e5607e6147d015fa3fa14071f9698dd0a1dee24d9d811dc5c1bf8db36a4c529a3a56
+  metadata.gz: 5dc52a2fb69be182e8035d79380f51a1d7b2e0570aad51d446d0ba3a240840fff6bf84cdbe6d7bcbe90fa21b3d3084e35ef39df9d2ef76543043fde2a9ec695d
+  data.tar.gz: 56ee7a7d603e9009310b58baca2cac4da51ad1810c4280308f5dd9519f9f87ea8c3349e389d2d884213e29d1c094951311205b2a7f1728e044b63fcee4e4c4f4

data/README.md

@@ -1,5 +1,7 @@
 # HancockCMS
 
+#### Rails 4 support
+
 #### Inspired by [RocketCMS](https://github.com/rs-pro/rocket_cms)
 ### Remaded from [EnjoyCMS](https://github.com/enjoycreative/enjoy_cms)
 

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

@@ -11,6 +11,23 @@ if Hancock.mongoid?
       def default_cache_keys
         self.class.default_cache_keys
       end
+      def set_default_cache_keys(strategy = :append)
+        _old_keys = cache_keys
+
+        _keys = case strategy.to_sym
+        when :append
+          (_old_keys + default_cache_keys).uniq
+        when :overwrite, :replace
+          default_cache_keys
+        else
+          _old_keys
+        end
+        self
+      end
+      def set_default_cache_keys!(strategy = :append)
+        self.set_default_cache_keys(strategy) and self.save
+      end
+
 
       def cache_keys
         cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }

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

@@ -6,19 +6,27 @@ html lang="ru"
     title= yield(:title) || page_title
     = yield :meta
     = csrf_meta_tags
-    = render partial: 'blocks/favicon'
+    
+    / - cache 'favicons', skip_digest: true do
+    /   = render partial: 'blocks/favicon'
 
     - async = false #Rails.env.production?
     = 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
-    css:
-      #{Settings.custom_css(default: '', kind: :css, label: "Дополнительный CSS")}
-    javascript:
-      #{Settings.custom_js(default: '', kind: :js, label: "Дополнительный JS")}
+    - 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)}
+
+  body{class="application_layout #{controller_name} #{action_name} #{controller_name}_#{action_name}"}
 
-  body{class="#{controller_name} #{action_name} #{controller_name}_#{action_name}"}
+    - cache 'preloader', skip_digest: true do
+      = render partial: 'blocks/preloader'
+      
     #root role="main"
     
       header#header
@@ -32,4 +40,4 @@ html lang="ru"
     footer#footer
       = render partial: 'blocks/footer'
 
-    = render partial: 'hancock/toplink/toplink'
+    = render partial: 'hancock/toplink/toplink'

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

@@ -24,15 +24,15 @@ TEXT
 end
 
 generate "devise", "User"
+
+
 ####### ROUTES #######
 
 remove_file 'config/routes.rb'
 create_file 'config/routes.rb' do <<-TEXT
 Rails.application.routes.draw do
   devise_for :users, controllers: {sessions: 'hancock/sessions'}
-
   mount RailsAdmin::Engine => '/admin', as: 'rails_admin'
-
   hancock_cms_routes
 end
 TEXT
@@ -141,10 +141,18 @@ include Hancock::Model
   def self.manager_can_default_actions
     [:show, :read]
   end
-  def manager_cannot_actions
+  def self.manager_cannot_actions
     [:new, :create, :delete, :destroy]
   end
 
+  ######################### RailsAdminUserAbilities #########################
+  # def self.rails_admin_user_defined_visible_actions
+  #   [:user_abilities]
+  # end
+  # has_one :ability, class_name: "RailsAdminUserAbilities::UserAbility", as: :rails_admin_user_abilitable
+  # scope :for_rails_admin, -> { where(:roles.in => ['admin', 'manager']) } # could be any you want, just need to
+  ###########################################################################
+
   cattr_accessor :current_user
 
   # Include default devise modules. Others available are:
@@ -185,7 +193,11 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
     if ::User.admins.all.count == 0
       _email_pass = 'admin@#{app_name.dasherize.downcase}.ru'
       if ::User.new(roles: ["admin"], email: _email_pass, password: _email_pass, password_confirmation: _email_pass).save
+        puts "#################################################################################"
+        puts "#################################################################################"
         puts "AdminUser with email and password '\#{_email_pass}' was created!"
+        puts "#################################################################################"
+        puts "#################################################################################"
       else
         puts 'Creating AdminUser error'
       end
@@ -348,7 +360,7 @@ git commit: %Q{ -m 'Initial commit' }
     end
 
     def mongoid
-      defined? Mongoid
+      !!defined? Mongoid
     end
 
     def app_name

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

@@ -20,8 +20,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

data/lib/hancock/configuration.rb

@@ -38,8 +38,8 @@ module Hancock
       @ability_manager_config = []
       @ability_admin_config = []
 
-      @recaptcha_support = defined?(Recaptcha)
-      @simple_captcha_support = defined?(SimpleCaptcha)
+      @recaptcha_support = !!defined?(Recaptcha)
+      @simple_captcha_support = !!defined?(SimpleCaptcha)
 
       @admin_enter_captcha = @recaptcha_support or @simple_captcha_support
       @registration_captcha = @admin_enter_captcha

data/lib/hancock/controller.rb

@@ -3,7 +3,7 @@ module Hancock::Controller
   included do
     include Hancock::Errors
     include Hancock::Fancybox
-    if defined?(Hancock::Pages)
+    if !!defined?(Hancock::Pages)
       include Hancock::Pages::SeoPages
       include Hancock::Pages::NavMenu
       include Hancock::Pages::Blocksetable

data/lib/hancock/model.rb

@@ -33,7 +33,7 @@ module Hancock
       include Hancock::BooleanField
       include Hancock::SortField
 
-      if Hancock.mongoid? and defined?(RailsAdminComments)
+      if Hancock.mongoid? and !!defined?(RailsAdminComments)
         include RailsAdminComments::Commentable
         include RailsAdminComments::ModelCommentable
       end

data/lib/hancock/rails_admin_ext/config.rb

@@ -40,6 +40,16 @@ module Hancock
 
       action_unvisible_for(:custom_show_in_app, Proc.new { false })
       action_visible_for(:model_settings, Proc.new { false })
+
+      if defined?(RailsAdminNestedSet)
+        action_visible_for(:nested_set, Proc.new { false })
+      end
+
+      if defined?(RailsAdminMultipleFileUpload)
+        action_visible_for(:multiple_file_upload, Proc.new { false })
+        action_visible_for(:multiple_file_upload_collection, Proc.new { false })
+      end
+
     end
 
     def add_action(action_name)
@@ -81,7 +91,7 @@ module Hancock
     def actions_config(rails_admin_actions)
 
       @actions_list.each do |action|
-        if rails_admin_actions.respond_to?(action)
+        if rails_admin_actions.respond_to?(action) and !RailsAdmin::Config::Actions.all.map { |a| a.class.name.demodulize.underscore }.include?(action.to_s)
           rails_admin_actions.send(action) do
             visible do
               if !bindings or bindings[:abstract_model].blank?

data/lib/hancock/version.rb

@@ -1,3 +1,3 @@
 module Hancock
-  VERSION = "1.0.0.3".freeze
+  VERSION = "1.0.0.4".freeze
 end

data/lib/hancock_cms.rb

@@ -81,7 +81,7 @@ module Hancock
       }
     end
     def register_plugin(plugin)
-      Hancock::PLUGINS << plugin unless Hancock::MODELS.include?(plugin)
+      Hancock::PLUGINS << plugin unless Hancock::PLUGINS.include?(plugin)
     end
 
     def clear_history_from_empty_objects

data/template.rb

@@ -106,7 +106,7 @@ gem 'glebtv_mongoid_userstamp', '0.6.2'
 TEXT
 end
 
-RVM_RUBY_VERSION = "2.3.1"
+RVM_RUBY_VERSION = "2.3.3"
 create_file '.ruby-version', "#{RVM_RUBY_VERSION}\n"
 create_file '.ruby-gemset', "#{app_name.underscore}\n"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.0.3
+  version: 1.0.0.4
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -307,6 +307,7 @@ files:
 - app/views/blocks/_favicon.html.slim
 - app/views/blocks/_footer.html.slim
 - app/views/blocks/_header.html.slim
+- app/views/blocks/_preloader.html.slim
 - app/views/devise/passwords/edit.html.slim
 - app/views/devise/passwords/new.html.slim
 - app/views/devise/registrations/edit.html.slim