camaleon_cms 2.7.5 → 2.8.1

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_aws_uploader.rb

@@ -36,11 +36,11 @@ class CamaleonCmsAwsUploader < CamaleonCmsUploader
   end
 
   def fetch_file(file_name)
-    bucket.object(file_name).download_file(file_name) unless file_exists?(file_name)
+    return file_name if file_exists?(file_name)
 
-    raise ActionController::RoutingError, 'File not found' unless file_exists?(file_name)
+    return file_name if bucket.object(file_name).download_file(file_name) && file_exists?(file_name)
 
-    file_name
+    { error: 'File not found' }
   end
 
   # parse an AWS file into custom file_object

data/app/uploaders/camaleon_cms_local_uploader.rb

@@ -1,8 +1,8 @@
 class CamaleonCmsLocalUploader < CamaleonCmsUploader
   def after_initialize
-    @root_folder = @args[:root_folder] || @current_site.upload_directory
+    @root_folder = @current_site.upload_directory
 
-    FileUtils.mkdir_p(@root_folder)
+    FileUtils.mkdir_p(@root_folder) unless Dir.exist?(@root_folder)
   end
 
   def setup_private_folder
@@ -25,9 +25,11 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
   end
 
   def fetch_file(file_name)
-    raise ActionController::RoutingError, 'File not found' unless file_exists?(file_name)
+    return { error: 'Invalid file path' } if file_name.include?('..')
+
+    return file_name if file_exists?(file_name)
 
-    file_name
+    { error: 'File not found' }
   end
 
   def file_parse(key)
@@ -107,6 +109,8 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
 
   # remove an existent folder
   def delete_folder(key)
+    return { error: 'Invalid folder path' } if key.include?('..')
+
     folder = File.join(@root_folder, key)
     FileUtils.rm_rf(folder) if Dir.exist? folder
     get_media_collection.find_by_key(key).take.destroy
@@ -114,6 +118,8 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
 
   # remove an existent file
   def delete_file(key)
+    return { error: 'Invalid file path' } if key.include?('..')
+
     file = File.join(@root_folder, key)
     FileUtils.rm(file) if File.exist? file
     @instance.hooks_run('after_delete', key)

data/app/uploaders/camaleon_cms_uploader.rb

@@ -125,6 +125,14 @@ class CamaleonCmsUploader
     valid_formats.include?(File.extname(key).sub('.', '').split('?').first.try(:downcase))
   end
 
+  def self.valid_folder_path?(path)
+    return true if path == '/'
+
+    return false if path.include?('..') || File.absolute_path?(path) || path.include?('://')
+
+    true
+  end
+
   # verify if this file name already exist
   # if the file is already exist, return a new name for this file
   # sample: search_new_key("my_file/file.txt")
@@ -158,6 +166,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>

data/app/views/camaleon_cms/admin/settings/_email_settings.html.erb

@@ -10,7 +10,7 @@
     <hr>
     <div class="alert alert-info">Gmail Need Permissions:
         <div class="pull-left">
-            <a href="http://know.mailsbestfriend.com/smtp_error_password_command_failed_5345714-1194946499.shtml" target="_blank">Check
+            <a href="https://know.mailsbestfriend.com/smtp_error_password_command_failed_5345714-1194946499.shtml" target="_blank">Check
                 here.</a>
         </div>
         <div class="pull-right">
@@ -55,4 +55,4 @@
             return false;
         });
     });
-</script>
+</script>

data/app/views/camaleon_cms/admin/settings/custom_fields/_get_items.html.erb

@@ -23,7 +23,6 @@
       <div class="panel-body">
         <%= hidden_field(:fields, :id, index: @index, value: @item_id) %>
         <%= hidden_field(:field_options, :field_key, index: @index, value: @key) %>
-        <%= hidden_field(:field_options, :label_eval, index: @index, value: @item_options_value[:label_eval].to_s.cama_true? ? 'true' : '') %>
         <%= hidden_field(:field_options, :panel_hidden, index: @index, value: @item_options_value[:panel_hidden], class: 'input-panel-hidden') %>
         <div class="form-group input-group-sm">
           <label for=""><%= t('camaleon_cms.admin.table.name') %></label><br>
@@ -182,4 +181,4 @@
   jQuery(function () {
     $('#<%= @panel_id %>').find('.translatable').Translatable();
   })
-</script>
+</script>

data/app/views/camaleon_cms/admin/settings/custom_fields/_render.html.erb

@@ -20,14 +20,14 @@
                             <input name="<%= field_name %>[<%= field.slug %>][id]" type="hidden" value="<%= field.id %>"/>
                             <input name="<%= field_name %>[<%= field.slug %>][group_number]" class="cama_custom_group_number" type="hidden" value="0"/>
                             <label>
