camaleon_cms 2.7.5 → 2.8.0

data/app/decorators/camaleon_cms/post_decorator.rb

@@ -41,8 +41,8 @@ module CamaleonCms
       if th.present?
         th
       else
-        (default || object.post_type.get_option('default_thumb',
-                                                nil) || h.asset_url('camaleon_cms/image-not-found.png'))
+        default || object.post_type.get_option('default_thumb',
+                                               nil) || h.asset_url('camaleon_cms/image-not-found.png')
       end
     end
     alias the_image_url the_thumb_url
@@ -61,12 +61,12 @@ module CamaleonCms
     end
 
     # return front url for this post
-    # sample: http://localhost.com/my-page.html
+    # sample: https://localhost.com/my-page.html
     # args:
     #   locale: language (default current language)
     #   as_path: return the path instead of full url, sample: /my-page.html
     #   Also, you can pass extra attributes as params for the url, sample: page.the_url(my_param: 'value', other: "asd")
-    #     => http://localhost.com/my-page.html?my_param=value&other=asd
+    #     => https://localhost.com/my-page.html?my_param=value&other=asd
     # Return String URL
     def the_url(*args)
       args = args.extract_options!
@@ -127,7 +127,7 @@ module CamaleonCms
     end
 
     # return a hash of frontend urls for this post
-    # sample: {es: 'http://mydomain.com/es/articulo-3.html', en: 'http://mydomain.com/en/post-3.html'}
+    # sample: {es: 'https://mydomain.com/es/articulo-3.html', en: 'https://mydomain.com/en/post-3.html'}
     def the_urls(*args)
       args = args.extract_options!
       res = {}

data/app/decorators/camaleon_cms/post_type_decorator.rb

@@ -55,14 +55,14 @@ module CamaleonCms
 
     # return main categories (first level) for the post_type (active_record) filtered by permissions
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_categories
       object.categories
     end
 
     # return full categories (all levels) for the post_type (active_record) filtered by permissions
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_full_categories
       object.full_categories
     end
@@ -76,7 +76,7 @@ module CamaleonCms
 
     # return all post_tags for the post_type (active_record) filtered by permissions + hidden posts + roles + etc...
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_post_tags
       object.post_tags
     end

data/app/decorators/camaleon_cms/term_taxonomy_decorator.rb

@@ -48,7 +48,7 @@ module CamaleonCms
     # ---------------------- filters
     # return all posts for this model (active_record) filtered by permissions + hidden posts + roles + etc...
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_posts
       h.verify_front_visibility(object.posts)
     end

data/app/helpers/camaleon_cms/admin/category_helper.rb

@@ -17,7 +17,7 @@ module CamaleonCms
           options << [('—' * level) + category.the_title, category.id]
           children = attrs[:max_level] < level ? [] : category.children
           children = [] if attrs[:until_cats].include?(category.id)
-          options += cama_category_get_options_html(children, level + 1, attrs) if children.size.positive?
+          options += cama_category_get_options_html(children, level + 1, attrs) unless children.empty?
         end
         options
       end

data/app/helpers/camaleon_cms/frontend/nav_menu_helper.rb

@@ -23,7 +23,7 @@ module CamaleonCms
           item_class_parent: 'dropdown', # class for all menu items that contain sub items
           sub_container: 'ul', # type of container for sub items
           sub_class: 'dropdown-menu', # class for sub container
-          callback_item: ->(args) {},
+          callback_item: ->(args) {}, # rubocop:disable Lint/ShadowingOuterLocalVariable
           # callback executed for each item (args = { menu_item, link, level, settings, has_children, link_attrs = "", index}).
           #     menu_item: (Object) Menu object
           #     link: (Hash) link data: {link: '', name: ''}
@@ -48,10 +48,11 @@ module CamaleonCms
           container_append: '' # content append for menu container
         }
 
-        args = args_def.merge(args)
+        args = args_def.merge!(args)
         nav_menu = current_site.nav_menus.find_by_slug(args[:menu_slug])
-        nav_menu = current_site.nav_menus.first unless nav_menu.present?
-        html = "<#{args[:container]} class='#{args[:container_class]}' id='#{args[:container_id]}'>#{args[:container_prepend]}{__}#{args[:container_append]}</#{args[:container]}>"
+        nav_menu ||= current_site.nav_menus.first
+        html = "<#{args[:container]} class='#{args[:container_class]}' "\
+          "id='#{args[:container_id]}'>#{args[:container_prepend]}{__}#{args[:container_append]}</#{args[:container]}>"
         if nav_menu.present?
           html.sub('{__}', cama_menu_draw_items(args, nav_menu.children.reorder(:term_order)))
         else
