camaleon_cms 2.9.2 → 2.9.4

data/app/helpers/camaleon_cms/short_code_helper.rb

@@ -2,96 +2,100 @@ module CamaleonCms
   module ShortCodeHelper
     # Internal method
     def shortcodes_init
-      @_shortcodes = []
-      @_shortcodes_template = {}
-      @_shortcodes_descr = {}
+      CurrentRequest.shortcodes = []
+      CurrentRequest.shortcodes_template = {}
+      CurrentRequest.shortcodes_descr = {}
 
       shortcode_add('widget', nil, "Renderize the widget content in this place.
                 Don't forget to create and copy the shortcode of your widgets in appearance -> widgets
                 Sample: [widget widget_key]")
 
-      shortcode_add('load_libraries',
-                    lambda { |attrs, args|
-                      return args[:shortcode] unless attrs.present?
-
-                      cama_load_libraries(*attrs['data'].to_s.split(','))
-                      ''
-                    },
-                    "Permit to load libraries on demand, sample: [load_libraries data='datepicker,tinymce']")
-
-      shortcode_add('asset',
-                    lambda { |attrs, args|
-                      return args[:shortcode] unless attrs.present?
-
-                      url = ActionController::Base.helpers.asset_url(attrs['file'])
-                      if attrs['image'].present?
-                        ActionController::Base.helpers.image_tag(attrs['file'], class: attrs['class'],
-                                                                                style: attrs['style'])
-                      else
-                        url
-                      end
-                    },
-                    "Permit to generate an asset url (
-                    add file='' asset file path,
-                    add as_path='true' to generate only the path and not the full url,
-                    add class='my_class' to setup image class,
-                    add style='height: 100px; width: 200px;...' to setup image style,
-                    add image='true' to generate the image tag with this url),
-                  sample: <img src=\"[asset as_path='true' file='themes/my_theme/assets/img/signature.png']\" /> or [asset image='true' file='themes/my_theme/assets/img/signature.png' style='height: 50px;']")
-
-      shortcode_add('data',
-                    lambda { |attrs, args|
-                      attrs.present? ? cama_shortcode_data(attrs, args) : args[:shortcode]
-                    },
-                    "Permit to generate specific data of a post.
-                  Attributes:
-                    object: (String, defaut post) Model name: post | posttype | category | posttag | site | user |theme | navmenu
-                    id: (Integer) Post id
-                    key: (String) Post slug
-                    field: (String) Custom field key, you can add render_field='true' to render field as html element, also you can add index=2 to indicate the value in position 2 for multitple values
-                    attrs: (String) attribute name
-                            post: title | created_at | excerpt | url | link | thumb | updated_at | author_name | author_url | content
-                            posttype: title | created_at | excerpt | url | link | thumb | updated_at
-                            category: title | created_at | excerpt | url | link | thumb | updated_at
-                            posttag: title | created_at | excerpt | url | link | thumb | updated_at
-                            site: title | created_at | excerpt | url | link | thumb | updated_at
-                            user: title | created_at | excerpt | url | link | thumb | updated_at
-                            theme: title | created_at | excerpt | url | link | thumb | updated_at
-                            navmenu: title | created_at | excerpt | url | link | thumb | updated_at
-                    Note: If id and key is not present, then will be rendered for current model
-                  Sample:
-                    [data id='122' attr='title'] ==> return the title of post with id = 122
-                    [data key='contact' attr='url'] ==> return the url of post with slug = contact
-                    [data key='contact' attr='link'] ==> return the link with title as text of the link of post with slug = contact
-                    [data object='site' attr='url'] ==> return the url of currrent site
-                    [data key='page' object='posttype' attr='url'] ==> return the url of post_type with slug = page
-                    [data field=icon index=2] ==> return the second value (multiple values) for this custom field with key=icon of current object
-                    [data key='contact' field='sub_title'] ==> return the value of the custom_field with key=sub_title registered for post.slug = contact
-                    [data object='site' field='sub_title'] ==> return the value of the custom_field with key=sub_title registered for current_site")
+      shortcode_add(
+        'load_libraries',
+        lambda do |attrs, args|
+          return args[:shortcode] if attrs.blank?
+
+          cama_load_libraries(*attrs['data'].to_s.split(','))
+          ''
+        end,
+        "Permit to load libraries on demand, sample: [load_libraries data='datepicker,tinymce']"
+      )
+      # rubocop:disable Layout/LineLength
+      shortcode_add(
+        'asset',
+        lambda do |attrs, args|
+          return args[:shortcode] if attrs.blank?
+
+          url = shortcode_asset_reference(attrs['file'], as_path: attrs['as_path'].present?)
+          if attrs['image'].present?
+            ActionController::Base.helpers.image_tag(url, class: attrs['class'], style: attrs['style'])
+          else
+            url
+          end
+        end,
+        "Permit to generate an asset url (
+        add file='' asset file path,
+        add as_path='true' to generate only the path and not the full url,
+        add class='my_class' to setup image class,
+        add style='height: 100px; width: 200px;...' to setup image style,
+        add image='true' to generate the image tag with this url),
+      sample: <img src=\"[asset as_path='true' file='themes/my_theme/assets/img/signature.png']\" /> or [asset image='true' file='themes/my_theme/assets/img/signature.png' style='height: 50px;']"
+      )
+
+      shortcode_add(
+        'data',
+        ->(attrs, args) { attrs.present? ? cama_shortcode_data(attrs, args) : args[:shortcode] },
+        "Permit to generate specific data of a post.
+        Attributes:
+          object: (String, defaut post) Model name: post | posttype | category | posttag | site | user |theme | navmenu
+          id: (Integer) Post id
+          key: (String) Post slug
+          field: (String) Custom field key, you can add render_field='true' to render field as html element, also you can add index=2 to indicate the value in position 2 for multitple values
+          attrs: (String) attribute name
+                  post: title | created_at | excerpt | url | link | thumb | updated_at | author_name | author_url | content
+                  posttype: title | created_at | excerpt | url | link | thumb | updated_at
+                  category: title | created_at | excerpt | url | link | thumb | updated_at
+                  posttag: title | created_at | excerpt | url | link | thumb | updated_at
+                  site: title | created_at | excerpt | url | link | thumb | updated_at
+                  user: title | created_at | excerpt | url | link | thumb | updated_at
+                  theme: title | created_at | excerpt | url | link | thumb | updated_at
+                  navmenu: title | created_at | excerpt | url | link | thumb | updated_at
+          Note: If id and key is not present, then will be rendered for current model
+        Sample:
+          [data id='122' attr='title'] ==> return the title of post with id = 122
+          [data key='contact' attr='url'] ==> return the url of post with slug = contact
+          [data key='contact' attr='link'] ==> return the link with title as text of the link of post with slug = contact
+          [data object='site' attr='url'] ==> return the url of currrent site
+          [data key='page' object='posttype' attr='url'] ==> return the url of post_type with slug = page
+          [data field=icon index=2] ==> return the second value (multiple values) for this custom field with key=icon of current object
+          [data key='contact' field='sub_title'] ==> return the value of the custom_field with key=sub_title registered for post.slug = contact
+          [data object='site' field='sub_title'] ==> return the value of the custom_field with key=sub_title registered for current_site"
+      )
     end
