hancock_cms 2.0.0.2 → 2.0.1.1

data/lib/manual_slug/mongoid.rb

@@ -17,7 +17,12 @@ module ManualSlug::Mongoid
 
   module ClassMethods
     def manual_slug(_field, options = {}, callback = true)
-      options.merge!(permanent: true, history: true)
+      options.merge!({
+        permanent: true,
+        history: true,
+        scope: (Hancock.config.mongoid_single_collection ? :_type : nil)
+      })
+
       slug _field, options
       #overwrite for default value
       field :_slugs, type: Array, localize: options[:localize], default: [], overwrite: true

data/lib/rails_admin/custom_show_in_app.rb

@@ -1,42 +1,31 @@
 module RailsAdmin
   module Config
     module Actions
-      class CustomShowInApp < RailsAdmin::Config::Actions::Base
+      class CustomShowInApp < RailsAdmin::Config::Actions::ShowInApp
         RailsAdmin::Config::Actions.register(self)
 
-        register_instance_option :member do
-          true
-        end
+        # register_instance_option :visible? do
+        #   authorized? && (bindings[:controller].main_app.url_for(bindings[:object]) rescue false)
+        # end
 
-        register_instance_option :visible? do
-          authorized? && (bindings[:controller].main_app.url_for(bindings[:object]) rescue false)
-        end
+        # register_instance_option :controller do
+        #   Proc.new do
+        #     if @object.class.name == 'Hancock::Pages::Page'
+        #       if @object.fullpath.blank?
+        #         redirect_to main_app.page_url(@object)
+        #       else
+        #         redirect_to @object.fullpath
+        #       end
+        #     elsif @object.class.name == 'Hancock::News::News'
+        #       redirect_to main_app.news_url(@object)
+        #     # elsif @object.class.name == 'Obj'
+        #     #   redirect_to main_app.object_url(@object.category, @object)
+        #     else
+        #       redirect_to main_app.url_for(@object)
+        #     end
+        #   end
+        # end
 
-        register_instance_option :controller do
-          Proc.new do
-            # if @object.class.name == 'Hancock::Pages::Page'
-            #   if @object.fullpath.blank?
-            #     redirect_to main_app.page_url(@object)
-            #   else
-            #     redirect_to @object.fullpath
-            #   end
-            # elsif @object.class.name == 'Hancock::News::News'
-            #   redirect_to main_app.news_url(@object)
-            # elsif @object.class.name == 'Obj'
-            #   redirect_to main_app.object_url(@object.category, @object)
-            # else
-            #   redirect_to main_app.url_for(@object)
-            # end
-          end
-        end
-
-        register_instance_option :link_icon do
-          'icon-eye-open'
-        end
-
-        register_instance_option :pjax? do
-          false
-        end
       end
     end
   end

data/template.rb

@@ -2,10 +2,12 @@ rails_spec = (Gem.loaded_specs["railties"] || Gem.loaded_specs["rails"])
 version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
+actual_rails_version = "5.0.1"
+notsupported_rails_version = "6.x"
 
-if Gem::Version.new(version) < Gem::Version.new('5.0.0.1') or Gem::Version.new(version) >= Gem::Version.new('6.0.0')
+if Gem::Version.new(version) < Gem::Version.new(actual_rails_version) or Gem::Version.new(version) >= Gem::Version.new(notsupported_rails_version)
   puts "You are using an incorrect version of Rails (#{version})"
-  puts "Please update for 5.0.0.1"
+  puts "Please update for #{actual_rails_version}"
   puts "Stopping"
   exit 1
 end
@@ -20,26 +22,25 @@ remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
+gem 'rails', '~> #{actual_rails_version}'#, '>= #{actual_rails_version}'
 #{if mongoid then "gem 'mongoid'" else "gem 'pg'" end}
 
 gem 'sass'
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails'#, '~> 5.0'
 gem 'compass'
 gem 'compass-rails'
 
 gem 'rails_admin', '~> 1.1'
 