@@ -69,10 +70,10 @@ module CamaleonCms
           data_nav_item = cama_parse_menu_item(nav_menu_item)
           next if data_nav_item == false
 
-          _is_current = data_nav_item[:current] || site_current_path == data_nav_item[:link] || site_current_path == data_nav_item[:link].sub(
-            '.html', ''
-          )
-          has_children = nav_menu_item.have_children? && (args[:levels] == -1 || (args[:levels] != -1 && level <= args[:levels]))
+          _is_current = data_nav_item[:current] || site_current_path == data_nav_item[:link] ||
+                        site_current_path == data_nav_item[:link].sub('.html', '')
+          has_children = nav_menu_item.have_children? && (args[:levels] == -1 ||
+                         (args[:levels] != -1 && level <= args[:levels]))
           r = {
             menu_item: nav_menu_item.decorate,
             link: data_nav_item,
@@ -116,7 +117,7 @@ module CamaleonCms
           index += 1
         end
 
-        if level.zero?
+        if level == 0
           html
         else
           html = "<#{args[:sub_container]} class='#{args[:sub_class]} #{if parent_current
@@ -142,7 +143,7 @@ module CamaleonCms
             '.html', ''
           )
           has_children = nav_menu_item.have_children?
-          has_children = false if max_levels.positive? && max_levels == internal_level
+          has_children = false if max_levels > 0 && max_levels == internal_level
           data_nav_item[:label] = data_nav_item[:name]
           data_nav_item[:url] = data_nav_item[:link]
           r = {
@@ -169,7 +170,7 @@ module CamaleonCms
           res << r
         end
 
-        if internal_level.zero?
+        if internal_level == 0
           res
         else
           [res, is_current_parent, levels.max]

data/app/helpers/camaleon_cms/html_helper.rb

@@ -72,14 +72,14 @@ module CamaleonCms
     def cama_draw_custom_assets
       cama_html_helpers_init unless @_assets_libraries.present?
       libs = []
-      @_assets_libraries.each do |_key, assets|
+      @_assets_libraries.each_value do |assets|
         libs += assets[:css] if assets[:css].present?
       end
       stylesheets = libs.uniq
       css = stylesheet_link_tag(*stylesheets, media: 'all')
 
       libs = []
-      @_assets_libraries.each do |_key, assets|
+      @_assets_libraries.each_value do |assets|
         libs += assets[:js] if assets[:js].present?
       end
       javascripts = libs.uniq
@@ -98,7 +98,7 @@ module CamaleonCms
       terms.all.each do |term|
         options << [('—' * level) + term.name, term.id] unless @term.id == term.id
         children = term.children
-        options += cama_get_options_html_from_items(children, level + 1) if children.size.positive?
+        options += cama_get_options_html_from_items(children, level + 1) unless children.empty?
       end
       options
     end
@@ -121,18 +121,18 @@ module CamaleonCms
       libs[:datepicker] = { js: [] }
       libs[:datetimepicker] = { js: [], css: [] }
       libs[:tinymce] =
-        { js: ['camaleon_cms/admin/tinymce/tinymce.min', 'camaleon_cms/admin/tinymce/plugins/filemanager/plugin.min'],
+        { js: %w[camaleon_cms/admin/tinymce/tinymce.min camaleon_cms/admin/tinymce/plugins/filemanager/plugin.min],
           css: ['camaleon_cms/admin/tinymce/skins/lightgray/content.min'] }
       libs[:form_ajax] = { js: ['camaleon_cms/admin/form/jquery.form'] }
       libs[:cropper] = {} # loaded by default
       libs[:post] =
-        { js: ['camaleon_cms/admin/jquery.tagsinput.min', 'camaleon_cms/admin/post'],
+        { js: %w[camaleon_cms/admin/jquery.tagsinput.min camaleon_cms/admin/post],
           css: ['camaleon_cms/admin/jquery.tagsinput'] }
       libs[:multiselect] = { js: ['camaleon_cms/admin/bootstrap-select.js'] }
       libs[:validate] = { js: ['camaleon_cms/admin/jquery.validate'] }
       libs[:nav_menu] =
         { css: ['camaleon_cms/admin/nestable/jquery.nestable'],
-          js: ['camaleon_cms/admin/jquery.nestable', 'camaleon_cms/admin/nav_menu'] }
+          js: %w[camaleon_cms/admin/jquery.nestable camaleon_cms/admin/nav_menu] }
       libs[:admin_intro] =
         { js: ['camaleon_cms/admin/introjs/intro.min'], css: ['camaleon_cms/admin/introjs/introjs.min'] }
       @_cama_assets_libraries = libs

data/app/helpers/camaleon_cms/plugins_helper.rb

@@ -127,7 +127,7 @@ module CamaleonCms
     # asset: (String) asset name
     # plugin_key: (optional) plugin name, default (current plugin caller to this function)
     # sample:
-    #   plugin_asset_url("css/main.css") => return: http://myhost.com/assets/plugins/my_plugin/assets/css/main-54505620f.css
+    #   plugin_asset_url("css/main.css") => return: https://myhost.com/assets/plugins/my_plugin/assets/css/main-54505620f.css
     def plugin_asset_url(asset, plugin_key = nil)
       key = plugin_key || self_plugin_key(1)
       p = PluginRoutes.plugin_info(key)['gem_mode'] ? "plugins/#{key}/#{asset}" : "plugins/#{key}/assets/#{asset}"

data/app/helpers/camaleon_cms/session_helper.rb

@@ -6,7 +6,7 @@ module CamaleonCms
     # redirect_url (default nil): after initialized the session, this will be redirected to
     #   "redirect_url" if defined
     #   it doesn't redirect if redirect_url === false
-    #   return to previous page if defined the cookie['return_to'] or login url received extra param: return_to=http://mysite.com
+    #   return to previous page if defined the cookie['return_to'] or login url received extra param: return_to=https://mysite.com
     def login_user(user, remember_me = false, redirect_url = nil)
       c = { value: [user.auth_token, request.user_agent, request.ip], expires: 24.hours.from_now }
       c[:domain] = :all if PluginRoutes.system_info['users_share_sites'].present? && CamaleonCms::Site.count > 1

data/app/helpers/camaleon_cms/short_code_helper.rb

@@ -15,7 +15,7 @@ module CamaleonCms
                       return args[:shortcode] unless attrs.present?
 
                       cama_load_libraries(*attrs['data'].to_s.split(','))
-                      return ''
+                      ''
                     },
                     "Permit to load libraries on demand, sample: [load_libraries data='datepicker,tinymce']")
 

