camaleon_cms 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bbfa67257bf8efd2830d5c4d20d1e00ce5db6293c145205326fc5c496a6ffd1
-  data.tar.gz: 848c0feddb8c6dbe3be7d992d1b116c9b438006cea66af150468576e8096eb9c
+  metadata.gz: 6aace403e18b38c945faca659af2196ed66f130ed61e7b5454626137c59331ce
+  data.tar.gz: f104182791714153a963e03ccc23dec4720cd9e7528ab378b0facf33e351e2b4
 SHA512:
-  metadata.gz: 1ff798ffbe98e5906feed579e437f3da2b8636f99b2d22f508afbcc6981c70752ea464ac21af2457f73e94087fe4d88ee863ce3fadaca956d7570422710eebb3
-  data.tar.gz: 793bd8de6630499e71697966559066d74f38f1ccd225434fc2f4b101ce41fe1dbc62fbba94138bc57ca473a3abf9a9f48ecc820df1f0ec538b8ffed89b2268c4
+  metadata.gz: 28708ab09b20a2a0c78ae3f104e2a38c5560725596bc9e70e935fb3384230f0ef006523d9f56db6e3c4ee5238a066ca6e1d6ea31e710623c8b9c9b8777380fb2
+  data.tar.gz: c7fe66386eb9b15fd988afc2ad366a1ffd16d82f923219c10b61e590e5eda7f27b66413da745cb9eca8c736284500f35d9bbd41f6c39dd99828164ba8c308544

data/app/controllers/camaleon_cms/admin/posts_controller.rb

@@ -56,7 +56,7 @@ module CamaleonCms
         r = { posts: @posts, post_type: @post_type, btns: @btns, all_posts: posts_all, render: 'index',
               per_page: per_page }
         hooks_run('list_post', r)
-        add_breadcrumb (@btns[params[:s].to_sym]).to_s if params[:s].present?
+        add_breadcrumb(@btns[params[:s].to_sym].to_s) if params[:s].present?
         @posts = r[:posts].paginate(page: params[:page], per_page: r[:per_page])
         render r[:render]
       end

data/app/controllers/camaleon_cms/admin/users_controller.rb

@@ -52,10 +52,15 @@ module CamaleonCms
       def updated_ajax
         @user = current_site.users.find(params[:user_id])
         update_session = current_user_is?(@user)
-        @user.update(params.require(:password).permit!)
-        render inline: @user.errors.full_messages.join(', ')
+        attrs = params.require(:password).permit(%i[password password_confirmation])
+        @user.update(password: attrs.require(:password), password_confirmation: attrs.require(:password_confirmation))
+
+        return render inline: @user.errors.full_messages.join(', '), status: :unprocessable_entity if @user.errors.any?
+
         # keep user logged in when changing their own password
         update_auth_token_in_cookie @user.auth_token if update_session && @user.saved_change_to_password_digest?
+      rescue ActionController::ParameterMissing => e
+        render inline: "ERROR: #{e.class.name}, #{e.message}", status: :bad_request
       end
 
       def update_auth_token_in_cookie(token)

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

@@ -9,7 +9,7 @@ module CamaleonCms
         draw_menu({ menu_slug: key, container_class: class_name })
       end
 
-      # draw menu as an html
+      # draw menu as html
       # default configurations is for bootstrap support
       def draw_menu(args = {})
         args_def = {
@@ -33,7 +33,7 @@ module CamaleonCms
           #     index: (Integer) Index Position of this menu
           #     link_attrs: (String) Here you can add your custom attrs for current link, sample: id='my_id' data-title='#{args[:link][:name]}'
           #     item_container_attrs: (String) Here you can add your custom attrs for link container.
-          # In settings you can change the values for this item, like after, before, ..:
+          # In settings, you can change the values for this item, like after, before, ..:
           # sample: lambda{|args| args[:settings][:after] = "<span class='caret'></span>" if args[:has_children]; args[:link_attrs] = "id='#{menu_item.id}'";  }
           # sample: lambda{|args| args[:settings][:before] = "<i class='fa fa-home'></i>" if args[:level] == 0 && args[:index] == 0;  }
           before: '', # content before link text
@@ -99,7 +99,7 @@ module CamaleonCms
           html += "<#{_args[:item_container]} #{r[:item_container_attrs]} class='#{_args[:item_class]} #{if has_children
                                                                                                            _args[:item_class_parent]
                                                                                                          end} #{if _is_current