-
 # #{if mongoid then "gem 'glebtv-mongoid-paperclip'" else "gem 'paperclip'" end}
 # gem "image_optim"
 # gem "paperclip-optimizer"
 # 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'#, '~> 0.2'
 # 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'#, '~> 0.3'
 # gem 'rails_admin_model_settings', github: "red-rocks/rails_admin_model_settings"
 
 # #{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, github: 'red-rocks/hancock_cms', branch: 'rails5'
@@ -48,7 +49,7 @@ gem 'rails_admin_model_settings', '~> 0.3.0'
 # gem 'recaptcha', require: 'recaptcha/rails'
 # gem 'glebtv-simple_captcha'
 
-gem 'slim-rails'
+gem 'slim-rails', '3.1.1'
 gem 'rs_russian'
 gem 'cancancan'
 
@@ -56,8 +57,6 @@ gem 'cancancan'
 gem 'unicorn'
 gem 'x-real-ip'
 
-gem 'sentry-raven'
-
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
@@ -65,19 +64,19 @@ group :development do
 
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console'
-  gem 'listen', '~> 3.0.5'
+  gem 'listen'#, '~> 3.0.5'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'spring-watcher-listen'#, '~> 2.0.0'
 
-  gem 'ack_favicon_maker_rails', '~> 1.0.1'
+  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'
+  # gem 'rails_email_preview'#, '~> 1.0.3'
 
   gem 'image_optim_pack'
 
-  gem 'puma', '~> 3.0'
+  gem 'puma'#, '~> 3.0'
 end
 
 group :test do
@@ -94,8 +93,8 @@ end
 gem 'slim'
 gem 'sprockets'
 
-gem 'coffee-rails', '~> 4.2'
-gem 'uglifier', '>= 1.3.0'
+gem 'coffee-rails'#, '~> 4.2'
+gem 'uglifier'#, '>= 1.3.0'
 
 # gem 'jbuilder', '~> 2.5'
 
@@ -108,14 +107,15 @@ end
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 group :production do
+  # gem 'sentry-raven'
   gem "god"
 end
 
-gem 'glebtv_mongoid_userstamp', '0.7.0'
+gem 'glebtv_mongoid_userstamp', '~> 0.7'
 TEXT
 end
 
-RVM_RUBY_VERSION = "2.3.3"#"2.4.0-preview1"
+RVM_RUBY_VERSION = "2.4.0"#"2.3.3"
 create_file '.ruby-version', "#{RVM_RUBY_VERSION}\n"
 create_file '.ruby-gemset', "#{app_name.underscore}\n"
 
@@ -195,7 +195,6 @@ require File.expand_path('../boot', __FILE__)
 require "active_model/railtie"
 #{'#' if mongoid}require "active_record/railtie"
 require "action_controller/railtie"
-# require "action_mailer/railtie" # mailer is off by default
 # require "active_job/railtie"
 # require "action_cable/engine"
 require "action_mailer/railtie"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.2
+  version: 2.0.1.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -146,16 +160,16 @@ dependencies:
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rails_admin_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +204,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +240,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari-actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +282,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stickykit-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'HancockCMS '
 email:
 - dev@redrocks.pro
@@ -247,6 +303,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -255,8 +312,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/images/devices/login-bg.jpg
-- app/assets/images/rails-admin/hancock_logo.svg
+- app/assets/images/hancock/devise/login-bg.jpg
+- app/assets/images/hancock/rails_admin/hancock_logo.svg
 - app/assets/javascripts/hancock/app/back_to_top.coffee
 - app/assets/javascripts/hancock/cms.coffee
 - app/assets/javascripts/hancock/cms/flash.coffee
@@ -264,6 +321,15 @@ files:
 - app/assets/javascripts/hancock/cms/map.coffee
 - app/assets/javascripts/hancock/rails_admin/cms.ui.coffee
 - app/assets/javascripts/hancock/rails_admin/custom/ui.coffee