+    # rubocop:enable Layout/LineLength
 
     # add shortcode
     # key: shortcode key
-    # template: template to render, if nil will render "shortcode_templates/<key>"
-    # Also can be a function to execute that instead a render, sample: lambda{|attrs, args| return "my custom content"; }
+    # template: template to render, if nil renders "shortcode_templates/<key>"
+    # Also can be a function to execute that instead a render, sample: lambda{|attrs, args| return "my custom content" }
     # descr: description for shortcode
     def shortcode_add(key, template = nil, descr = '')
-      @_shortcodes << key
-      @_shortcodes_template = @_shortcodes_template.merge({ key.to_s => template }) if template.present?
-      @_shortcodes_descr[key] = descr if descr.present?
+      shortcode_keys << key
+      CurrentRequest.shortcodes_template = shortcode_templates.merge({ key.to_s => template }) if template.present?
+      shortcode_descriptions[key] = descr if descr.present?
     end
 
     # add or update shortcode template
     # key: chortcode key to add or update
     # template: template to render, if nil will render "shortcode_templates/<key>"
     def shortcode_change_template(key, template = nil)
-      @_shortcodes_template[key] = template
+      shortcode_templates[key] = template
     end
 
-    # delete shortcode
+    # Delete the shortcode
     # key: chortcode key to delete
     def shortcode_delete(key)
