hancock_cms 2.0.0 → 2.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41324f0d660377499046bdff66270b4ab23d9ad0
-  data.tar.gz: e6a662cb66a178c9fc56c15477d1fb32bb51c450
+  metadata.gz: aac27be322e86dbe06cbb665f135b45bcbaa2f26
+  data.tar.gz: 32d116ff67f3e7e565eeeb3c2cc2b1f6e4d2bfbb
 SHA512:
-  metadata.gz: f0658fcaca83270c9c75876b1cf18771ab513fc9b039b6b3a914624b1bd875b105cfd4bf9d65c7625269f3ffc38e036a6f6c0f2836bbc47258097fea620dc7a5
-  data.tar.gz: 773d915222ae733879269d77ef4b09ab1a36c06ce5cb5cd3cd3f8322a1bee0bcf899b1b7cea1325bf9b891a121fda7d708fac653c0b4fd1a64714b7e12061e91
+  metadata.gz: a7385fdec75273456f88842cae88d01435053caee1c479155790e9469ff551908fd4a1e8c1191faa28bfc7deed0985f70ef2e3598f9f9e26aaaa6953e6d069b7
+  data.tar.gz: d418df9900372477a720aeae8c4d10fcf913939b0464b1cd792ef06e89b43277b33f9e2f6d00da04f48ecb868407744215f3f3cba5e2ac3a32f6ad137e4c2472

data/README.md

@@ -52,13 +52,17 @@ If not, uninstall rails and install again
 
 Then, for mongoid:
 
-    rails new my_app -T -O -m https://raw.githubusercontent.com/red-rocks/hancock_cms/rails5/template.rb
+    rails new my_app -B -T -O -m https://raw.githubusercontent.com/red-rocks/hancock_cms/rails5/template.rb
+    cd my_app
+    rails g hancock:cms:setup
 
 for ActiveRecord:
 
-    rails new my_app -T --database=postgresql -m https://raw.githubusercontent.com/red-rocks/hancock_cms/rails5/template.rb
+    rails new my_app -B -T --database=postgresql -m https://raw.githubusercontent.com/red-rocks/hancock_cms/rails5/template.rb
+    cd my_app
+    rails g hancock:cms:setup
 
-generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
+generator creates a new RVM gemset, runs `bundle install` and setup some files (assets, config/initializers/*, routes, etc).
 
 ### Localization
 

data/app/assets/stylesheets/hancock/cms/devise.sass

@@ -8,7 +8,8 @@
   overflow: auto
   white-space: nowrap
   text-align: center
-
+  font-family: "Verdana", SansSerif
+  font-weight: normal
   &:before
     height: 100%
     display: inline-block
@@ -21,9 +22,7 @@
   vertical-align: middle
   text-align: left
   background: #fff
-  webkit-box-shadow:  0 8px 17px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19)
-  -moz-box-shadow:  0 8px 17px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19)
-  box-shadow:  0 8px 17px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19)
+  +box-shadow(0 8px 17px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19))
   min-width: 400px
 
   .white-box
@@ -62,36 +61,30 @@
         .form-control
           background-image: linear-gradient(#9675ce, #9675ce), linear-gradient(rgba(120, 130, 140, 0.13), rgba(120, 130, 140, 0.13))
           border: 0 none
-          border-radius: 0
-          box-shadow: none
+          +border-radius(0)
+          +box-shadow(none)
           background-color: rgba(0, 0, 0, 0)
           background-position: center bottom, center calc(99%)
           background-repeat: no-repeat
           background-size: 0 2px, 100% 1px
           background-color: #ffffff
-          box-shadow: none
           color: #565656
           height: 38px
           width: 100%
           padding: 7px 12px
-          transition: all 300ms linear 0s
+          +transition(all 300ms linear 0s)
           display: block
           font-size: 14px
           line-height: 1.42857143
-          -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s
-          -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s
-          transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s
+          +transition(border-color ease-in-out .15s,box-shadow ease-in-out .15s)
           input
             width: 100%
-            height: 100%
 
         .link-to-recover
           float: right
           padding-right: 10px
           a
-            -webkit-transition: color ease-in-out .15s
-            -o-transition: color ease-in-out .15s
-            transition: color ease-in-out .15s
+            +transition(color ease-in-out .15s)
             color: #333C44
             &:hover
               color: #EF5350
@@ -123,9 +116,7 @@
             cursor: pointer
             max-width: 100%
             color: #333C44
-            -webkit-transition: color ease-in-out .15s
-            -o-transition: color ease-in-out .15s
-            transition: color ease-in-out .15s
+            +transition(color ease-in-out .15s)
           &:hover
             label
               color: #EF5350
@@ -145,9 +136,7 @@
           padding: 10px 16px
           font-size: 18px
           line-height: 1.3333333
-          -webkit-transition: all ease-in-out .15s
-          -o-transition: all ease-in-out .15s
-          transition: all ease-in-out .15s
+          +transition(all ease-in-out .15s)
           &:hover
             background: rgba(#ee5350, 0.8)
             border: 1px solid rgba(#ee5350, 0.8)
@@ -155,3 +144,25 @@
 
       .form-group.links
         margin-top: 25px
+
+.devise-box .white-box form .form-group .form-control
+  padding: 0
+  input
+    position: relative
+    margin: 0
+    border: 0px
+    border-bottom: 1px solid #ccc
+    +transition(all 0.3s)
+    &:focus
+      border-bottom: 1px solid #3c6085
+
+.devise-box .white-box form .form-group .checkbox-primary
+  min-height: auto
+
+.devise-box .white-box form .form-group .checkbox-primary label
+  padding-left: 0px
+  input
+    margin: 0px
+    margin-right: 5px
+    display: inline-block
+    vertical-align: middle

data/app/assets/stylesheets/hancock/rails_admin/cms.theming.sass

@@ -608,7 +608,7 @@ a
       td
         position: relative
         vertical-align: middle
-        text-align: center
+        text-align: left
         padding: 3px 4px 3px 4px
       td.other.right, td.last.links
         padding: 6px 10px 6px 0px
@@ -699,5 +699,5 @@ body.rails_admin .form-horizontal .tab-content .tab-pane
     +box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075))
     +transform(border-color ease-in-out 0.15s box-shadow ease-in-out 0.15s)
 
-body.rails_admin .table td
-  max-width: 120px
+body.rails_admin .table
+  max-width: 120px

data/app/controllers/concerns/hancock/current_user.rb

@@ -1,4 +1,4 @@
-module Hancock::Errors
+module Hancock::CurrentUser
   extend ActiveSupport::Concern
 
   included do

data/app/controllers/concerns/hancock/errors.rb

@@ -1,5 +1,6 @@
 module Hancock::Errors
   extend ActiveSupport::Concern
+
   included do
     if Rails.env.production? || Rails.env.staging? || (respond_to?(:hancock_check_errors) and hancock_check_errors)
       rescue_from Exception, with: :render_500
@@ -90,5 +91,5 @@ module Hancock::Errors
   def render_error(code = 500)
     render template: "hancock/errors/error_#{code}", formats: [:html], handlers: [:slim], layout: Hancock.config.error_layout, status: code
   end
-  
+
 end

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

@@ -11,12 +11,13 @@ if Hancock.mongoid?
       def default_cache_keys
         self.class.default_cache_keys
       end
-      
+
       def cache_keys
         cache_keys_str.split(/\s+/).map { |k| k.strip }.reject { |k| k.blank? }
       end
       field :perform_caching, type: Boolean, default: true
 
+      after_touch :clear_cache
       after_save :clear_cache
       after_destroy :clear_cache
       def clear_cache

data/{config/initializers → app/models/concerns/hancock}/embedded_findable.rb

@@ -1,10 +1,10 @@
 if defined?(Mongoid)
 
-  module Mongoid
+  module Hancock
 
     # Helps to override find method in an embedded document.
     # Usage :
-    #   - add to your model "include Mongoid::EmbeddedFindable"
+    #   - add to your model "include Hancock::EmbeddedFindable"
     #   - override find method with:
     #     def self.find(id)
     #       find_through(Book, 'chapter', id)

data/app/views/layouts/rails_admin/_footer_navigation.html.slim

@@ -17,4 +17,4 @@ ul
   - if logout_path.present?
     li.footer-nav-link = link_to logout_path, title: "Выйти".freeze, method: logout_method
       span
-        i.fa.fa-power-off
+        i.fa.fa-power-off

data/app/views/layouts/rails_admin/application.html.haml

@@ -13,7 +13,7 @@
       RailsAdmin.I18n.init('#{I18n.locale}', JSON.parse("#{j I18n.t("admin.js").to_json}"))
 
   %body.rails_admin
-
+    #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     %nav.admin-navbar.admin-navbar-fixed.bg-red{:role => "navigation"}
       = render "layouts/rails_admin/navigation"
 

data/hancock_cms.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
 
-  spec.add_dependency 'ack_rails_admin_settings'
+  spec.add_dependency 'ack_rails_admin_settings', '~> 1.2'
 
   spec.add_dependency 'kaminari'
 

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

@@ -0,0 +1,344 @@
+require 'rails/generators'
+# require "rails/generators/rails/app/app_generator"
+
+module Hancock::Cms
+  class SetupGenerator < Rails::Generators::Base
+
+    desc 'Hancock CMS Carcass generator'
+    def install
+
+####### DEVISE #######
+
+generate "devise:install"
+gsub_file 'config/initializers/devise.rb', "'please-change-me-at-config-initializers-devise@example.com'", "'noreply@#{app_name.dasherize.downcase}.ru'"
+inject_into_file 'config/initializers/devise.rb', after: /^end/ do <<-TEXT
+
+Rails.application.config.to_prepare do
+  Devise::SessionsController.layout       "hancock/devise/sessions"
+  Devise::RegistrationsController.layout  "hancock/devise/registrations"
+  Devise::ConfirmationsController.layout  "hancock/devise/confirmations"
+  Devise::UnlocksController.layout        "hancock/devise/unlocks"
+  Devise::PasswordsController.layout      "hancock/devise/passwords"
+end
+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
+end
+
+
+####### INITIALIZERS #######
+
+inject_into_file 'config/initializers/assets.rb', before: /\z/ do <<-TEXT
+Rails.application.config.assets.precompile += %w( *.svg )
+Rails.application.config.assets.precompile += %w( ckeditor/* )
+Rails.application.config.assets.precompile += %w( codemirror.js codemirror.css codemirror/**/* )
+TEXT
+end
+
+gsub_file 'config/initializers/backtrace_silencers.rb',
+        "# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }",
+        "Rails.backtrace_cleaner.add_silencer { |line| line =~ /lib\\/(haml|slim|sass|scss|coffee|compass)/ }"
+
+if mongoid
+generate "ckeditor:install", "--orm=mongoid", "--backend=paperclip"
+else
+generate "ckeditor:install", "--orm=active_record", "--backend=paperclip"
+end
+gsub_file 'config/initializers/ckeditor.rb', "# config.image_file_types = %w(jpg jpeg png gif tiff)", "config.image_file_types = %w(jpg jpeg png gif tiff svg)"
+gsub_file 'config/initializers/ckeditor.rb', "# config.authorize_with :cancan",                       "config.authorize_with :cancancan"
+gsub_file 'config/initializers/ckeditor.rb', "# config.assets_languages = ['en', 'uk']",              "config.assets_languages = ['en', 'ru']"
+
+if mongoid
+remove_file 'config/initializers/cookies_serializer.rb'
+create_file 'config/initializers/cookies_serializer.rb' do  <<-TEXT
+# Be sure to restart your server when you modify this file.
+# json serializer breaks Devise + Mongoid. DO NOT ENABLE
+# See https://github.com/plataformatec/devise/pull/2882
+# Rails.application.config.action_dispatch.cookies_serializer = :json
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
+TEXT
+end
+end
+
+gsub_file 'config/initializers/filter_parameter_logging.rb', "[:password]", "[:password, :password_confirmation]"
+
+# generate 'paperclip_optimizer:install'
+# remove_file 'config/initializers/paperclip_optimizer.rb'
+# generate "hancock:cms:paperclip_optimizer"
+
+# generate 'rails_email_preview:install'
+# remove_file 'app/mailer_previews/contact_mailer_preview.rb'
+# create_file 'app/mailer_previews/contact_mailer_preview.rb' do <<-TEXT
+# class ContactMailerPreview
+#   def new_message_email
+#     Hancock::Feedback::ContactMailer.new_message_email(Hancock::Feedback::ContactMessage.all.to_a.sample)
+#   end
+# end
+# TEXT
+# end
+
+generate "hancock:cms:config"
+
+generate "hancock:cms:rack"
+
+generate "hancock:cms:admin"
+
+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
+end
+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
+end
+end
+
+# unless mongoid
+#   generate 'simple_captcha'
+# end
+
+generate "simple_form:install"
+
+
+####### CONTROLLERS #######
+
+remove_file 'app/controllers/application_controller.rb'
+create_file 'app/controllers/application_controller.rb' do <<-TEXT
+class ApplicationController < ActionController::Base
+  include Hancock::Controller
+end
+TEXT
+end
+
+
+####### MODELS #######
+
+generate "hancock:cms:ability"
+
+gsub_file 'app/models/user.rb', '# :confirmable, :lockable, :timeoutable and :omniauthable' do <<-TEXT
+include Hancock::Model
+  include Hancock::Enableable
+  include Hancock::RailsAdminPatch
+  def self.manager_can_default_actions
+    [:show, :read]
+  end
+  def manager_cannot_actions
+    [:new, :create, :delete, :destroy]
+  end
+  cattr_accessor :current_user
+  # Include default devise modules. Others available are:
+  # :confirmable,  :lockable, :timeoutable and :omniauthable
+TEXT
+end
+
+gsub_file 'app/models/user.rb', ':registerable,', ' :lockable,'
+if mongoid
+gsub_file 'app/models/user.rb', '# field :failed_attempts', 'field :failed_attempts'
+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 "AdminUser with email and password '\#{_email_pass}' was created!"
+      else
+        puts 'Creating AdminUser error'
+      end
+    else
+      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'
+      if ::User.create(roles: ["manager"], email: _email_pass, password: _email_pass, password_confirmation: _email_pass)
+        puts "ManagerUser with email and password '\#{_email_pass}' was created!"
+      else
+        puts 'Creating ManagerUser error'
+      end
+    else
+      puts 'ManagerUsers are here already'
+    end
+  end
+  rails_admin do
+    list do
+      field :email
+      field :name
+      field :login
+      field :roles do
+        pretty_value do
+          render_object = (bindings[:controller] || bindings[:view])
+          render_object.content_tag(:p, bindings[:object].roles.join(", ")) if render_object
+        end
+      end
+    end
+    edit do
+      group :login do
+        active false
+        field :email, :string do
+          visible do
+            render_object = (bindings[:controller] || bindings[:view])
+            render_object and (render_object.current_user.admin? or (render_object.current_user.manager? and render_object.current_user == bindings[:object]))
+          end
+        end
+        field :name, :string
+        field :login, :string do
+          visible do
+            render_object = (bindings[:controller] || bindings[:view])
+            render_object and render_object.current_user.admin?
+          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
+          visible do
+            render_object = (bindings[:controller] || bindings[:view])
+            render_object and (render_object.current_user.admin? or render_object.current_user == bindings[:object])
+          end
+        end
+        field :password_confirmation do
+          visible do
+            render_object = (bindings[:controller] || bindings[:view])
+            render_object and (render_object.current_user.admin? or render_object.current_user == bindings[:object])
+          end
+        end
+      end
+    end
+  end
+TEXT
+end
+end
+
+
+###### HANCOCK OTHERS ######
+
+unless mongoid
+generate "hancock:cms:migration"
+generate "rails_admin_settings:migration"
+end
+
+remove_file 'app/views/layouts/application.html.erb'
+generate "hancock:cms:layout"
+
+unless mongoid
+rake "db:migrate"
+end
+
+run 'rails r "User.generate_first_admin_user"'
+
+remove_file 'app/assets/stylesheets/application.css'
+remove_file 'app/assets/javascripts/application.js'
+generate "hancock:cms:assets", app_name
+
+remove_file 'public/robots.txt'
+generate "hancock:cms:robots", app_name
+
+#god+unicorn
+generate "hancock:cms:unicorn_god", app_name
+#scripts
+generate "hancock:cms:scripts", app_name
+
+FileUtils.cp(Pathname.new(destination_root).join('config', 'secrets.yml').to_s, Pathname.new(destination_root).join('config', 'secrets.yml.example').to_s)
+
+unless mongoid
+generate "paper_trail:install"
+generate "friendly_id"
+rake "db:migrate"
+end
+
+generate "rspec:install"
+
+
+####### GIT #######
+
+remove_file '.gitignore'
+create_file '.gitignore' do <<-TEXT
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+.idea
+.idea/*
+/.bundle
+/log/*.log
+/tmp/*
+/public/assets
+/public/ckeditor_assets
+Gemfile.lock
+TEXT
+end
+
+create_file 'extra/.gitkeep', ''
+
+git :init
+git add: "."
+git commit: %Q{ -m 'Initial commit' }
+
+    end
+
+    def mongoid
+      defined? Mongoid
+    end
+
+    def app_name
+      Rails.application.class.parent_name
+    end
+
+  end
+end

data/lib/generators/hancock/cms/templates/assets/javascripts/application.coffee.erb

@@ -1,5 +1,5 @@
 #= require hancock/cms
 
-#= require_tree hancock/app
+#= require hancock/app/back_to_top
 
 # require_tree ./app

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

@@ -27,4 +27,6 @@ Hancock.configure do |config|
   # config.registration_captcha = config.admin_enter_captcha
   #
   # config.captcha_on_development = false
+  #
+  # config.history_tracking = false
 end

data/lib/hancock/admin/embedded_element.rb

@@ -3,8 +3,11 @@ module Hancock
     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
+
         Proc.new {
           navigation_label(nav_label || I18n.t('hancock.cms'))
           field :enabled, :toggle do

data/lib/hancock/configuration.rb

@@ -27,6 +27,8 @@ module Hancock
 
     attr_accessor :captcha_on_development
 
+    attr_accessor :history_tracking
+
     def initialize
       @main_index_layout = 'application'
       @error_layout = 'application'
@@ -43,6 +45,8 @@ module Hancock
       @registration_captcha = @admin_enter_captcha
 
       @captcha_on_development = false
+
+      @history_tracking = false 
     end
   end
 end

data/lib/hancock/engine.rb

@@ -10,39 +10,43 @@ module Hancock
       # Write default email settings to DB so they can be changed.
 
       #temp
-      # begin
-      #   if Settings and Settings.table_exists?
+      begin
+        if Settings and Settings.table_exists?
       #     Settings.default_email_from(default: 'noreply@site.domain')
       #     Settings.form_email(default: 'admin@site.domain')
       #     Settings.email_topic(default: 'с сайта')
-      #   end
-      # rescue
-      # end
-    end
-    initializer 'hancock_cms.paperclip' do
-      # require 'paperclip/style'
-      # module ::Paperclip
-      #   class Style
-      #     alias_method :processor_options_without_auto_orient, :processor_options
-      #     def processor_options
-      #       processor_options_without_auto_orient.merge(auto_orient: false)
-      #     end
-      #   end
-      # end
+          Settings.logo_image(kind: :image)
+        end
+      rescue
+      end
     end
+    # initializer 'hancock_cms.paperclip' do
+    #   # require 'paperclip/style'
+    #   # module ::Paperclip
+    #   #   class Style
+    #   #     alias_method :processor_options_without_auto_orient, :processor_options
+    #   #     def processor_options
+    #   #       processor_options_without_auto_orient.merge(auto_orient: false)
+    #   #     end
+    #   #   end
+    #   # end
+    # end
 
-    config.after_initialize do
-      # trigger autoload so models are registered in Mongoid::Elasticearch
-      # Hancock.config.search_models.map(&:constantize)
+    # config.after_initialize do
+    #   # trigger autoload so models are registered in Mongoid::Elasticearch
+    #   # Hancock.config.search_models.map(&:constantize)
+    #
+    #   # Write default email settings to DB so they can be changed.
+    #   begin
+    #     if Settings and Settings.table_exists?
+    #       # Settings.default_email_from(default: 'noreply@site.domain')
+    #       # Settings.form_email(default: 'admin@site.domain')
+    #       # Settings.email_topic(default: 'с сайта')
+    #       Settings.logo_image(kind: :image)
+    #     end
+    #   rescue
+    #   end
+    # end
 
-      # Write default email settings to DB so they can be changed.
-      if Settings and Settings.table_exists?
-        # Settings.default_email_from(default: 'noreply@site.domain')
-        # Settings.form_email(default: 'admin@site.domain')
-        # Settings.email_topic(default: 'с сайта')
-        #
-        Settings.logo_image(kind: :image)
-      end
-    end
   end
 end

data/lib/hancock/model.rb

@@ -22,11 +22,13 @@ module Hancock
         include RailsAdminComments::ModelCommentable
       end
 
-      if Hancock.mongoid?
-        if defined?(TrackablePatch)
-          include TrackablePatch
-        elsif defined?(Trackable)
-          include Trackable
+      if Hancock.config.history_tracking
+        if Hancock.mongoid?
+          if defined?(TrackablePatch)
+            include TrackablePatch
+          elsif defined?(Trackable)
+            include Trackable
+          end
         end
       end
 

data/lib/hancock/models/mongoid/embedded_element.rb

@@ -4,10 +4,12 @@ module Hancock
       module EmbeddedElement
         extend ActiveSupport::Concern
 
+        include Hancock::EmbeddedFindable
+
         included do
           field :name, type: String, localize: Hancock.configuration.localize, default: ""
         end
-        
+
       end
     end
   end

data/lib/hancock/rails_admin_ext/config.rb

@@ -84,19 +84,23 @@ module Hancock
         if rails_admin_actions.respond_to?(action)
           rails_admin_actions.send(action) do
             visible do
-              ret = false
-              if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
-                ret = bindings[:abstract_model].model.rails_admin_visible_actions.include?(action)
+              if !bindings or bindings[:abstract_model].blank?
+                true
               else
-                if visibility = Hancock.rails_admin_config.actions_visibility[action]
-                  if visibility.is_a?(Proc)
-                    ret = visibility.call(self)
-                  else
-                    ret = visibility.include? bindings[:abstract_model].model_name
+                ret = false
+                if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
+                  ret = bindings[:abstract_model].model.rails_admin_visible_actions.include?(action)
+                else
+                  if visibility = Hancock.rails_admin_config.actions_visibility[action]
+                    if visibility.is_a?(Proc)
+                      ret = visibility.call(self)
+                    else
+                      ret = visibility.include? bindings[:abstract_model].model_name
+                    end
                   end
-                end
-              end # if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
-              ret
+                end # if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
+                ret
+              end # !bindings or bindings[:abstract_model].blank?
             end # visible do
           end # rails_admin_actions.send(action) do
         end # if rails_admin_actions.respond_to?(action)

data/lib/hancock/version.rb

@@ -1,3 +1,3 @@
 module Hancock
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.0.1".freeze
 end

data/template.rb

@@ -28,10 +28,8 @@ gem 'sass-rails', '~> 5.0'
 gem 'compass'
 gem 'compass-rails'
 
-gem 'remotipart', github: 'mshibuya/remotipart'
-gem 'rails_admin', '>= 1.0.0.rc'
-# #{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, github: 'red-rocks/hancock_cms', branch: 'rails5'
-#{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, path: "/home/ack/www/redrocks/hancock"
+gem 'rails_admin', '~> 1.1'
+
 
 # #{if mongoid then "gem 'glebtv-mongoid-paperclip'" else "gem 'paperclip'" end}
 # gem "image_optim"
@@ -39,10 +37,16 @@ gem 'rails_admin', '>= 1.0.0.rc'
 # gem 'ack-paperclip-meta', github: "red-rocks/paperclip-meta"
 
 # gem 'rails_admin_multiple_file_upload'
+gem 'rails_admin_user_abilities', '~> 0.2.0'
 # gem 'rails_admin_user_abilities', github: "red-rocks/rails_admin_user_abilities"
+gem 'rails_admin_model_settings', '~> 0.3.0'
 # gem 'rails_admin_model_settings', github: "red-rocks/rails_admin_model_settings"
 
-gem 'devise'
+# #{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, github: 'red-rocks/hancock_cms', branch: 'rails5'
+#{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, path: "/home/ack/www/redrocks/hancock"
+
+# gem 'recaptcha', require: 'recaptcha/rails'
+# gem 'glebtv-simple_captcha'
 
 gem 'slim-rails'
 gem 'rs_russian'
@@ -66,7 +70,8 @@ group :development do
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 
-  gem 'ack_favicon_maker_rails', github: 'ack43/favicon_maker_rails'
+  gem 'ack_favicon_maker_rails', '~> 1.0.1'
+  # gem 'ack_favicon_maker_rails', github: 'ack43/favicon_maker_rails'
 
   # gem 'rails_email_preview', '~> 1.0.3'
 
@@ -99,25 +104,24 @@ group :development, :test do
   gem 'byebug', platform: :mri
 end
 
-gem 'glebtv_mongoid_userstamp', '0.7.0'
-
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 group :production do
   gem "god"
 end
+
+gem 'glebtv_mongoid_userstamp', '0.7.0'
 TEXT
 end
 
-RVM_RUBY_VERSION = "2.4.0-preview1"
+RVM_RUBY_VERSION = "2.3.3"#"2.4.0-preview1"
 create_file '.ruby-version', "#{RVM_RUBY_VERSION}\n"
 create_file '.ruby-gemset', "#{app_name.underscore}\n"
-# run "rvm use #{RVM_RUBY_VERSION} && rvm gemset create #{app_name}"
-# run "rvm use #{RVM_RUBY_VERSION}@#{app_name} && gem install bundler"
-# run "rvm gemset list"
-run 'bundle install --without production'
 
+run "rvm #{RVM_RUBY_VERSION} do rvm gemset create #{app_name.underscore}"
+run "rvm #{RVM_RUBY_VERSION}@#{app_name.underscore} do gem install bundler"
+run "rvm #{RVM_RUBY_VERSION}@#{app_name.underscore} do bundle install --without production"
 
 ####### CONFIG #######
 
@@ -232,346 +236,3 @@ module #{app_name.underscore.camelcase}
 end
 TEXT
 end
-
-
-####### DEVISE #######
-
-generate "devise:install"
-gsub_file 'config/initializers/devise.rb', "'please-change-me-at-config-initializers-devise@example.com'", "'noreply@#{app_name.dasherize.downcase}.ru'"
-inject_into_file 'config/initializers/devise.rb', after: /^end/ do <<-TEXT
-Rails.application.config.to_prepare do
-  Devise::SessionsController.layout       "hancock/devise/sessions"
-  Devise::RegistrationsController.layout  "hancock/devise/registrations"
-  Devise::ConfirmationsController.layout  "hancock/devise/confirmations"
-  Devise::UnlocksController.layout        "hancock/devise/unlocks"
-  Devise::PasswordsController.layout      "hancock/devise/passwords"
-end
-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'
-  mount Ckeditor::Engine => '/ckeditor'
-
-  hancock_cms_routes
-end
-TEXT
-end
-
-
-####### INITIALIZERS #######
-
-inject_into_file 'config/initializers/assets.rb', before: /\z/ do <<-TEXT
-Rails.application.config.assets.precompile += %w( *.svg )
-Rails.application.config.assets.precompile += %w( ckeditor/* )
-Rails.application.config.assets.precompile += %w( codemirror.js codemirror.css codemirror/**/* )
-TEXT
-end
-
-gsub_file 'config/initializers/backtrace_silencers.rb',
-          "# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }",
-          "Rails.backtrace_cleaner.add_silencer { |line| line =~ /lib\\/(haml|slim|sass|scss|coffee|compass)/ }"
-
-if mongoid
-  generate "ckeditor:install", "--orm=mongoid", "--backend=paperclip"
-else
-  generate "ckeditor:install", "--orm=active_record", "--backend=paperclip"
-end
-gsub_file 'config/initializers/ckeditor.rb', "# config.image_file_types = %w(jpg jpeg png gif tiff)", "config.image_file_types = %w(jpg jpeg png gif tiff svg)"
-gsub_file 'config/initializers/ckeditor.rb', "# config.authorize_with :cancan",                       "config.authorize_with :cancancan"
-gsub_file 'config/initializers/ckeditor.rb', "# config.assets_languages = ['en', 'uk']",              "config.assets_languages = ['en', 'ru']"
-
-if mongoid
-remove_file 'config/initializers/cookies_serializer.rb'
-create_file 'config/initializers/cookies_serializer.rb' do  <<-TEXT
-# Be sure to restart your server when you modify this file.
-# json serializer breaks Devise + Mongoid. DO NOT ENABLE
-# See https://github.com/plataformatec/devise/pull/2882
-# Rails.application.config.action_dispatch.cookies_serializer = :json
-Rails.application.config.action_dispatch.cookies_serializer = :marshal
-TEXT
-end
-end
-
-gsub_file 'config/initializers/filter_parameter_logging.rb', "[:password]", "[:password, :password_confirmation]"
-
-# generate 'paperclip_optimizer:install'
-# remove_file 'config/initializers/paperclip_optimizer.rb'
-# generate "hancock:cms:paperclip_optimizer"
-
-# generate 'rails_email_preview:install'
-# remove_file 'app/mailer_previews/contact_mailer_preview.rb'
-# create_file 'app/mailer_previews/contact_mailer_preview.rb' do <<-TEXT
-# class ContactMailerPreview
-#   def new_message_email
-#     Hancock::Feedback::ContactMailer.new_message_email(Hancock::Feedback::ContactMessage.all.to_a.sample)
-#   end
-# end
-# TEXT
-# end
-
-generate "hancock:cms:config"
-
-generate "hancock:cms:rack"
-
-generate "hancock:cms:admin"
-
-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
-end
-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
-end
-end
-
-# unless mongoid
-#   generate 'simple_captcha'
-# end
-
-generate "simple_form:install"
-
-
-####### CONTROLLERS #######
-
-remove_file 'app/controllers/application_controller.rb'
-create_file 'app/controllers/application_controller.rb' do <<-TEXT
-class ApplicationController < ActionController::Base
-  include Hancock::Controller
-end
-TEXT
-end
-
-
-####### MODELS #######
-
-generate "hancock:cms:ability"
-
-gsub_file 'app/models/user.rb', '# :confirmable, :lockable, :timeoutable and :omniauthable' do <<-TEXT
-include Hancock::Model
-  include Hancock::Enableable
-  include Hancock::RailsAdminPatch
-  def self.manager_can_default_actions
-    [:show, :read]
-  end
-  def manager_cannot_actions
-    [:new, :create, :delete, :destroy]
-  end
-
-  cattr_accessor :current_user
-
-  # Include default devise modules. Others available are:
-  # :confirmable,  :lockable, :timeoutable and :omniauthable
-TEXT
-end
-
-gsub_file 'app/models/user.rb', ':registerable,', ' :lockable,'
-if mongoid
-gsub_file 'app/models/user.rb', '# field :failed_attempts', 'field :failed_attempts'
-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 "AdminUser with email and password '\#{_email_pass}' was created!"
-      else
-        puts 'Creating AdminUser error'
-      end
-    else
-      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'
-      if ::User.create(roles: ["manager"], email: _email_pass, password: _email_pass, password_confirmation: _email_pass)
-        puts "ManagerUser with email and password '\#{_email_pass}' was created!"
-      else
-        puts 'Creating ManagerUser error'
-      end
-    else
-      puts 'ManagerUsers are here already'
-    end
-  end
-
-  rails_admin do
-    list do
-      field :email
-      field :name
-      field :login
-      field :roles do
-        pretty_value do
-          render_object = (bindings[:controller] || bindings[:view])
-          render_object.content_tag(:p, bindings[:object].roles.join(", ")) if render_object
-        end
-      end
-    end
-
-    edit do
-      group :login do
-        active false
-        field :email, :string do
-          visible do
-            render_object = (bindings[:controller] || bindings[:view])
-            render_object and (render_object.current_user.admin? or (render_object.current_user.manager? and render_object.current_user == bindings[:object]))
-          end
-        end
-        field :name, :string
-        field :login, :string do
-          visible do
-            render_object = (bindings[:controller] || bindings[:view])
-            render_object and render_object.current_user.admin?
-          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
-          visible do
-            render_object = (bindings[:controller] || bindings[:view])
-            render_object and (render_object.current_user.admin? or render_object.current_user == bindings[:object])
-          end
-        end
-        field :password_confirmation do
-          visible do
-            render_object = (bindings[:controller] || bindings[:view])
-            render_object and (render_object.current_user.admin? or render_object.current_user == bindings[:object])
-          end
-        end
-      end
-    end
-
-  end
-TEXT
-end
-end
-
-
-###### HANCOCK OTHERS ######
-
-unless mongoid
-  generate "hancock:cms:migration"
-  generate "rails_admin_settings:migration"
-end
-
-remove_file 'app/views/layouts/application.html.erb'
-generate "hancock:cms:layout"
-
-unless mongoid
-  rake "db:migrate"
-end
-
-remove_file 'app/assets/stylesheets/application.css'
-remove_file 'app/assets/javascripts/application.js'
-generate "hancock:cms:assets", app_name
-
-remove_file 'public/robots.txt'
-generate "hancock:cms:robots", app_name
-
-#god+unicorn
-generate "hancock:cms:unicorn_god", app_name
-#scripts
-generate "hancock:cms:scripts", app_name
-
-FileUtils.cp(Pathname.new(destination_root).join('config', 'secrets.yml').to_s, Pathname.new(destination_root).join('config', 'secrets.yml.example').to_s)
-
-unless mongoid
-  generate "paper_trail:install"
-  generate "friendly_id"
-  rake "db:migrate"
-end
-
-generate "rspec:install"
-
-
-####### GIT #######
-
-remove_file '.gitignore'
-create_file '.gitignore' do <<-TEXT
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-.idea
-.idea/*
-
-/.bundle
-/log/*.log
-/tmp/*
-/public/assets
-/public/ckeditor_assets
-Gemfile.lock
-TEXT
-end
-
-create_file 'extra/.gitkeep', ''
-
-git :init
-git add: "."
-git commit: %Q{ -m 'Initial commit' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.0.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,16 +188,16 @@ dependencies:
   name: ack_rails_admin_settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +293,7 @@ files:
 - app/models/concerns/hancock/boolean_field.rb
 - app/models/concerns/hancock/cacheable.rb
 - app/models/concerns/hancock/decorators/embedded_element.rb
+- app/models/concerns/hancock/embedded_findable.rb
 - app/models/concerns/hancock/enableable.rb
 - app/models/concerns/hancock/geocodeable.rb
 - app/models/concerns/hancock/hash_field.rb
@@ -342,7 +343,6 @@ files:
 - app/views/rails_admin/main/_hancock_html_ml.html.slim
 - app/views/shared/_admin_link.html.slim
 - app/views/shared/_messages.html.slim
-- config/initializers/embedded_findable.rb
 - config/initializers/hancock_cms.rb
 - config/initializers/simple_captcha.rb
 - config/locales/en.hancock.yml
@@ -371,12 +371,14 @@ files:
 - lib/generators/hancock/cms/rack_generator.rb
 - lib/generators/hancock/cms/robots_generator.rb
 - lib/generators/hancock/cms/scripts_generator.rb
+- lib/generators/hancock/cms/setup_generator.rb
 - lib/generators/hancock/cms/templates/Gemfile.erb
 - lib/generators/hancock/cms/templates/ability.erb
 - lib/generators/hancock/cms/templates/admin.erb
 - lib/generators/hancock/cms/templates/application.erb
 - lib/generators/hancock/cms/templates/assets/javascripts/application.coffee.erb
 - lib/generators/hancock/cms/templates/assets/stylesheets/application.sass.erb
+- lib/generators/hancock/cms/templates/assets/stylesheets/hancock/rails_admin/custom/theming.sass.erb
 - lib/generators/hancock/cms/templates/hancock_cms.erb
 - lib/generators/hancock/cms/templates/model.erb
 - lib/generators/hancock/cms/templates/paperclip_optimizer.erb
@@ -447,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use hancock_cms_mongoid or hancock_cms_activerecord