+- app/assets/javascripts/hancock/rails_admin/en_ru_switcher.coffee
+- app/assets/javascripts/hancock/rails_admin/enum_with_custom.coffee
+- app/assets/javascripts/hancock/rails_admin/form_controls_fixed.coffee
+- app/assets/javascripts/hancock/rails_admin/leftside_hider.coffee
+- app/assets/javascripts/hancock/rails_admin/multiselect.coffee
+- app/assets/javascripts/hancock/rails_admin/navigation_dropdown.coffee
+- app/assets/javascripts/hancock/rails_admin/navigation_filter.coffee
+- app/assets/javascripts/hancock/rails_admin/navigation_scroll.coffee
+- app/assets/javascripts/hancock/rails_admin/plugins.coffee.erb
 - app/assets/javascripts/head.load.js
 - app/assets/javascripts/jquery.placeholder.js
 - app/assets/javascripts/rails_admin/custom/ui.coffee
@@ -275,6 +341,8 @@ files:
 - app/assets/stylesheets/hancock/cms/powered.sass
 - app/assets/stylesheets/hancock/rails_admin/cms.theming.sass
 - app/assets/stylesheets/hancock/rails_admin/custom/theming.sass
+- app/assets/stylesheets/hancock/rails_admin/fieldsets.sass
+- app/assets/stylesheets/hancock/rails_admin/plugins.sass.erb
 - app/assets/stylesheets/hancock/toplink/toplink.sass
 - app/assets/stylesheets/rails_admin/custom/theming.sass
 - app/controllers/concerns/hancock/current_user.rb
@@ -283,26 +351,31 @@ files:
 - app/controllers/concerns/hancock/decorators/sessions.rb
 - app/controllers/concerns/hancock/errors.rb
 - app/controllers/concerns/hancock/fancybox.rb
-- app/controllers/concerns/hancock/no_cache.rb
 - app/controllers/hancock/home_controller.rb
 - app/controllers/hancock/registrations_controller.rb
 - app/controllers/hancock/sessions_controller.rb
 - app/helpers/hancock/gzip_helper.rb
 - app/helpers/hancock/home_helper.rb
 - app/helpers/hancock/powered_helper.rb
+- app/helpers/hancock/settings_helper.rb
+- app/helpers/rails_admin/application/hancock_helper.rb
+- app/helpers/rails_admin/hancock/form_builder.rb
+- app/helpers/rails_admin/main/hancock_helper.rb
 - 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
 - app/models/concerns/hancock/html_field.rb
+- app/models/concerns/hancock/insertion_field.rb
 - app/models/concerns/hancock/mappable.rb
+- app/models/concerns/hancock/master_collection.rb
 - app/models/concerns/hancock/model_localizeable.rb
 - app/models/concerns/hancock/rails_admin_patch.rb
 - app/models/concerns/hancock/sort_field.rb
 - app/models/concerns/hancock/sortable.rb
+- app/models/concerns/hancock/user_defined.rb
 - app/models/hancock/embedded_element.rb
 - app/views/blocks/_favicon.html.slim
 - app/views/blocks/_footer.html.slim
@@ -322,6 +395,7 @@ files:
 - app/views/hancock/simple_captcha/_simple_captcha.html.slim
 - app/views/hancock/toplink/_toplink.html.slim
 - app/views/layouts/application.html.slim
+- app/views/layouts/hancock/_assets.html.slim
 - app/views/layouts/hancock/devise/confirmations.html.slim
 - app/views/layouts/hancock/devise/passwords.html.slim
 - app/views/layouts/hancock/devise/registrations.html.slim
@@ -331,22 +405,31 @@ files:
 - app/views/layouts/rails_admin/_footer_navigation.html.slim
 - app/views/layouts/rails_admin/_navigation.html.slim
 - app/views/layouts/rails_admin/_secondary_navigation.html.slim