-                                                                                                                  (_args[:item_current]).to_s
+                                                                                                                  _args[:item_current].to_s
                                                                                                                 end} #{if current_children
                                                                                                                          'current-menu-ancestor'
                                                                                                                        end}'>#{_args[:link_before]}
@@ -129,8 +129,8 @@ module CamaleonCms
 
       # filter and parse all menu items visible for current user and adding the flag for current_parent or current_item
       # max_levels: max levels to iterate
-      # return an multidimensional array with all items until level 'max_levels'
-      # internal_level: ingnore (managed by internal recursion)
+      # return a multidimensional array with all items until level 'max_levels'
+      # internal_level: ignore (managed by internal recursion)
       def cama_menu_parse_items(items, max_levels = -1, internal_level = 0)
         res = []
         is_current_parent = false
@@ -154,7 +154,7 @@ module CamaleonCms
             current_item: _is_current,
             current_parent: false,
             levels: 0
-          }.merge(data_nav_item.except(:current, :name, :link))
+          }.merge!(data_nav_item.except(:current, :name, :link))
 
           if has_children
             r[:children], _is_current_parent, r[:levels] = cama_menu_parse_items(nav_menu_item.children, max_levels,

data/app/models/camaleon_cms/meta.rb

@@ -2,5 +2,9 @@ module CamaleonCms
   class Meta < CamaleonRecord
     self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}metas"
     # attr_accessible :objectid, :key, :value, :object_class
+
+    extend CamaleonCms::NormalizeAttrs
+
+    normalize_attrs(:value)
   end
 end

data/app/models/camaleon_cms/post.rb

@@ -83,7 +83,7 @@ module CamaleonCms
 
     # check if this is in draft status
     def draft?
-      status == 'draft' || status == 'draft_child'
+      %w[draft draft_child].include?(status)
     end
 
     def draft_child?

data/app/models/camaleon_cms/post_comment.rb

@@ -3,6 +3,8 @@ module CamaleonCms
     include CamaleonCms::Metas
     include CamaleonCms::CommonRelationships
 
+    extend CamaleonCms::NormalizeAttrs
+
     self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}comments"
     # attr_accessible :user_id, :post_id, :content, :author, :author_email, :author_url, :author_IP, :approved, :agent, :agent, :typee, :comment_parent, :is_anonymous
     attr_accessor :is_anonymous
@@ -21,6 +23,8 @@ module CamaleonCms
     scope :comment_parent, -> { where(comment_parent: 'is not null') }
     scope :approveds, -> { where(approved: 'approved') }
 
+    normalize_attrs(:content)
+
     validates :content, presence: true
     validates_presence_of :author, :author_email, if: proc { |c| c.is_anonymous.present? }
     after_create :update_counter

data/app/models/camaleon_cms/post_type.rb

@@ -179,7 +179,7 @@ module CamaleonCms
 
     # destroy all custom field groups assigned to this post type
     def destroy_field_groups
-      if !destroyed_by_association.present? && (slug == 'post' || slug == 'page')
+      if !destroyed_by_association.present? && %w[post page].include?(slug)
         errors.add(:base, 'This post type can not be deleted.')
         return false
       end

data/app/models/camaleon_cms/term_taxonomy.rb

@@ -3,11 +3,7 @@ module CamaleonCms
     include CamaleonCms::Metas
     include CamaleonCms::CustomFieldsRead
 
-    TRANSLATION_TAG_HIDE_MAP = { '<!--' => '!--', '-->' => '--!' }.freeze
-    TRANSLATION_TAG_HIDE_REGEX = Regexp.new(TRANSLATION_TAG_HIDE_MAP.keys.map { |x| Regexp.escape(x) }.join('|')).freeze
-    TRANSLATION_TAG_RESTORE_MAP = { '--!' => '-->', '!--' => '<!--' }.freeze
-    TRANSLATION_TAG_RESTORE_REGEX =
-      Regexp.new(TRANSLATION_TAG_RESTORE_MAP.keys.map { |x| Regexp.escape(x) }.join('|')).freeze
+    extend CamaleonCms::NormalizeAttrs
 
     def self.inherited(subclass)
       super
@@ -22,23 +18,7 @@ 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)&.gsub(TRANSLATION_TAG_HIDE_REGEX, TRANSLATION_TAG_HIDE_MAP)
-          )&.gsub(TRANSLATION_TAG_RESTORE_REGEX, TRANSLATION_TAG_RESTORE_MAP)
-        end
-      end
-    else
-      normalizes :name, :description, with: lambda { |field|
-        ActionController::Base.helpers.sanitize(field.gsub(TRANSLATION_TAG_HIDE_REGEX, TRANSLATION_TAG_HIDE_MAP))
-                              .gsub(TRANSLATION_TAG_RESTORE_REGEX, TRANSLATION_TAG_RESTORE_MAP)
-      }
-    end
+    normalize_attrs(:name, :description)
 
     # callbacks
     before_validation :before_validating

