hancock_cms 2.0.0.1 → 2.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac27be322e86dbe06cbb665f135b45bcbaa2f26
-  data.tar.gz: 32d116ff67f3e7e565eeeb3c2cc2b1f6e4d2bfbb
+  metadata.gz: '0596d7c61478cd10684f4d1c9c9b5361de0f3de5'
+  data.tar.gz: 4f4c14ff3ddf539e96ea445df5d0510986c7d4a8
 SHA512:
-  metadata.gz: a7385fdec75273456f88842cae88d01435053caee1c479155790e9469ff551908fd4a1e8c1191faa28bfc7deed0985f70ef2e3598f9f9e26aaaa6953e6d069b7
-  data.tar.gz: d418df9900372477a720aeae8c4d10fcf913939b0464b1cd792ef06e89b43277b33f9e2f6d00da04f48ecb868407744215f3f3cba5e2ac3a32f6ad137e4c2472
+  metadata.gz: 0747b77095baeadfe3bcd8c0dbc427234a2eb569586264bad110e5cc1d1e09fc971df94a63ddd0bbef331727fd0d065e4781a47d389943e9311dc45be81fcf1d
+  data.tar.gz: ef3f1fbd6012aecc0eecae628dc76365d60653e6b94525e670c4dafc6253bae1506bc3858633f05bab3ab7ead7046ef79d7b9504ab744a3e0c54e5d43d3ee7d3

data/.ruby-version

@@ -1 +1 @@
-2.4.0-preview1
+2.3.3

data/README.md

@@ -29,7 +29,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install hancock_cms -v 2.0.0
+    $ gem install hancock_cms -v 2.0
 
 For activerecord, generate migrations and run them
 
@@ -48,7 +48,7 @@ Make sure you have rails 5.0 installed
 If not, uninstall rails and install again
 
     gem uninstall rails
-    gem install rails -v 5.0.0
+    gem install rails -v 5.0
 
 Then, for mongoid:
 

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/config/initializers/nested_set_patch.rb

@@ -0,0 +1,89 @@
+# Patach for glebtv-mongoid_nested_set and rails5 (belongs_to is required)
+require 'glebtv-mongoid_nested_set'
+
+module Mongoid::Acts::NestedSet
+  module Base
+    # Configuration options are:
+    #
+    # * +:parent_field+ - field name to use for keeping the parent id (default: parent_id)
+    # * +:left_field+ - field name for left boundary data, default 'lft'
+    # * +:right_field+ - field name for right boundary data, default 'rgt'
+    # * +:outline_number_field+ - field name for the number field, default nil.  If set,
+    #   the value will be used as a field name to keep track of each node's
+    #   "outline number" (e.g. 1.2.5).
+    # * +:scope+ - restricts what is to be considered a list.  Given a symbol, it'll attach
+    #   "_id" (if it hasn't been already) and use that as the foreign key restriction.  You
+    #   can also pass an array to scope by multiple attributes
+    # * +:dependent+ - behavior for cascading destroy.  If set to :destroy, all the child
+    #   objects are destroyed alongside this object by calling their destroy method.  If set
+    #   to :delete_all (default), all the child objects are deleted without calling their
+    #   destroy method.
+    # * +:klass+ - class to use for queries (defaults to self)
+    #
+    # See Mongoid::Acts::NestedSet::ClassMethods for a list of class methods and
+    # Mongoid::Acts::NestedSet::InstanceMethods for a list of instance methods added to
+    # acts_as_nested_set models
+    def acts_as_nested_set(options = {})
+      options = {
+        :parent_field => 'parent_id',
+        :left_field => 'lft',
+        :right_field => 'rgt',
+        :outline_number_field => nil,
+        :dependent => :delete_all, # or :destroy
+        :klass => self,
+      }.merge(options)
+
+      if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
+        options[:scope] = "#{options[:scope]}_id".intern
+      end
+
+      class_attribute :acts_as_nested_set_options, :instance_writer => false
+      self.acts_as_nested_set_options = options
+
+      unless self.is_a?(Document::ClassMethods)
+        include Document
+        include OutlineNumber if outline_number_field_name
+
+        field left_field_name, :type => Integer
+        field right_field_name, :type => Integer
+        field outline_number_field_name, :type => String if outline_number_field_name
+        field :depth, :type => Integer
+
+        has_many   :children, :class_name => self.name, :foreign_key => parent_field_name, :inverse_of => :parent, :order => left_field_name.to_sym.asc
+        # was
+        # belongs_to :parent,   :class_name => self.name, :foreign_key => parent_field_name
+        # became
+        belongs_to :parent,   :class_name => self.name, :foreign_key => parent_field_name, required: false
+
+        attr_accessor :skip_before_destroy
+
+        define_callbacks :move, :terminator => callback_terminator
+
+        before_create  :set_default_left_and_right
+        before_save    :store_new_parent
+        after_save     :move_to_new_parent
+        before_destroy :destroy_descendants
+
+        # no assignment to structure fields
+        [left_field_name, right_field_name].each do |field|
+          module_eval <<-"end_eval", __FILE__, __LINE__
+                  def #{field}=(x)
+                    raise NameError, "Unauthorized assignment to #{field}: it's an internal field handled by acts_as_nested_set code, use move_to_* methods instead.", "#{field}"
+                  end
+          end_eval
+        end
+
+        scope :roots, lambda {
+          where(parent_field_name => nil).asc(left_field_name)
+        }
+        scope :leaves, lambda {
+          where("this.#{quoted_right_field_name} - this.#{quoted_left_field_name} == 1").asc(left_field_name)
+        }
+        scope :with_depth, lambda { |level|
+          where(:depth => level).asc(left_field_name)
+        }
+
+      end
+    end
+  end
+end

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