data/app/helpers/camaleon_cms/site_helper.rb

@@ -32,7 +32,7 @@ module CamaleonCms
         nil
       end
       unless r[:site].present?
-        Rails.logger.error 'Camaleon CMS - Please define your current site: $current_site = CamaleonCms::Site.first.decorate or map your domains: http://camaleon.tuzitio.com/documentation/category/139779-examples/how.html'.cama_log_style(:red)
+        Rails.logger.error 'Camaleon CMS - Please define your current site: $current_site = CamaleonCms::Site.first.decorate or map your domains: https://camaleon.website/documentation/category/139779-examples/how.html'.cama_log_style(:red)
       end
       @current_site = r[:site]
     end

data/app/helpers/camaleon_cms/theme_helper.rb

@@ -26,7 +26,7 @@ module CamaleonCms
     # asset: (String) asset name
     # theme_name: (optional) theme name, default (current theme caller to this function)
     # sample:
-    #   theme_asset_url("css/main.css") => return: http://myhost.com/assets/themes/my_theme/assets/css/main-54505620f.css
+    #   theme_asset_url("css/main.css") => return: https://myhost.com/assets/themes/my_theme/assets/css/main-54505620f.css
     def theme_asset_url(asset, theme_name = nil)
       p = theme_asset_path(asset, theme_name)
       begin

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -16,7 +16,7 @@ module CamaleonCms
     #       sample "test.png", versions: '200x200,450x450' will generate: thumb/test-png_200x200.png, test-png_450x450.png
     #   thumb_size: String (redefine the dimensions of the thumbnail, sample: '100x100' ==> only for images)
     #   temporal_time: if great than 0 seconds, then this file will expire (removed) in that time (default: 0)
-    #     To manage jobs, please check http://edgeguides.rubyonrails.org/active_job_basics.html
+    #     To manage jobs, please check https://edgeguides.rubyonrails.org/active_job_basics.html
     #     Note: if you are using temporal_time, you will need to copy the file to another directory later
     # sample: upload_file(params[:my_file], {formats: "images", folder: "temporal"})
     # sample: upload_file(params[:my_file], {formats: "jpg,png,gif,mp3,mp4", temporal_time: 10.minutes, maximum: 10.megabytes})