data/app/models/camaleon_record.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 class CamaleonRecord < ActiveRecord::Base
+  TRANSLATION_TAG_HIDE_MAP = { '<!--' => '!--', '-->' => '--!' }.freeze
+  TRANSLATION_TAG_HIDE_REGEX = Regexp.new(TRANSLATION_TAG_HIDE_MAP.keys.map { |x| Regexp.escape(x) }.join('|')).freeze
+  TRANSLATION_TAG_RESTORE_MAP = { '--!' => '-->', '!--' => '<!--' }.freeze
+  TRANSLATION_TAG_RESTORE_REGEX =
+    Regexp.new(TRANSLATION_TAG_RESTORE_MAP.keys.map { |x| Regexp.escape(x) }.join('|')).freeze
+
   include ActiveRecordExtras::Relation
 
   self.abstract_class = true

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

@@ -95,9 +95,7 @@ module CamaleonCms
           f.custom_field_slug == _key && f.group_number == group_number
         end.map(&:value)
       else
-        custom_field_values.where(
-          custom_field_slug: _key, group_number: group_number
-        ).pluck(:value)
+        custom_field_values.where(custom_field_slug: _key, group_number: group_number).pluck(:value)
       end
     end
     alias get_fields get_field_values
@@ -304,7 +302,9 @@ module CamaleonCms
     private
 
     def fix_meta_value(value)
-      value = value.to_json if value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
+      return value.to_json if value.is_a?(ActionController::Parameters)
+      return JSON.fast_generate(value) if value.is_a?(Array) || value.is_a?(Hash)
+
       value
     end
 

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

@@ -19,8 +19,7 @@ module CamaleonCms
     end
 
     # return value of meta with key: key,
-    # if meta not exist, return default
-    # return default if meta value == ""
+    # if meta not exist, or its value == "", return default
     def get_meta(key, default = nil)
       key_str = key.is_a?(Symbol) ? key.to_s : key
       cama_fetch_cache("meta_#{key_str}") do
@@ -70,8 +69,7 @@ module CamaleonCms
 
     # return configuration for current object
     # key: attribute name
-    # default: if attribute not exist, return default
-    # return default if option value == ""
+    # default: if the attribute doesn't exist, or its value == "", return default
     # return value for attribute
     def get_option(key = nil, default = nil, meta_key = '_default')
       values = cama_options(meta_key)
@@ -133,8 +131,14 @@ module CamaleonCms
 
     # fix to parse value
     def fix_meta_value(value)
-      value = value.to_json if value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
-      fix_meta_var(value)
+      changed_value = if value.is_a?(ActionController::Parameters)
+                        value.to_json
+                      elsif value.is_a?(Array) || value.is_a?(Hash)
+                        JSON.fast_generate(value)
+                      else
+                        value
+                      end
+      fix_meta_var(changed_value)
     end
 
     # fix to detect type of the variable

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module CamaleonCms
+  module NormalizeAttrs
+    def normalize_attrs(*args)
+      # 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
+          args.each do |attr|
+            next unless new_record? || attribute_changed?(attr)
+
+            self[attr] = ActionController::Base.helpers.sanitize(
+              __send__(attr)&.gsub(CamaleonRecord::TRANSLATION_TAG_HIDE_REGEX, CamaleonRecord::TRANSLATION_TAG_HIDE_MAP)
+            )&.gsub(CamaleonRecord::TRANSLATION_TAG_RESTORE_REGEX, CamaleonRecord::TRANSLATION_TAG_RESTORE_MAP)
+          end
+        end
+      else
+        normalizes(*args, with: lambda { |field|
+          ActionController::Base.helpers.sanitize(
+            field.gsub(CamaleonRecord::TRANSLATION_TAG_HIDE_REGEX, CamaleonRecord::TRANSLATION_TAG_HIDE_MAP)
+          ).gsub(CamaleonRecord::TRANSLATION_TAG_RESTORE_REGEX, CamaleonRecord::TRANSLATION_TAG_RESTORE_MAP)
+        })
+      end
+    end
+  end
+end

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

@@ -6,17 +6,21 @@ module CamaleonCms
       include CamaleonCms::CustomFieldsRead
       include CamaleonCms::CommonRelationships
 