-      @_shortcodes.delete(key)
+      shortcode_keys.delete(key)
     end
 
     # run all shortcodes in the content
@@ -122,8 +126,11 @@ module CamaleonCms
     # text: text that contain the shortcode
     # key: shortcode key
     # template: template to render, if nil this will render default render file
-    # Also can be a function to execute that instead a render, sample: lambda{|attrs, args| return "my custom content"; }
-    # render_shortcode("asda dasdasdas[owen a='1'] [bbb] sdasdas dasd as das[owen a=213]", "owen", lambda{|attrs, args| puts attrs; return "my test"; })
+    # Also can be a function to execute that instead a render, sample: lambda{|attrs, args| return "my custom content" }
+    # render_shortcode(
+    #   "asda dasdasdas[owen a='1'] [bbb] sdasdas dasd as das[owen a=213]", "owen",
+    #   lambda { |attrs, args| puts attrs; return "my test"; }
+    # )
     def render_shortcode(text, key, template = nil)
       text.scan(/#{cama_reg_shortcode(key)}/).each do |item|
         text = _cama_replace_shortcode(text, item, {}, template)
@@ -131,6 +138,14 @@ module CamaleonCms
       text
     end
 
+    def shortcodes_list
+      shortcode_keys
+    end
+
+    def shortcodes_descriptions
+      shortcode_descriptions
+    end
+
     private
 
     # helper to replace shortcodes adding support for closed shortcodes, sample: [title]my title[/title]
@@ -154,32 +169,113 @@ module CamaleonCms
     # if empty, codes will be replaced with all registered shortcodes
     # Return: (String) reg expression string
     def cama_reg_shortcode(codes = nil)
-      # "(\\[(#{codes || (@_shortcodes || []).join("|")})(\s|\\]){0}(.*?)\\])" # doesn't support for similar names, like: [media] and [media_gallery]
-      "(\\[(#{codes || (@_shortcodes || []).join('|')})((\s)((?!\\]).)*|)\\])"
+      # doesn't support for similar names, like: [media] and [media_gallery]
+      # "(\\[(#{codes || (@_shortcodes || []).join("|")})(\s|\\]){0}(.*?)\\])"
+      "(\\[(#{codes || shortcode_keys.join('|')})((\s)((?!\\]).)*|)\\])"
     end
 
     # determine the content to replace instead the shortcode
     # return string
     def _eval_shortcode(code, attrs, args = {}, template = nil)
-      template ||= (@_shortcodes_template[code].present? ? @_shortcodes_template[code] : "camaleon_cms/shortcode_templates/#{code}")
-      if @_shortcodes_template[code].instance_of?(::Proc)
-        @_shortcodes_template[code].call(_shortcode_parse_attr(attrs), args)
+      templates = shortcode_templates
+      template ||= templates[code].presence || "camaleon_cms/shortcode_templates/#{code}"
+      if templates[code].instance_of?(::Proc)
+        templates[code].call(_shortcode_parse_attr(attrs), args)
       else
         render template: template, locals: { attributes: _shortcode_parse_attr(attrs), args: args }, formats: [:html]
       end
     end
 
+    def shortcode_keys
+      CurrentRequest.shortcodes ||= []
+    end
+
+    def shortcode_templates
+      CurrentRequest.shortcodes_template ||= {}
+    end
+
+    def shortcode_descriptions
+      CurrentRequest.shortcodes_descr ||= {}
+    end
+
+    def shortcode_asset_reference(file, as_path: false)
+      return if file.blank?
+
+      # Defensive ordering: assign the locals the rescue branch uses before
+      # everything else, so it can never see them nil. The only call that raises
+      # AssetNotFound is the asset helper below — resolve_shortcode_theme_asset
+      # never does (regex, string interpolation and File.exist? only).
+      helper = ActionController::Base.helpers
+      method_name = as_path ? :asset_path : :asset_url
+      file = resolve_shortcode_theme_asset(file)
+      helper.public_send(method_name, file)
+    rescue Sprockets::Rails::Helper::AssetNotFound
+      helper.public_send(method_name, file, skip_pipeline: true)
+    end
+
+    def resolve_shortcode_theme_asset(file)
+      # Tolerate both `themes/<slug>/assets/...` and `/themes/<slug>/assets/...`
+      # — the latter is what Rails' asset helpers typically emit.
+      match = file.to_s.match(%r{\A/?themes/[^/]+/assets/(?<asset>.+)\z})
+      return file unless match
+
+      can_resolve_theme_assets = respond_to?(:current_theme) &&
+                                 respond_to?(:theme_asset_path) &&
+                                 respond_to?(:theme_asset_file_path)
+      return file unless can_resolve_theme_assets
+
+      return file if current_theme.blank?
+
+      asset = match[:asset]
+      remapped_file = theme_asset_path(asset)
+      return file unless remapped_file.present? && remapped_file != file
+      return file unless File.exist?(theme_asset_file_path(asset))
+
+      remapped_file
+    end
+
     # parse the attributes of a shortcode
     def _shortcode_parse_attr(text)
       res = {}
-      return res unless text.present?
+      return res if text.blank?
 
-      text.scan(/(\w+)\s*=\s*"([^"]*)"(?:\s|$)|(\w+)\s*=\s*'([^']*)'(?:\s|$)|(\w+)\s*=\s*([^\s'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/).each do |item|
-        item.each_with_index do |c, index|
-          if c.present?
-            res[c] = item[index + 1]
-            break
-          end
+      # StringScanner tokenizes the text by moving through it sequentially,
+      # matching patterns and advancing the scan pointer with each successful scan.
+      scanner = StringScanner.new(text)
+
+      # Continue parsing until we reach the end of the string.
+      until scanner.eos?
+        # Skip any leading whitespace before attempting to match a token.
+        scanner.skip(/\s+/)
+        break if scanner.eos?
+
+        # Attempt to match a key=value attribute (e.g., width="100", class='foo', height=200).
+        # Capture group 1 extracts the attribute name (word characters before =).
+        if scanner.scan(/(\w+)\s*=\s*/)
+          key = scanner[1]
+
+          # Determine the attribute value based on its quoting style:
+          # 1. Double-quoted string: "value" → extract content between quotes
+          # 2. Single-quoted string: 'value' → extract content between quotes
+          # 3. Unquoted value: any characters except whitespace or quotes
+          val = if scanner.scan(/"([^"]*)"/)
+                  scanner[1]
+                elsif scanner.scan(/'([^']*)'/)
+                  scanner[1]
+                elsif scanner.scan(/([^\s'"]+)/)
+                  scanner[1]
+                end
+
+          # Store the parsed key-value pair in the result hash.
+          res[key] = val
+
+        # If no key=value pattern matched, this is a standalone value (no assignment).
+        # Match either a double-quoted string or a bare unquoted token.
+        elsif scanner.scan(/"([^"]*)"|(\S+)/)
+          # Use the appropriate capture group: group 1 for quoted, group 2 for unquoted.
+          val = scanner[1] || scanner[2]
+          # Standalone values are stored with a nil key reference.
+          res[val] = nil
         end
       end
       res
@@ -195,7 +291,7 @@ module CamaleonCms
               else
                 args[:owner]
               end
-      return res unless model.present?
+      return res if model.blank?
 
       if attrs['field'].present? # model custom fields
         field = model.get_field_object(attrs['field'])
@@ -295,7 +391,7 @@ module CamaleonCms
 
       when 'navmenu'
         model = current_site.nav_menu_items.find(attrs['id']) if attrs['id'].present?
-        model = current_site.nav_menu_items.find_by_slug(attrs['key']) if attrs['key'].present?
+        model = current_site.nav_menu_items.find_by_slug(attrs['key']) if attrs['key'].present? # rubocop:disable Rails/DynamicFindBy
 
       when 'user'
         model = current_site.the_user(attrs['id'].to_i) if attrs['id'].present?

data/app/helpers/camaleon_cms/site_helper.rb

@@ -3,9 +3,9 @@ module CamaleonCms
     # return current site or assign a site as a current site
     def current_site(site = nil)
       if site.present?
-        @current_site = site.decorate
-        CurrentRequest.site = @current_site
-        return @current_site
+        CurrentRequest.site = site.decorate
+        CurrentRequest.frontend_current_theme = nil
+        return CurrentRequest.site
       end
 
       if defined?($current_site)
@@ -13,11 +13,19 @@ module CamaleonCms
         return $current_site
       end
 
-      if defined?(@current_site) && @current_site.present?
-        CurrentRequest.site = @current_site
-        return @current_site
+      # Honor a caller-set @current_site (HtmlMailer and other background senders assign it) before the
+      # memoized CurrentRequest.site, so a delivery for another site resolves against that site rather
+      # than the request's. Restores 2.9.2; without it, multisite/background mail resolves the wrong site
+      # or raises NameError on `request` in a job. See regression audit M21. Read via
+      # instance_variable_get to match #current_theme and avoid Rails/HelperInstanceVariable.
+      caller_site = (instance_variable_get(:@current_site) if instance_variable_defined?(:@current_site))
+      if caller_site.present?
+        CurrentRequest.site = caller_site
+        return caller_site
       end
 
+      return CurrentRequest.site if CurrentRequest.site.present?
+
       if PluginRoutes.get_sites.size == 1
         site = begin
           CamaleonCms::Site.first.decorate
@@ -43,16 +51,28 @@ module CamaleonCms
       rescue StandardError
         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: https://camaleon.website/documentation/category/139779-examples/how.html'.cama_log_style(:red)
+      if r[:site].blank?
+        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]
-      CurrentRequest.site = @current_site
+      CurrentRequest.site = r[:site]
+      CurrentRequest.frontend_current_theme = nil
+      CurrentRequest.site
     end
 
     # return current theme model for current site
     def current_theme
-      @_current_theme ||= current_site.get_theme.decorate
+      preview_theme = (instance_variable_get(:@_current_theme) if instance_variable_defined?(:@_current_theme))
+      return CurrentRequest.frontend_current_theme = preview_theme if preview_theme.present?
+
+      theme = CurrentRequest.frontend_current_theme
+      return theme if theme.present?
+
+      theme = current_site.get_theme.decorate
+      CurrentRequest.frontend_current_theme = theme
     end
 
     # get list templates files of current theme
@@ -105,7 +125,7 @@ module CamaleonCms
       # new theme
       current_site.set_option('_theme', key)
       theme = PluginRoutes.theme_info(key)
-      current_site.themes.update_all(status: 'inactive')
+      current_site.themes.update_all(status: 'inactive') # rubocop:disable Rails/SkipsModelValidations
       theme_model = current_site.themes.where(slug: key).first_or_create! { |t| t.name = theme[:name] }
       theme_model.update(status: nil)
       hook_run(theme, 'on_active', theme_model)
@@ -121,7 +141,8 @@ module CamaleonCms
       # theme_model.destroy
     end
 
-    # add host + port to args of the current site visited (only if the request is coming from console or tasks i.e. not web browser)
+    # add host and port to args of the current site visited
+    # (only if the request is coming from console or tasks i.e. not web browser)
     # args: Hash
     # sample: {} will return {host: 'localhost', port: 3000}
     def cama_current_site_host_port(args)

data/app/helpers/camaleon_cms/theme_helper.rb

@@ -1,13 +1,14 @@
 module CamaleonCms
   module ThemeHelper
     def theme_init
-      @_front_breadcrumb = []
+      camaleon_theme_state[:front_breadcrumb] = []
     end
 
     # return theme full asset path
     # theme_name: theme name, if nil, then will use current theme
-    # asset: asset file name, if asset is present return full path to this asset
-    # sample: <script src="<%= theme_asset_path("js/admin.js") %>"></script> => return: /assets/themes/my_theme/assets/js/admin-54505620f.js
+    # asset: asset file name, if asset is present return the full path to this asset
+    # sample: <script src="<%= theme_asset_path("js/admin.js") %>"></script> =>
+    #   return: /assets/themes/my_theme/assets/js/admin-54505620f.js
     def theme_asset_path(asset = nil, theme_name = nil)
       return theme_asset_url(theme_name, current_theme.slug) if theme_name.present? && theme_name.include?('/')
 
@@ -22,11 +23,12 @@ module CamaleonCms
     alias theme_asset theme_asset_path
     alias theme_gem_asset theme_asset_path
 
-    # return the full url for asset of current theme:
+    # return the full url for asset of the current theme:
     # asset: (String) asset name
     # theme_name: (optional) theme name, default (current theme caller to this function)
     # sample:
-    #   theme_asset_url("css/main.css") => return: https://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
@@ -36,11 +38,17 @@ module CamaleonCms
       end
     end
 
-    # return theme view path including the path of current theme
+    # return the theme view path including the path of current theme
     # view_name: name of the view or template
     # sample: theme_view("index") => "themes/my_theme/index"
     def theme_view(view_name, deprecated_attr = '')
-      view_name = deprecated_attr if deprecated_attr.present?
+      if deprecated_attr.present?
+        ActiveSupport::Deprecation._instance.warn(
+          'Passing theme view name as the second argument to #theme_view is deprecated. ' \
+          'Pass the view name as the first argument instead.'
+        )
+        view_name = deprecated_attr
+      end
       if current_theme.settings['gem_mode']
         "themes/#{current_theme.slug}/#{view_name}"
       else
@@ -49,7 +57,7 @@ module CamaleonCms
     end
 
     # assign the layout for this request
-    # asset: asset file name, if asset is present return full path to this asset
+    # asset: asset file name, if asset is present return the full path to this asset
     # layout_name: layout name
     def theme_layout(layout_name, _theme_name = nil)
       if current_theme.settings['gem_mode']
@@ -70,15 +78,19 @@ module CamaleonCms
       f.split(k).last.split('/').first
     end
 
-    # returns file system path to theme asset
-    # theme_name: theme name, if nil, then will use current theme
-    # asset: asset file name, if asset is present return full path to this asset
-    # sample: theme_asset_file_path('images/foo.jpg') => return: /home/camaleon/my-site/app/apps/themes/default/assets/images/foo.jpg
+    # returns the filesystem path to theme asset
+    # theme_name: theme name, if nil, then will use the current theme
+    # asset: asset file name, if asset is present, return the full path to this asset
+    # sample:
+    # theme_asset_file_path('images/foo.jpg') =>
+    #   return: /home/camaleon/my-site/app/apps/themes/default/assets/images/foo.jpg
     def theme_asset_file_path(asset = nil, theme_name = nil)
-      theme_path = current_theme.settings['path']
-      if theme_name && (theme = Theme.where(name: theme_name).first)
-        theme_path = theme.settings['path']
-      end
+      theme_path = if theme_name && (theme = Theme.where(name: theme_name).first)
+                     theme.settings['path']
+                   else
+                     current_theme.settings['path']
+                   end
+
       "#{theme_path}/assets/#{asset}"
     end
 
@@ -86,9 +98,13 @@ module CamaleonCms
     def theme_home_page
       current_site.the_post(current_theme.get_field('home_page')) ||
         current_site.the_posts('page').first ||
-        CamaleonCms::Post.new(title: 'Hello World!',
-                              content: 'Please add a page.',
-                              status: 'published')
+        CamaleonCms::Post.new(title: 'Hello World!', content: 'Please add a page.', status: 'published')
+    end
+
+    private
+
+    def camaleon_theme_state
+      CurrentRequest.theme_helper_state ||= {}
     end
   end
 end