@@ -45,7 +45,7 @@ module CamaleonCms
         generate_thumb: true,
         temporal_time: 0,
         filename: begin
-          (cached_name || uploaded_io.original_filename)
+          cached_name || uploaded_io.original_filename
         rescue StandardError
           uploaded_io.path.split('/').last
         end.cama_fix_filename,
@@ -72,7 +72,6 @@ module CamaleonCms
       # save file
       key = File.join(settings[:folder], settings[:filename]).to_s.cama_fix_slash
       res = cama_uploader.add_file(settings[:uploaded_io], key, { same_name: settings[:same_name] })
-      {} if (settings[:temporal_time]).positive?
 
       # generate image versions
       if res['file_type'] == 'image'
@@ -92,6 +91,12 @@ module CamaleonCms
       FileUtils.rm_f(uploaded_io.path) if settings[:remove_source] && File.exist?(uploaded_io.path)
 
       hooks_run('after_upload', settings)
+
+      # temporal file upload (always put as local for temporal files)
+      if settings[:temporal_time] > 0
+        CamaleonCmsUploader.delete_block.call(settings, cama_uploader, key)
+      end
+
       res
     end
 
@@ -237,7 +242,7 @@ module CamaleonCms
     # upload tmp file
     # support for url and local path
     # sample:
-    # cama_tmp_upload('http://camaleon.tuzitio.com/media/132/logo2.png')  ==> /var/rails/my_project/public/tmp/1/logo2.png
+    # cama_tmp_upload('https://camaleon.website/media/132/logo2.png')  ==> /var/rails/my_project/public/tmp/1/logo2.png
     # cama_tmp_upload('/var/www/media/132/logo 2.png')  ==> /var/rails/my_project/public/tmp/1/logo-2.png
     # accept args:
     #   name: to indicate the name to use, sample: cama_tmp_upload('/var/www/media/132/logo 2.png', {name: 'owen.png', formats: 'images'})
@@ -324,7 +329,7 @@ module CamaleonCms
             cloud_front: current_site.get_option('filesystem_s3_cloudfront'),
             aws_file_upload_settings: lambda { |settings|
                                         settings
-                                      }, # permit to add your custom attributes for file_upload http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#upload_file-instance_method
+                                      }, # permit to add your custom attributes for file_upload https://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#upload_file-instance_method
             aws_file_read_settings: lambda { |data, _s3_file|
                                       data
                                     } # permit to read custom attributes from aws file and add to file parsed object

data/app/models/camaleon_cms/ability.rb

@@ -105,7 +105,7 @@ module CamaleonCms
         end
 
         # support for custom abilities for each posttype
-        # sample: http://camaleon.tuzitio.com/documentation/category/40756-uncategorized/custom-models.html
+        # sample: https://camaleon.website/documentation/category/40756-uncategorized/custom-models.html
         @roles_post_type.each do |k, v|
           next if %w[edit edit_other edit_publish publish manage_categories].include?(k.to_s)
 

data/app/models/camaleon_cms/custom_field_group.rb

@@ -5,8 +5,8 @@ module CamaleonCms
     alias_attribute :site_id, :parent_id
 
     default_scope do
-      where.not(object_class: '_fields')
-           .reorder("#{CamaleonCms::CustomField.table_name}.field_order ASC")
+      where("object_class != '_fields'")
+        .reorder("#{CamaleonCms::CustomField.table_name}.field_order ASC")
     end
 
     has_many :metas, -> { where(object_class: 'CustomFieldGroup') }, foreign_key: :objectid, dependent: :destroy

data/app/models/camaleon_cms/nav_menu.rb

@@ -10,7 +10,7 @@ module CamaleonCms
     # add menu item for current menu
     # value: (Hash) is a hash object that contains label, type, link
     #   options for type: post | category | post_type | post_tag | external
-    # sample: {label: "my label", type: "external", link: "http://camaleon.tuzitio.com", target: '_blank'}
+    # sample: {label: "my label", type: "external", link: "https://camaleon.website", target: '_blank'}
     # sample: {label: "my label", type: "post", link: 10}
     # sample: {label: "my label", type: "category", link: 12}
     # return item created

data/app/models/camaleon_cms/post.rb