-                                <%= field.options[:label_eval].present? ? eval(field.name) : field.name %>
+                                <%= field.name %>
                                 <%= raw "<em class='text-danger'>*</em>" if field.options[:required].to_s.to_bool %>
                                 <% if current_site.get_option('custom_fields_show_shortcodes') && ["post", "posttype", "category", "postTag", "site", "user", "navmenu", "theme"].include?(obj_class) %>
                                     <small class="shortcode_field"><br><%= raw cama_shortcode_print("[data field='#{field.slug}' #{"object='#{obj_class}' #{"id='#{record.id}'" if obj_class != "Theme" }" unless record.new_record?}]") %></small>
                                 <% end %>
                             </label>
                             <% if field.description.present? %>
-                                <p><small><%= field.options[:label_eval].present? ? eval(field.description) : field.description %></small></p>
+                                <p><small><%= field.description %></small></p>
                             <% end  %>
                             <div class="editor-custom-fields content-field-<%= field.id %>" data-add_field_title="<%= t('camaleon_cms.admin.button.add_new_field', default: 'Add new field')%>">
                                 <%= begin

data/app/views/camaleon_cms/default_theme/index.html.erb

@@ -12,19 +12,19 @@
             <!-- Wrapper for slides -->
             <div class="carousel-inner">
                 <div class="item active">
-                    <img src="http://placehold.it/800x400" alt="...">
+                    <img src="https://placehold.it/800x400" alt="...">
                     <div class="carousel-caption">
                         <h2>Heading</h2>
                     </div>
                 </div>
                 <div class="item">
-                    <img src="http://placehold.it/800x400" alt="...">
+                    <img src="https://placehold.it/800x400" alt="...">
                     <div class="carousel-caption">
                         <h2>Heading</h2>
                     </div>
                 </div>
                 <div class="item">
-                    <img src="http://placehold.it/800x400" alt="...">
+                    <img src="https://placehold.it/800x400" alt="...">
                     <div class="carousel-caption">
                         <h2>Heading</h2>
                     </div>
@@ -67,4 +67,4 @@
         </div>
 
     </div>
-</section>
+</section>

data/app/views/camaleon_cms/default_theme/sitemap.xml.builder

@@ -1,7 +1,7 @@
 xml.instruct! :xml, version: '1.0'
-xml.urlset 'xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
+xml.urlset 'xmlns' => 'https://www.sitemaps.org/schemas/sitemap/0.9' do
   current_site.get_languages.each_with_index do |lang, index|
-    lang = (index.zero? ? nil : lang)
+    lang = (index == 0 ? nil : lang)
     xml.url do
       xml.loc current_site.the_url(locale: lang)
       xml.lastmod current_site.updated_at.to_date
@@ -54,7 +54,7 @@ xml.urlset 'xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
     end
   end
 
-  @r[:custom].each do |_key, item|
+  @r[:custom].each_value do |item|
     xml.url do
       xml.loc item[:url]
       xml.lastmod item[:lastmod] || Date.today.to_s

data/app/views/layouts/camaleon_cms/admin/_footer.html.erb

@@ -1,6 +1,6 @@
 <footer class="main-footer" id="main-footer">
     <div class="row">
-      <div class="col-md-6"><strong>Copyright &copy; 2015 - <%= Time.now.year %> <a href="http://camaleon.tuzitio.com">Camaleon CMS.</a> </strong></div>
+      <div class="col-md-6"><strong>Copyright &copy; 2015 - <%= Time.now.year %> <a href="https://camaleon.website">Camaleon CMS.</a> </strong></div>
         <div class="col-md-6 hidden-xs">
             <div class="pull-left">
                 <a id="link_see_intro" href="#" onclick="init_intro(); return false;"><i class="fa fa-tv"></i> <%= I18n.t('camaleon_cms.see_intro') %>.</a>

data/config/initializers/custom_initializers.rb

@@ -9,4 +9,18 @@ Rails.application.config.to_prepare do |_config|
     f = File.join(ap['path'], 'config', 'custom_models.rb')
     eval(File.read(f)) if File.exist?(f)
   end
+
+  # This block can be overridden in the app initializer to wrap the sleep and delete_file in an async job,
+  # something like this:
+  #
+  # CamaleonDeleteFileJob.set(wait: temporal_time).perform_later(file_key)
+  # # put this in app/jobs/camaleon_delete_file_job.rb:
+  # include CamaleonCms::UploaderHelper
+  # cama_uploader.delete_file(file_key)
+  CamaleonCmsUploader.delete_block do |settings, cama_uploader, file_key|
+    next unless Rails.env.test?
+
+    sleep(settings[:temporal_time])
+    cama_uploader.delete_file(file_key)
+  end
 end

data/config/initializers/sass.rb

@@ -1,3 +1,5 @@
+require 'sassc'
+
 module Sprockets
   # Processor engine class for the SASS/SCSS compiler. Depends on the `sass` gem.
   #
@@ -11,23 +13,23 @@ module Sprockets
       # return them path (this prefix automatically the path with current theme location)
       # Sample: .container{ background: #ffffff url(asset_theme_path('img/patterns/pattern1.jpg')); }
       def asset_theme_path(path, options = {})
-        asset_path(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
+        asset_path(::SassC::Script::Value::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
       # Sample: .container{ background: #ffffff asset-theme-url('img/patterns/pattern1.jpg'); }
       def asset_theme_url(path, options = {})
-        asset_url(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
+        asset_url(::SassC::Script::Value::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
       def asset_plugin_path(path, options = {})
-        asset_path(Autoload::Sass::Script::String.new("#{get_plugin_prefix}/#{path.value}"), options)
+        asset_path(::SassC::Script::Value::String.new("#{get_plugin_prefix}/#{path.value}"), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
       def asset_plugin_url(path, options = {})
-        asset_url(Autoload::Sass::Script::String.new("#{get_plugin_prefix}/#{path.value}"), options)
+        asset_url(::SassC::Script::Value::String.new("#{get_plugin_prefix}/#{path.value}"), options)
       end
 
       private
@@ -35,23 +37,17 @@ module Sprockets
       # get plugin asset prefix
       def get_plugin_prefix
         file = options[:filename]
-        res = ''
-        if file.include?('/plugins/')
-          res = "plugins/#{file.split('/plugins/').last.split('/').first}/#{if file.include?('apps/plugins/')
-                                                                              'assets/'
-                                                                            end}"
-        end
-        res
+        return '' unless file.include?('/plugins/')
+
+        "plugins/#{file.split('/plugins/').last.split('/').first}/#{file.include?('apps/plugins/') ? 'assets/' : ''}"
       end
 
       # get theme asset prefix
       def get_theme_prefix
         file = options[:filename]
-        res = ''
-        if file.include?('/themes/')
-          res = "themes/#{file.split('/themes/').last.split('/').first}/#{'assets/' if file.include?('apps/themes/')}"
-        end
-        res
+        return '' unless file.include?('/themes/')
+
+        "themes/#{file.split('/themes/').last.split('/').first}/#{'assets/' if file.include?('apps/themes/')}"
       end
     end
   end

data/lib/camaleon_cms/engine.rb

@@ -10,7 +10,7 @@ require 'aws-sdk-s3'
 require 'font-awesome-rails'
 require 'tinymce-rails'
 require 'jquery-rails'
-require 'sass-rails'
+require 'dartsass-sprockets'
 require 'cama_contact_form'
 require 'cama_meta_tag'
 
@@ -59,7 +59,7 @@ module CamaleonCms
       app.config.assets.paths << File.join($camaleon_engine_dir, 'app', 'assets', 'fonts')
       app.config.encoding = 'utf-8'
 
-      # add prefix url, like: http://localhost.com/blog/
+      # add prefix url, like: https://localhost.com/blog/
       # config.action_controller.relative_url_root = PluginRoutes.system_info["relative_url_root"] if PluginRoutes.system_info["relative_url_root"].present?
 
       # multiple route files

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.7.5'.freeze
+  VERSION = '2.8.1'.freeze
 end

data/lib/ext/hash.rb

@@ -19,7 +19,7 @@ class Hash
 
   # used for hash of objects
   def find_by(val, attr = 'id')
-    each do |_key, p|
+    each_value do |p|
       return p if p[attr].to_s == val.to_s
     end
     nil

data/lib/ext/string.rb

@@ -66,11 +66,11 @@ class String
   end
 
   # parse string into domain
-  # http://owem.tuzitio.com into owem.tuzitio.com
+  # https://owen.camaleon.website into owen.camaleon.website
   def parse_domain
     url = self
     uri = URI.parse(url)
-    uri = URI.parse("http://#{url}") if uri.scheme.nil?
+    uri = URI.parse("https://#{url}") if uri.scheme.nil?
     host = (uri.host || self).downcase
     h = host.start_with?('www.') ? host[4..] : host
     "#{h}#{":#{uri.port}" unless [80, 443].include?(uri.port)}"

data/lib/generators/camaleon_cms/theme_template/assets/js/main.js

@@ -10,5 +10,5 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery.js
+//= require jquery2
 //= require camaleon_cms/bootstrap.min.js