+      extend CamaleonCms::NormalizeAttrs
+
       validates_uniqueness_of :username, scope: [:site_id], case_sensitive: false,
                                          message: I18n.t('camaleon_cms.admin.users.message.requires_different_username', default: 'Requires different username')
       validates_uniqueness_of :email, scope: [:site_id], case_sensitive: false,
                                       message: I18n.t('camaleon_cms.admin.users.message.requires_different_email', default: 'Requires different email')
 
+      normalize_attrs(:first_name, :last_name, :username)
+
       # callbacks
       before_validation :cama_before_validation
       before_destroy :reassign_posts
       after_destroy :reassign_comments
       before_create { generate_token(:auth_token) }
-      # invaliidate sessions when changing password
+      # invalidate sessions when changing password
       before_update { generate_token :auth_token if will_save_change_to_password_digest? }
 
       # relations
@@ -117,7 +121,7 @@ module CamaleonCms
 
     # reassign all posts of this user to first admin
     # reassign all comments of this user to first admin
-    # if doesn't exist any other administrator, this will cancel the user destroy
+    # if it doesn't exist any other administrator, this will cancel the user destroy
     def reassign_posts
       all_posts.each do |p|
         s = p.post_type.site

data/app/validators/camaleon_cms/post_uniq_validator.rb

@@ -28,10 +28,11 @@ module CamaleonCms
       end
 
       # avoid recursive page parent
-      if record.post_parent.present? && ptype.manage_hierarchy? && record.parents.cama_pluck(:id).include?(record.id)
-        record.errors[:base] << I18n.t('camaleon_cms.admin.post.message.recursive_hierarchy',
-                                       default: 'Parent Post Recursive')
-      end
+      return unless record.post_parent.present? && ptype.manage_hierarchy? &&
+                    record.parents.cama_pluck(:id).include?(record.id)
+
+      record.errors[:base] << I18n.t('camaleon_cms.admin.post.message.recursive_hierarchy',
+                                     default: 'Parent Post Recursive')
     end
   end
 end

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

@@ -126,7 +126,11 @@
                     <div class="panel-body padding-0">
                         <% fields =  @field_group.new_record? ? [] : @field_group.fields %>
                         <ul id="sortable-fields" class="clear list-unstyled">
-                            <% fields.each do |field| @item_value = field; @item_options_value = field.options; @key = field.options[:field_key] %>
+                            <% fields.each do |field|
+                              @item_value = field
+                              @item_options_value = field.options
+                              @key = field.options['field_key']
+                            %>
                                 <li class="item">
                                     <%= render "get_items" %>
                                 </li>
@@ -162,6 +166,3 @@
         <% end %>
     </div>
 </div>
-
-
-

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.9.0'.freeze
+  VERSION = '2.9.1'.freeze
 end

data/lib/plugin_routes.rb

@@ -275,7 +275,7 @@ class PluginRoutes
 
   def self.cache_variable(var_name, value = nil)
     @@_vars.push(var_name).uniq!
-    # if Rails.env != "development" # disable cache plugin routes for develoment mode
+    # if Rails.env != "development" # disable cache plugin routes for development mode
     cache = begin
       class_variable_get("@@cache_#{var_name}")
     rescue StandardError
@@ -376,9 +376,9 @@ class PluginRoutes
     return r unless r.nil? || r == []
 
     res = get_gem_themes
-    entries = ['.', '..']
+    entries = %w[. ..]
     res.each { |theme| entries << theme['key'] }
-    (Dir["#{apps_dir}/themes/*"]).each do |path|
+    Dir["#{apps_dir}/themes/*"].each do |path|
       entry = path.split('/').last
       config = File.join(path, 'config', 'config.json')
       next if entries.include?(entry) || !File.directory?(path) || !File.exist?(config)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Owen Peredo Diaz
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -805,6 +804,7 @@ files:
 - app/models/concerns/camaleon_cms/common_relationships.rb
 - app/models/concerns/camaleon_cms/custom_fields_read.rb
 - app/models/concerns/camaleon_cms/metas.rb
+- app/models/concerns/camaleon_cms/normalize_attrs.rb
 - app/models/concerns/camaleon_cms/site_default_settings.rb
 - app/models/concerns/camaleon_cms/user_methods.rb
 - app/models/plugins.rb
@@ -1134,7 +1134,6 @@ homepage: https://camaleon.website
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1152,8 +1151,7 @@ requirements:
 - rails >= 6.1
 - ruby >= 3.0
 - imagemagick
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Camaleon is a CMS for Ruby on Rails as an alternative to Wordpress.
 test_files: []