@@ -42,7 +42,7 @@ module CamaleonCms
     validates_with CamaleonCms::PostUniqValidator
     attr_accessor :show_title_with_parent
 
-    before_create :fix_post_order, if: ->(p) { !p.post_order.present? || p.post_order.zero? }
+    before_create :fix_post_order, if: ->(p) { !p.post_order.present? || p.post_order == 0 }
 
     # return all parents for current page hierarchy ordered bottom to top
     def parents

data/app/models/camaleon_cms/post_default.rb

@@ -42,7 +42,7 @@ module CamaleonCms
       res = where("#{CamaleonCms::Post.table_name}.slug = ? OR #{CamaleonCms::Post.table_name}.slug LIKE ? ", slug,
                   "%-->#{slug}<!--%")
       # end
-      res.reorder('').first
+      res.take
     end
 
     # return the parent of a post (support for sub contents or tree of posts)

data/app/models/camaleon_cms/post_type.rb

@@ -101,7 +101,7 @@ module CamaleonCms
     # add a post for current model
     #   title: title for post,    => required
     #   content: html text content, => required
-    #   thumb: image url, => default (empty). check http://camaleon.tuzitio.com/api-methods.html#section_fileuploads
+    #   thumb: image url, => default (empty). check https://camaleon.website/api-methods.html#section_fileuploads
     #   categories: [1,3,4,5],    => default (empty)
     #   tags: String comma separated, => default (empty)
     #   slug: string key for post,    => default (empty)
@@ -111,7 +111,7 @@ module CamaleonCms
     #   settings: Hash of post settings, sample => settings:
     #     {has_content: false, has_summary: true, default_layout: 'my_layout', default_template: 'my_template' } (optional, see more in post.set_setting(...))
     #   data_metas: {template: "", layout: ""}
-    # sample: my_posttype.add_post(title: "My Title", post_order: 5, content: 'lorem_ipsum', settings: {default_template: "home/counters", has_content: false, has_seo: false, skip_fields: ["sub_tite", 'banner']}, fields: {pattern: true, bg: 'http://www.reallusion.com/de/images/3dx5/whatsnew/3dx5_features_banner_bg_02.jpg'})
+    # sample: my_posttype.add_post(title: "My Title", post_order: 5, content: 'lorem_ipsum', settings: {default_template: "home/counters", has_content: false, has_seo: false, skip_fields: ["sub_tite", 'banner']}, fields: {pattern: true, bg: 'https://www.reallusion.com/de/images/3dx5/whatsnew/3dx5_features_banner_bg_02.jpg'})
     #   More samples here: https://gist.github.com/owen2345/eba9691585ed78ad6f7b52e9591357bf
     # return created post if it was created, else return errors
     def add_post(args)
@@ -139,12 +139,12 @@ module CamaleonCms
     # return all available route formats of this post type for content posts
     def contents_route_formats
       {
-        'post_of_post_type' => '<code>/group/:post_type_id-:title/:slug</code><br>  (Sample: http://localhost.com/group/17-services/myservice.html)',
-        'post_of_category' => '<code>/category/:category_id-:title/:slug</code><br>  (Sample: http://localhost.com/category/17-services/myservice.html)',
-        'post_of_category_post_type' => '<code>/:post_type_title/category/:category_id-:title/:slug</code><br>  (Sample: http://localhost.com/services/category/17-services/myservice.html)',
-        'post_of_posttype' => '<code>/:post_type_title/:slug</code><br>  (Sample: http://localhost.com/services/myservice.html)',
-        'post' => '<code>/:slug</code><br>  (Sample: http://localhost.com/myservice.html)',
-        'hierarchy_post' => '<code>/:parent1_slug/:parent2_slug/.../:slug</code><br>  (Sample: http://localhost.com/item-1/item-1-1/item-111.html)'
+        'post_of_post_type' => '<code>/group/:post_type_id-:title/:slug</code><br>  (Sample: https://localhost.com/group/17-services/myservice.html)',
+        'post_of_category' => '<code>/category/:category_id-:title/:slug</code><br>  (Sample: https://localhost.com/category/17-services/myservice.html)',
+        'post_of_category_post_type' => '<code>/:post_type_title/category/:category_id-:title/:slug</code><br>  (Sample: https://localhost.com/services/category/17-services/myservice.html)',
+        'post_of_posttype' => '<code>/:post_type_title/:slug</code><br>  (Sample: https://localhost.com/services/myservice.html)',
+        'post' => '<code>/:slug</code><br>  (Sample: https://localhost.com/myservice.html)',
+        'hierarchy_post' => '<code>/:parent1_slug/:parent2_slug/.../:slug</code><br>  (Sample: https://localhost.com/item-1/item-1-1/item-111.html)'
       }
     end
 