+- app/views/layouts/rails_admin/_sidebar_navigation.html.slim
+- app/views/layouts/rails_admin/_sidebar_navigation_filter.html.slim
 - app/views/layouts/rails_admin/application.html.haml
 - app/views/layouts/rails_admin/pjax.html.haml
 - app/views/rails_admin/main/_check_boxes.html.slim
 - app/views/rails_admin/main/_enum_check_boxes.html.slim
+- app/views/rails_admin/main/_enum_for_settings_kinds.html.slim
 - app/views/rails_admin/main/_enum_radio_buttons.html.slim
+- app/views/rails_admin/main/_form_hancock_enum.html.slim
+- app/views/rails_admin/main/_form_hancock_enum_with_custom.slim
 - app/views/rails_admin/main/_form_hancock_multiselect.html.slim
 - app/views/rails_admin/main/_form_raw.html.slim
 - app/views/rails_admin/main/_hancock_hash.html.slim
 - app/views/rails_admin/main/_hancock_hash_ml.html.slim
 - app/views/rails_admin/main/_hancock_html.html.slim
 - app/views/rails_admin/main/_hancock_html_ml.html.slim
+- app/views/rails_admin/main/edit.html.haml
+- app/views/rails_admin/main/new.html.haml
 - 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/rails_admin_mongoid_patch.rb
 - config/initializers/simple_captcha.rb
+- config/initializers/sprockets_patch.rb
 - config/locales/en.hancock.yml
 - config/locales/en.hancock_admin.yml
 - config/locales/ru.cancan.yml
@@ -371,6 +454,7 @@ files:
 - lib/generators/hancock/cms/models/templates/embedded_element.erb
 - lib/generators/hancock/cms/paperclip_optimizer_generator.rb
 - lib/generators/hancock/cms/rack_generator.rb
+- lib/generators/hancock/cms/raven_generator.rb
 - lib/generators/hancock/cms/robots_generator.rb
 - lib/generators/hancock/cms/scripts_generator.rb
 - lib/generators/hancock/cms/setup_generator.rb
@@ -385,6 +469,7 @@ files:
 - lib/generators/hancock/cms/templates/model.erb
 - lib/generators/hancock/cms/templates/paperclip_optimizer.erb
 - lib/generators/hancock/cms/templates/rack.erb
+- lib/generators/hancock/cms/templates/raven.erb
 - lib/generators/hancock/cms/templates/robots.txt.erb
 - lib/generators/hancock/cms/templates/scripts/assets_precompile.sh
 - lib/generators/hancock/cms/templates/scripts/bundle_production.sh
@@ -412,14 +497,21 @@ files:
 - lib/hancock/plugin.rb
 - lib/hancock/plugin_configuration.rb
 - lib/hancock/rails_admin_ext/config.rb
+- lib/hancock/rails_admin_ext/hancock_array.rb
+- lib/hancock/rails_admin_ext/hancock_enum.rb
+- lib/hancock/rails_admin_ext/hancock_enum_with_custom.rb
 - lib/hancock/rails_admin_ext/hancock_hash.rb
 - lib/hancock/rails_admin_ext/hancock_html.rb
 - lib/hancock/rails_admin_ext/hancock_multiselect.rb
 - lib/hancock/rails_admin_ext/hancock_slugs.rb
 - lib/hancock/rails_admin_ext/patches/field_patch.rb
+- lib/hancock/rails_admin_ext/patches/fieldset_patch.rb
 - lib/hancock/rails_admin_ext/patches/group_patch.rb
 - lib/hancock/rails_admin_ext/patches/hancock_cms_group.rb
+- lib/hancock/rails_admin_ext/patches/has_fields.rb
+- lib/hancock/rails_admin_ext/patches/navigation_patch.rb
 - lib/hancock/rails_admin_ext/patches/new_controller_patch.rb
+- lib/hancock/rails_admin_settings_patch.rb
 - lib/hancock/routes.rb
 - lib/hancock/simple_form_patch.rb
 - lib/hancock/tasks.rb