@@ -100,6 +100,7 @@ remove_file 'config/initializers/session_store.rb'
 if mongoid
 create_file 'config/initializers/session_store.rb' do  <<-TEXT
 # Be sure to restart your server when you modify this file.
+
 #Rails.application.config.session_store :cookie_store, key: '_#{app_name.tableize.singularize}_session'
 Rails.application.config.session_store :mongoid_store
 TEXT
@@ -108,6 +109,7 @@ else
 generate 'active_record_store:session_migration'
 create_file 'config/initializers/session_store.rb' do  <<-TEXT
 # Be sure to restart your server when you modify this file.
+
 #Rails.application.config.session_store :cookie_store, key: '_#{app_name.tableize.singularize}_session'
 Rails.application.config.session_store :active_record_store
 TEXT
@@ -143,10 +145,20 @@ 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:
   # :confirmable,  :lockable, :timeoutable and :omniauthable
 TEXT
@@ -159,27 +171,37 @@ gsub_file 'app/models/user.rb', '# field :unlock_token', 'field :unlock_token'
 gsub_file 'app/models/user.rb', '# field :locked_at', 'field :locked_at'
 
 inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
+
   field :name,    type: String
   field :login,   type: String
   field :roles,   type: Array, default: []
+
   before_save do
     self.roles ||= []
     self.roles.reject! { |r| r.blank? }
   end
+
   AVAILABLE_ROLES = ["admin", "manager", "client"]
+
   AVAILABLE_ROLES.each do |r|
     class_eval <<-EVAL
       def \#{r}?
         self.roles and self.roles.include?("\#{r}")
       end
+
       scope :\#{r.pluralize}, -> { any_in(roles: "\#{r}") }
     EVAL
   end
+
   def self.generate_first_admin_user
     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
@@ -187,6 +209,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
       puts 'AdminUsers are here already'
     end
   end
+
   def self.generate_first_manager_user
     if ::User.managers.all.count == 0
       _email_pass = 'manager@#{app_name.dasherize.downcase}.ru'
@@ -199,6 +222,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
       puts 'ManagerUsers are here already'
     end
   end
+
   rails_admin do
     list do
       field :email
@@ -211,6 +235,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
         end
       end
     end
+
     edit do
       group :login do
         active false
@@ -228,21 +253,25 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
           end
         end
       end
+
       group :roles do
         active false
         field :roles, :enum do
           enum do
             AVAILABLE_ROLES
           end
+
           multiple do
             true
           end
+
           visible do
             render_object = (bindings[:controller] || bindings[:view])
             render_object and render_object.current_user.admin?
           end
         end
       end
+
       group :password do
         active false
         field :password do
@@ -259,6 +288,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
         end
       end
     end
+
   end
 TEXT
 end
@@ -315,6 +345,7 @@ create_file '.gitignore' do <<-TEXT
 #   git config --global core.excludesfile '~/.gitignore_global'
 .idea
 .idea/*
+
 /.bundle
 /log/*.log
 /tmp/*
@@ -333,7 +364,7 @@ git commit: %Q{ -m 'Initial commit' }
     end
 
     def mongoid
-      defined? Mongoid
+      !!defined? Mongoid
     end
 
     def app_name

data/lib/generators/hancock/cms/templates/scripts/server.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 PORT=3000
-echo 'server will by started at '$PORT
+echo 'server will be started at '$PORT
 rails s -b 0.0.0.0 -p $PORT -e development

data/lib/generators/hancock/cms/templates/scripts/server_alt.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 PORT=4000
-echo 'server will by started at '$PORT
+echo 'server will be started at '$PORT
 rails s -b 0.0.0.0 -p $PORT -e development

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 = "2.0.0.1".freeze
+  VERSION = "2.0.0.2".freeze
 end

data/lib/hancock_cms.rb

@@ -76,7 +76,7 @@ module Hancock
       Hancock::MODELS << model unless Hancock::MODELS.include?(model)
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.1
+  version: 2.0.0.2
 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
@@ -344,6 +345,7 @@ files:
 - app/views/shared/_admin_link.html.slim
 - app/views/shared/_messages.html.slim
 - config/initializers/hancock_cms.rb
+- config/initializers/nested_set_patch.rb
 - config/initializers/simple_captcha.rb
 - config/locales/en.hancock.yml
 - config/locales/en.hancock_admin.yml
@@ -449,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use hancock_cms_mongoid or hancock_cms_activerecord