data/app/models/camaleon_cms/site.rb

@@ -91,7 +91,7 @@ module CamaleonCms
     # return theme model with slug theme_slug for this site
     # theme_slug: (optional) if it is null, this will return current theme for this site
     def get_theme(theme_slug = nil)
-      themes.where(slug: (theme_slug || get_theme_slug), status: nil).first_or_create!
+      themes.where(slug: theme_slug || get_theme_slug, status: nil).first_or_create!
     end
 
     # return plugin model with slug plugin_slug

data/app/models/camaleon_cms/term_taxonomy.rb

@@ -16,6 +16,19 @@ module CamaleonCms
     # attr_accessible :data_options
     # attr_accessible :data_metas
 
+    # TODO: Remove the 1st branch when support will be dropped of Rails < 7.1
+    if ::Rails::VERSION::STRING < '7.1.0'
+      before_validation(on: %i[create update]) do
+        %i[name description].each do |attr|
+          next unless new_record? || attribute_changed?(attr)
+
+          self[attr] = ActionController::Base.helpers.sanitize(__send__(attr))
+        end
+      end
+    else
+      normalizes :name, :description, with: ->(field) { ActionController::Base.helpers.sanitize(field) }
+    end
+
     # callbacks
     before_validation :before_validating
     before_destroy :destroy_dependencies

data/app/models/concerns/camaleon_cms/custom_fields_read.rb

@@ -3,18 +3,6 @@ module CamaleonCms
     extend ActiveSupport::Concern
     included do
       before_destroy :_destroy_custom_field_groups
-      # DEPRECATED, INSTEAD USE: custom_fields
-      has_many :fields, lambda { |object|
-                          where(object_class: object.class.to_s.gsub('Decorator', '').gsub('CamaleonCms::', ''))
-                        }, class_name: 'CamaleonCms::CustomField', foreign_key: :objectid
-      # DEPRECATED, INSTEAD USE: custom_field_values
-      has_many :field_values, lambda { |object|
-                                where(object_class: object.class.to_s.gsub('Decorator', '').gsub('CamaleonCms::', ''))
-                              }, class_name: 'CamaleonCms::CustomFieldsRelationship', foreign_key: :objectid, dependent: :delete_all
-      # DEPRECATED, INSTEAD USE: custom_field_groups
-      has_many :field_groups, lambda { |object|
-                                where(object_class: object.class.to_s.parseCamaClass)
-                              }, class_name: 'CamaleonCms::CustomFieldGroup', foreign_key: :objectid
     end
 
     # get custom field groups for current object
@@ -38,7 +26,7 @@ module CamaleonCms
                { kind: args,
                  include_parent: false }
              else
-               { kind: 'Post', include_parent: false }.merge(args)
+               { kind: 'Post', include_parent: false }.merge!(args)
              end
       class_name = self.class.to_s.parseCamaClass
       case class_name
@@ -73,7 +61,7 @@ module CamaleonCms
           CamaleonCms::CustomFieldGroup.where(object_class: "PostType_#{args[:kind]}", objectid: id)
         end
       else # 'Plugin' or other classes
-        field_groups
+        custom_field_groups
       end
     end
 
@@ -131,7 +119,7 @@ module CamaleonCms
     #   puts res[0]['my_slug1'].first ==> "val 1"
     def get_fields_grouped(field_keys)
       res = []
-      custom_field_values.where(custom_field_slug: field_keys).order(group_number: :asc).group_by(&:group_number).each do |_group_number, group_fields|
+      custom_field_values.where(custom_field_slug: field_keys).order(group_number: :asc).group_by(&:group_number).each_value do |group_fields|
         group = {}
         field_keys.each do |field_key|
           _tmp = []
@@ -196,8 +184,8 @@ module CamaleonCms
     # kind: argument only for PostType model: (Post | Category | PostTag), default => Post. If kind = "" this will add group for all post_types
     def add_custom_field_group(values, kind = 'Post')
       values = values.with_indifferent_access
-      group = get_field_groups(kind).where(slug: values[:slug]).first
-      unless group.present?
+      group = get_field_groups(kind).find_by(slug: values[:slug])
+      unless group
         site = _cama_get_field_site
         values[:parent_id] = site.id if site.present?
         group = if is_a?(CamaleonCms::Post) # harcoded for post to support custom field groups
@@ -206,6 +194,7 @@ module CamaleonCms
                   get_field_groups(kind).create!(values)
                 end
       end
+
       group
     end
     alias add_field_group add_custom_field_group
@@ -215,8 +204,8 @@ module CamaleonCms
     # more details in add_manual_field(item, options) from custom field groups
     # kind: argument only for PostType model: (Post | Category | PostTag), default => Post
     def add_custom_field_to_default_group(item, options, kind = 'Post')
-      g = get_field_groups(kind).where(slug: '_default').first
-      g = add_custom_field_group({ name: 'Default Field Group', slug: '_default' }, kind) unless g.present?
+      g = get_field_groups(kind).find_by(slug: '_default')
+      g ||= add_custom_field_group({ name: 'Default Field Group', slug: '_default' }, kind)
       g.add_manual_field(item, options)
     end
     alias add_field add_custom_field_to_default_group
@@ -243,7 +232,7 @@ module CamaleonCms
 
       ActiveRecord::Base.transaction do
         custom_field_values.delete_all
-        datas.each do |_index, fields_data|
+        datas.each_value do |fields_data|
           fields_data.each do |field_key, values|
             next unless values[:values].present?
 
@@ -260,7 +249,7 @@ module CamaleonCms
     # update new value for field with slug _key
     # Sample: my_posy.update_field_value('sub_title', 'Test Sub Title')
     def update_field_value(_key, value = nil, group_number = 0)
-      custom_field_values.where(custom_field_slug: _key, group_number: group_number).first.update_column('value', value)
+      custom_field_values.find_by(custom_field_slug: _key, group_number: group_number)&.update_column('value', value)
     rescue StandardError
       nil
     end
@@ -287,7 +276,7 @@ module CamaleonCms
     # sample: my_post.set_field_value('subtitle', 'Sub Title', {group_number: 1})
     # sample: my_post.set_field_value('subtitle', 'Sub Title', {group_number: 1, group_number: 1}) # add field values for fields in group 1
     def set_field_value(key, value, args = {})
-      args = { order: 0, group_number: 0, field_id: nil, clear: true }.merge(args)
+      args = { order: 0, group_number: 0, field_id: nil, clear: true }.merge!(args)
       unless args[:field_id].present?
         args[:field_id] = begin
           get_field_object(key).id

data/app/models/concerns/camaleon_cms/site_default_settings.rb

@@ -25,7 +25,7 @@ module CamaleonCms
           else
             title = 'Welcome'
             slug = 'welcome'
-            content = "<p style='text-align: center;'><img width='155' height='155' src='http://camaleon.tuzitio.com/media/132/logo2.png' alt='logo' /></p><p><strong>Camaleon CMS</strong>&nbsp;is a free and open-source tool and a fexible content management system (CMS) based on <a href='http://rubyonrails.org'>Ruby on Rails</a>.</p> <p>With Camaleon you can do the following:</p> <ul> <li>Create instantly a lot of sites&nbsp;in the same installation</li> <li>Manage your content information in several languages</li> <li>Extend current functionality by&nbsp;plugins (MVC structure and no more echo or prints anywhere)</li> <li>Create or install different themes for each site</li> <li>Create your own structure without coding anything (adapt Camaleon as you want&nbsp;and not you for Camaleon)</li> <li>Create your store and start to sell your products using our plugins</li> <li>Avoid web attacks</li> <li>Compare the speed and enjoy the speed of your new Camaleon site</li> <li>Customize or create your themes for mobile support</li> <li>Support&nbsp;more visitors at the same time</li> <li>Manage your information with a panel like wordpress&nbsp;</li> <li>All urls are oriented for SEO</li> <li>Multiples roles of users</li> </ul>"
+            content = "<p style='text-align: center;'><img width='155' height='155' src='https://camaleon.website/media/132/logo2.png' alt='logo' /></p><p><strong>Camaleon CMS</strong>&nbsp;is a free and open-source tool and a fexible content management system (CMS) based on <a href='https://rubyonrails.org'>Ruby on Rails</a>.</p> <p>With Camaleon you can do the following:</p> <ul> <li>Create instantly a lot of sites&nbsp;in the same installation</li> <li>Manage your content information in several languages</li> <li>Extend current functionality by&nbsp;plugins (MVC structure and no more echo or prints anywhere)</li> <li>Create or install different themes for each site</li> <li>Create your own structure without coding anything (adapt Camaleon as you want&nbsp;and not you for Camaleon)</li> <li>Create your store and start to sell your products using our plugins</li> <li>Avoid web attacks</li> <li>Compare the speed and enjoy the speed of your new Camaleon site</li> <li>Customize or create your themes for mobile support</li> <li>Support&nbsp;more visitors at the same time</li> <li>Manage your information with a panel like wordpress&nbsp;</li> <li>All urls are oriented for SEO</li> <li>Multiples roles of users</li> </ul>"
           end
           user = users.admin_scope.first
           unless user.present?

data/app/uploaders/camaleon_cms_uploader.rb

@@ -158,6 +158,11 @@ class CamaleonCmsUploader
     File.exist?(file_name)
   end
 
+  def self.delete_block(&block)
+    @delete_block = block if block
+    @delete_block
+  end
+
   private
 
   def cache_key

data/app/validators/camaleon_cms/post_uniq_validator.rb

@@ -14,18 +14,17 @@ module CamaleonCms
                    )
                    .where.not(id: record.id)
                    .where.not(status: %i[draft draft_child trash])
-      if posts.size.positive?
-        record.errors[:base] << if slug_array.size > 1
-                                  "#{I18n.t('camaleon_cms.admin.post.message.requires_different_slug')}: #{posts.pluck(:slug).map do |slug|
-                                                                                                             record.slug.to_s.translations.map do |lng, r_slug|
-                                                                                                               if slug.translations_array.include?(r_slug)
-                                                                                                                 "#{r_slug} (#{lng})"
-                                                                                                               end
-                                                                                                             end.join(',')
-                                                                                                           end.join(',').split(',').uniq.clean_empty.join(', ')} "
-                                else
-                                  "#{I18n.t('camaleon_cms.admin.post.message.requires_different_slug')}: #{record.slug} "
-                                end
+      unless posts.empty?
+        record.errors[:base] <<
+          if slug_array.size > 1
+            "#{I18n.t('camaleon_cms.admin.post.message.requires_different_slug')}: #{posts.pluck(:slug).map do |slug|
+              record.slug.to_s.translations.map do |lng, r_slug|
+                "#{r_slug} (#{lng})" if slug.translations_array.include?(r_slug)
+              end.join(',')
+            end.join(',').split(',').uniq.clean_empty.join(', ')} "
+          else
+            "#{I18n.t('camaleon_cms.admin.post.message.requires_different_slug')}: #{record.slug} "
+          end
       end
 
       # avoid recursive page parent

data/app/validators/camaleon_cms/uniq_validator.rb

@@ -3,9 +3,15 @@ module CamaleonCms
     def validate(record)
       return if record.skip_slug_validation?
 
-      if CamaleonCms::TermTaxonomy.where(slug: record.slug).where.not(id: record.id).where("#{CamaleonCms::TermTaxonomy.table_name}.taxonomy" => record.taxonomy).where("#{CamaleonCms::TermTaxonomy.table_name}.parent_id" => record.parent_id).size.positive?
-        record.errors[:base] << I18n.t('camaleon_cms.admin.post.message.requires_different_slug').to_s
-      end
+      taxonomy_table = CamaleonCms::TermTaxonomy.table_name
+      slug_exists = CamaleonCms::TermTaxonomy.where(slug: record.slug)
+                                             .where.not(id: record.id)
+                                             .where("#{taxonomy_table}.taxonomy" => record.taxonomy)
+                                             .where("#{taxonomy_table}.parent_id" => record.parent_id).exists?
+
+      return unless slug_exists
+
+      record.errors[:base] << I18n.t('camaleon_cms.admin.post.message.requires_different_slug').to_s
     end
   end
 end

data/app/views/camaleon_cms/admin/media/index.html.erb

@@ -48,7 +48,7 @@
                     <fieldset>
                         <legend><%= t("camaleon_cms.admin.media.external", default: 'From URL') %></legend>
                         <div class="form-group">
-                            <input type="text" name="remote_file" class="form-control" placeholder="http://..." class="required">
+                            <input type="text" name="remote_file" class="form-control" placeholder="https://..." class="required">
                         </div>
                         <div class="form-group">
                             <button type="submit" class="btn btn-primary"><%= t("camaleon_cms.admin.button.submit") %></button>