camaleon_cms 2.4.3.10 → 2.4.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2c1cbc2531d17c63a5317bb57e961408dab39b
-  data.tar.gz: cff019aa57448db963680967ddb1a209b56b2143
+  metadata.gz: 9dc8afe6e7c379d3328182cf9beb596c2dfa9d48
+  data.tar.gz: 079a90ef92547c8f8dbc3b3a9a65b9a6530ed151
 SHA512:
-  metadata.gz: 7400272b9477b97f50385392d92a769cb57e289c8103315c80932e9a3f4e8429012404ba06c50f9be3e618abb3ded4663ed6c755a8c22f64f4cd95ceabcadecb
-  data.tar.gz: ef4f45ba429bcb5af986510176ede320a24e06bfbdbc4dc3eb00cef544ee79d7cc920307a8cbc1c99ebdb500eaadf7c4e0f149a91a0baa9b1601d3fcb48cb4e7
+  metadata.gz: 802f6d4b4211b05561bd69bc4122ff489509ce7b66c652acf9f75c8a699d2d3e1376380c78a550a83c7b38b26e2327a28b4c037875adc3659b727d76b6d9391d
+  data.tar.gz: 15ae7e350976a0138e0dcddb1ff5afdc5797570b32a728d368780b43e252f4975f52ceffc5bb4af2b4b3c8084640e5f70cd9eba268d34fac19948398e4a4fbae

data/README.md

@@ -39,7 +39,7 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>= 2.4.3.6' # Stable versions 2.4.3.5, 2.4.3.2, 2.3.6, 2.2.1, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>= 2.4.3.10' # Stable versions 2.4.3.6, 2.4.3.5, 2.4.3.2, 2.3.6, 2.2.1, 2.1.1, 2.1.0
   # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # current development version
   ```
 * Only Rails 5 support

data/app/apps/plugins/front_cache/admin_controller.rb

@@ -12,7 +12,9 @@ class Plugins::FrontCache::AdminController < CamaleonCms::Apps::PluginsAdminCont
                                                    skip_posts: (params[:cache][:skip_posts]||[]),
                                                    cache_login: params[:cache][:cache_login],
                                                    home: params[:cache][:home],
-                                                   preserve_cache_on_restart: params[:cache][:preserve_cache_on_restart]
+                                                   preserve_cache_on_restart: params[:cache][:preserve_cache_on_restart],
+                                                   invalidate_only: params[:cache][:invalidate_only],
+                                                   cache_counter: current_site.get_meta("front_cache_elements")[:cache_counter] || 0
                                                   })
     flash[:notice] = "#{t('plugin.front_cache.message.settings_saved')}"
     redirect_to action: :settings

data/app/apps/plugins/front_cache/config/locales/translation.yml

@@ -12,6 +12,8 @@ en:
       pages: 'Pages'
       pages_of: 'Pages of'
       skip_cache_pages: 'Skip Cache Pages'
+      preserve_cache_on_restart: 'Preserve cache on restart'
+      invalidate_only: 'Invalidate the cache instead of deleting it. (Recommended only if you use custom caching in your views. Not recommended when using FileStore, which is the Rails default cache)'
       message:
         please_checkpost_need_cache: 'Please check all posts or post types you need to cache.'
         enabled_cache_inner_content_logged_users: 'Enable cache for inner content for logged users'
@@ -31,6 +33,8 @@ es:
       pages: 'Página'
       pages_of: 'Página de'
       skip_cache_pages: 'Saltar página del Caché'
+      preserve_cache_on_restart: 'Preservar caché al reiniciar'
+      invalidate_only: 'Invalide el caché en lugar de eliminarlo. (Recomendado sólo si utiliza el almacenamiento en caché personalizado en sus vistas No se recomienda cuando se utiliza FileStore, que es la caché predeterminada de Rails)'
       message:
         please_checkpost_need_cache: 'Por favor, compruebe todos los mensajes o los tipos de correos que necesita para almacenar en caché.'
         enabled_cache_inner_content_logged_users: 'Habilitar caché de contenido interno para usuarios registrados'
@@ -51,6 +55,8 @@ nl:
       pages: "Pagina's"
       pages_of: "Inhoud van"
       skip_cache_pages: 'Cache overslaan'
+      preserve_cache_on_restart: 'Bewaar cache bij herstarten'
+      invalidate_only: 'De cache ongeldig maken, in plaats van het te verwijderen. (Alleen aanbevolen als u aangepaste caching gebruikt in uw weergaven. Niet aanbevolen bij het gebruik van FileStore, wat is de standaard cache van de Rails)'
       message:
         please_checkpost_need_cache: "Kijk alle berichten of inhoud type's na die je wil cachen."
         enabled_cache_inner_content_logged_users: 'Activeer cache voor gelogde gebruikers'
@@ -70,6 +76,8 @@ pt-BR:
       pages: 'Páginas'
       pages_of: 'Páginas de'
       skip_cache_pages: 'Saltar Cache de Páginas'
+      preserve_cache_on_restart: 'Preserve o cache no reinício'
+      invalidate_only: 'Invalide o cache em vez de excluí-lo. (Recomendado apenas se você usar cache personalizado em suas visualizações. Não recomendado quando usar FileStore, que é o cache padrão do Rails)'
       message:
         please_checkpost_need_cache: 'Por favor verifique todas as publicações ou o tipo do publicação que precisa colocar em cache.'
         enabled_cache_inner_content_logged_users: 'Permitir cache para conteúdo interno de utilizadores ligados'
@@ -89,6 +97,8 @@ pt-BR:
       pages: 'Páginas'
       pages_of: 'Páginas de'
       skip_cache_pages: 'Pular Cache de Páginas'
+      preserve_cache_on_restart: 'Preserve o cache no reinício'
+      invalidate_only: 'Invalide o cache em vez de excluí-lo. (Recomendado apenas se você usar cache personalizado em suas visualizações. Não recomendado quando usar FileStore, que é o cache padrão do Rails)'
       message:
         please_checkpost_need_cache: 'Por favor cheque todos os posts ou o tipo do post que você precisa cachear.'
         enabled_cache_inner_content_logged_users: 'Permitir cache para conteúdo interno de usuários logados'
@@ -108,6 +118,8 @@ it:
       pages: 'Pagine'
       pages_of: 'Pagine di'
       skip_cache_pages: 'Pagine da non cachare'
+      preserve_cache_on_restart: 'Conserva la cache al riavvio'
+      invalidate_only: 'Invalidate la cache invece di cancellarla. (Consigliato solo se si utilizza la cache personalizzata nelle tue viste. Non è consigliata quando si utilizza FileStore, che è la cache predefinita Rails)'
       message:
         please_checkpost_need_cache: 'Per favore, verifica tutti i tipi di messaggi o e-mail che è necessario memorizzare nella cache.'
         enabled_cache_inner_content_logged_users: 'Attiva il contenuto della cache interna per gli utenti registrati'
@@ -127,10 +139,11 @@ zh-CN:
       pages: '页面'
       pages_of: '页'
       skip_cache_pages: '跳过缓存页面'
+      preserve_cache_on_restart: '重新启动时保存缓存'
+      invalidate_only: '使缓存无效，而不是删除它。 （仅当您在视图中使用自定义缓存时才推荐使用FileStore时，建议不要使用Rails默认缓存）'
       message:
         please_checkpost_need_cache: '请检查您需要缓存位内容.'
         enabled_cache_inner_content_logged_users: '为已登录的用户启用内部内容的缓存'
         settings_saved: '设置已保存!'
         cache_destroyed: '缓存已清楚!'
       settings: '设置'
-

data/app/apps/plugins/front_cache/front_cache_helper.rb

@@ -10,6 +10,7 @@ module Plugins::FrontCache::FrontCacheHelper
     return if signin? || Rails.env == "development" || Rails.env == "test" || !request.get? # avoid cache if current visitor is logged in or development environment
 
     cache_key = request.fullpath.parameterize
+    @caches = current_site.get_meta("front_cache_elements")
     if !flash.keys.present? && front_cache_exist?(cache_key) # recover cache item
       Rails.logger.info "Camaleon CMS - readed cache: #{front_cache_plugin_get_path(cache_key)}"
       response.headers['PLUGIN_FRONT_CACHE'] = 'TRUE'
@@ -18,7 +19,6 @@ module Plugins::FrontCache::FrontCacheHelper
       return
     end
 
-    @caches = current_site.get_meta("front_cache_elements")
     @_plugin_do_cache = false
     if @caches[:paths].include?(request.original_url) || @caches[:paths].include?(request.path_info) || front_cache_plugin_match_path_patterns?(request.original_url, request.path_info) || (params[:action] == 'index' && params[:controller] == 'camaleon_cms/frontend' && @caches[:home].present?) # cache paths and home page
       @_plugin_do_cache = true
@@ -59,7 +59,8 @@ module Plugins::FrontCache::FrontCacheHelper
         post_types: [current_site.post_types.where(slug: "page").first.id],
         skip_posts: [],
         home: true,
-        cache_login: true}) unless current_site.get_meta("front_cache_elements", nil).present?
+        cache_login: true,
+        cache_counter: 0}) unless current_site.get_meta("front_cache_elements", nil).present?
   end
 
   # on uninstall plugin
@@ -89,17 +90,25 @@ module Plugins::FrontCache::FrontCacheHelper
 
   # clear all frontend cache items
   def front_cache_clean
-    Rails.cache.clear
+    @caches = current_site.get_meta("front_cache_elements")
+    if @caches[:invalidate_only]
+      @caches[:cache_counter] += 1
+      current_site.set_meta("front_cache_elements", @caches)
+    else
+      Rails.cache.clear
+      @caches[:cache_counter] = 0
+      current_site.set_meta("front_cache_elements", @caches)
+    end
   end
 
   private
 
   def front_cache_exist?(key)
-    !(Rails.cache.read(key).nil?)
+    !(Rails.cache.read(front_cache_plugin_get_path(key)).nil?)
   end
 
   def front_cache_get(key)
-    Rails.cache.read(key)
+    Rails.cache.read(front_cache_plugin_get_path(key))
   end
 
   def front_cache_plugin_cache_create(key, content)
@@ -110,9 +119,9 @@ module Plugins::FrontCache::FrontCacheHelper
   # key: (string, optional) the key of the cached page
   def front_cache_plugin_get_path(key = nil)
     unless key.nil?
-      "pages/#{current_site.id.to_s}/#{key}"
+      "pages/#{@caches[:cache_counter]}/#{current_site.id.to_s}/#{key}"
     else
-      "pages/#{current_site.id.to_s}"
+      "pages/#{@caches[:cache_counter]}/#{current_site.id.to_s}"
     end
 
   end

data/app/apps/plugins/front_cache/views/admin/settings.html.erb

@@ -20,11 +20,6 @@
     </div>
     <div class="panel-body">
         <div class="alert alert-info"><%= t('plugin.front_cache.message.please_checkpost_need_cache') %></div>
-        <div class="form-group">
-            <label>Preserve cache on restart</label><br>
-            <%= check_box_tag("cache[preserve_cache_on_restart]", 1, @caches[:preserve_cache_on_restart]) %>
-        </div>
-
         <div class="form-group">
             <label><%= t('plugin.front_cache.home_page') %></label><br>
             <%= check_box_tag("cache[home]", 1, @caches[:home]) %>
@@ -61,6 +56,16 @@
             <%= select_tag("cache[skip_posts]", option_groups_from_collection_for_select(current_site.the_post_types.decorate, :the_posts, 'the_title', "id", lambda{|o| o.decorate.the_title }, @caches[:skip_posts]), "class"=> "form-control select", multiple: true, "data-live-search" => "true") %>
         </div>
 
+        <div class="form-group">
+            <label><%= t('plugin.front_cache.preserve_cache_on_restart') %></label><br>
+            <%= check_box_tag("cache[preserve_cache_on_restart]", 1, @caches[:preserve_cache_on_restart]) %>
+        </div>
+
+        <div class="form-group">
+            <label><%= t('plugin.front_cache.invalidate_only') %></label><br>
+            <%= check_box_tag("cache[invalidate_only]", 1, @caches[:invalidate_only]) %>
+        </div>
+
         <!--<div class="form-group">-->
             <!--<label><%#= t('plugin.front_cache.message.enabled_cache_inner_content_logged_users') %></label><br>-->
             <!--<%#= check_box_tag("cache[cache_login]", 1, @caches[:cache_login]) %>-->

data/app/models/camaleon_cms/category.rb

@@ -7,8 +7,7 @@ class CamaleonCms::Category < CamaleonCms::TermTaxonomy
   scope :empty, -> { where(count: [0, nil]) } # return all categories that does not contain any post
   # scope :parents, -> { where("term_taxonomy.parent_id IS NULL") }
 
-  has_many :metas, -> { where(object_class: 'Category') }, class_name: 'CamaleonCms::Meta',
-    foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('Category')
   has_many :posts, foreign_key: :objectid, through: :term_relationships, source: :objects
   has_many :children, class_name: 'CamaleonCms::Category', foreign_key: :parent_id,
     dependent: :destroy

data/app/models/camaleon_cms/nav_menu.rb

@@ -1,7 +1,7 @@
 class CamaleonCms::NavMenu < CamaleonCms::TermTaxonomy
   default_scope { where(taxonomy: :nav_menu).order(id: :asc) }
   alias_attribute :site_id, :parent_id
-  has_many :metas, ->{ where(object_class: 'NavMenu')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('NavMenu')
   has_many :children, class_name: "CamaleonCms::NavMenuItem", foreign_key: :parent_id, dependent: :destroy, inverse_of: :parent
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id, inverse_of: :nav_menus
 

data/app/models/camaleon_cms/nav_menu_item.rb

@@ -6,7 +6,7 @@ class CamaleonCms::NavMenuItem < CamaleonCms::TermTaxonomy
   alias_attribute :target, :status
   # attr_accessible :label, :url, :kind
   default_scope { where(taxonomy: :nav_menu_item).order(id: :asc) }
-  has_many :metas, ->{ where(object_class: 'NavMenuItem')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('NavMenuItem')
   belongs_to :parent, class_name: "CamaleonCms::NavMenu", inverse_of: :children
   belongs_to :parent_item, class_name: "CamaleonCms::NavMenuItem", foreign_key: :parent_id, inverse_of: :children
   has_many :children, class_name: "CamaleonCms::NavMenuItem", foreign_key: :parent_id, dependent: :destroy, inverse_of: :parent_item

data/app/models/camaleon_cms/plugin.rb

@@ -5,8 +5,7 @@ class CamaleonCms::Plugin < CamaleonCms::TermTaxonomy
   #   name => plugin name
 
   attr_accessor :error
-
-  has_many :metas, -> { where(object_class: 'Plugin') }, class_name: "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('Plugin')
   belongs_to :site, class_name: "CamaleonCms::Site", foreign_key: :parent_id
 
   default_scope { where(taxonomy: :plugin) }

data/app/models/camaleon_cms/post.rb

@@ -29,7 +29,7 @@ class CamaleonCms::Post < CamaleonCms::PostDefault
   include CamaleonCms::CategoriesTagsForPosts
   alias_attribute :post_type_id, :taxonomy_id
   default_scope ->{ where(post_class: "Post").order(post_order: :asc, created_at: :desc) }
-  has_many :metas, ->{ where(object_class: 'Post')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :delete_all
+  cama_define_common_relationships('Post')
 
   # DEPRECATED
   has_many :post_relationships, class_name: "CamaleonCms::PostRelationship", foreign_key: :objectid, dependent: :destroy,  inverse_of: :posts

data/app/models/camaleon_cms/post_comment.rb

@@ -7,7 +7,7 @@ class CamaleonCms::PostComment < ActiveRecord::Base
   #default_scope order('comments.created_at ASC')
   #approved: approved | pending | spam
 
-  has_many :metas, ->{ where(object_class: 'PostComment')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('PostComment')
   has_many :children, class_name: "CamaleonCms::PostComment", foreign_key: :comment_parent, dependent: :destroy
   belongs_to :post, class_name: "CamaleonCms::Post", foreign_key: :post_id
   belongs_to :parent, class_name: "CamaleonCms::PostComment", foreign_key: :comment_parent

data/app/models/camaleon_cms/post_tag.rb

@@ -1,6 +1,6 @@
 class CamaleonCms::PostTag < CamaleonCms::TermTaxonomy
   default_scope { where(taxonomy: :post_tag) }
-  has_many :metas, ->{ where(object_class: 'PostTag')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('PostTag')
   has_many :posts, foreign_key: :objectid, through: :term_relationships, :source => :objects
   belongs_to :post_type, class_name: "CamaleonCms::PostType", foreign_key: :parent_id, inverse_of: :post_tags
   belongs_to :owner, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id

data/app/models/camaleon_cms/post_type.rb

@@ -1,7 +1,7 @@
 class CamaleonCms::PostType < CamaleonCms::TermTaxonomy
   alias_attribute :site_id, :parent_id
   default_scope { where(taxonomy: :post_type) }
-  has_many :metas, ->{ where(object_class: 'PostType')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :delete_all
+  cama_define_common_relationships('PostType')
   has_many :categories, :class_name => "CamaleonCms::Category", foreign_key: :parent_id, dependent: :destroy, inverse_of: :post_type_parent
   has_many :post_tags, :class_name => "CamaleonCms::PostTag", foreign_key: :parent_id, dependent: :destroy, inverse_of: :post_type
   has_many :posts, class_name: "CamaleonCms::Post", foreign_key: :taxonomy_id, dependent: :destroy, inverse_of: :post_type

data/app/models/camaleon_cms/site.rb

@@ -3,7 +3,7 @@ class CamaleonCms::Site < CamaleonCms::TermTaxonomy
   attr_accessor :site_domain
   include CamaleonCms::SiteDefaultSettings
   default_scope { where(taxonomy: :site).reorder(term_group: :desc) }
-  has_many :metas, -> { where(object_class: 'Site') }, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :delete_all
+  cama_define_common_relationships('Site')
   has_many :post_types, :class_name => "CamaleonCms::PostType", foreign_key: :parent_id, dependent: :destroy
   has_many :nav_menus, :class_name => "CamaleonCms::NavMenu", foreign_key: :parent_id, dependent: :destroy, inverse_of: :site
   has_many :nav_menu_items, :class_name => "CamaleonCms::NavMenuItem", foreign_key: :term_group

data/app/models/camaleon_cms/theme.rb

@@ -1,7 +1,7 @@
 class CamaleonCms::Theme < CamaleonCms::TermTaxonomy
   # attrs:
   #   slug => plugin key
-  has_many :metas, -> { where(object_class: 'Theme') }, class_name: "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('Theme')
   belongs_to :site, class_name: "CamaleonCms::Site", foreign_key: :parent_id
 
   default_scope { where(taxonomy: :theme) }

data/app/models/camaleon_cms/user_role.rb

@@ -2,7 +2,7 @@ class CamaleonCms::UserRole < CamaleonCms::TermTaxonomy
   after_destroy :set_users_as_cilent
 
   default_scope { where(taxonomy: :user_roles) }
-  has_many :metas, ->{ where(object_class: 'UserRole')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  cama_define_common_relationships('UserRole')
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
 
   def roles_post_type

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

@@ -1,11 +1,11 @@
 module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   included do
     before_destroy :_destroy_custom_field_groups
+    # DEPRECATED, INSTEAD USE: custom_fields
     has_many :fields, ->(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, ->(object){where(object_class: object.class.to_s.gsub("Decorator","").gsub("CamaleonCms::",""))}, :class_name => "CamaleonCms::CustomFieldsRelationship", foreign_key: :objectid, dependent: :delete_all
-    has_many :custom_field_values, ->(object){ where(object_class: object.class.to_s.gsub("Decorator","").gsub("CamaleonCms::", ""))}, :class_name => "CamaleonCms::CustomFieldsRelationship", foreign_key: :objectid, dependent: :delete_all
-
-    # valid only for simple groups and not for complex like: posts, post, ... where the group is for individual or children groups
+    # DEPRECATED, INSTEAD USE: custom_field_groups
     has_many :field_groups, ->(object){where(object_class: object.class.to_s.parseCamaClass)}, :class_name => "CamaleonCms::CustomFieldGroup", foreign_key: :objectid
   end
 
@@ -35,12 +35,12 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
       when 'Post'
         CamaleonCms::CustomFieldGroup.where("(objectid = ? AND object_class = ?) OR (objectid = ? AND object_class = ?)", self.id || -1, class_name, self.post_type.id, "PostType_#{class_name}")
       when 'NavMenuItem'
-        self.main_menu.field_groups
+        self.main_menu.custom_field_groups
       when 'PostType'
         if args[:kind] == "all"
           CamaleonCms::CustomFieldGroup.where(object_class: ["PostType_Post", "PostType_Post", "PostType_PostTag", "PostType"], objectid:  self.id )
         elsif args[:kind] == "post_type"
-          self.field_groups
+          self.custom_field_groups
         else
           CamaleonCms::CustomFieldGroup.where(object_class: "PostType_#{args[:kind]}", objectid:  self.id )
         end

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

@@ -13,7 +13,7 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
     before_create { generate_token(:auth_token) }
 
     # relations
-    has_many :metas, ->{ where(object_class: 'User')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+    cama_define_common_relationships('User')
     has_many :all_posts, class_name: "CamaleonCms::Post", foreign_key: :user_id
     has_many :all_comments, class_name: "CamaleonCms::PostComment"
 

data/config/initializers/active_record_extension.rb

@@ -45,51 +45,60 @@ ActiveRecord::Associations::CollectionProxy.class_eval do
   end
 end
 
+ActiveSupport.on_load(:active_record) do
+  class ActiveRecord::Base
+    def self.cama_define_common_relationships(key)
+      has_many :metas, -> { where(object_class: key) }, class_name: 'CamaleonCms::Meta', foreign_key: :objectid, dependent: :destroy
+      has_many :custom_field_values, ->{ where(object_class: key) }, :class_name => "CamaleonCms::CustomFieldsRelationship", foreign_key: :objectid, dependent: :delete_all
+      has_many :custom_fields, ->{ where(:object_class => key)} , :class_name => "CamaleonCms::CustomField" ,foreign_key: :objectid
 
-# add cache_var for models
-ActiveRecord::Base.class_eval do
-  # save cache value for this key
-  def cama_set_cache(key, val)
-    @cama_cache_vars ||= {}
-    @cama_cache_vars[cama_build_cache_key(key)] = val
-    val
-  end
+      # valid only for simple groups and not for complex like: posts, post, ... where the group is for individual or children groups
+      has_many :custom_field_groups, ->{ where(object_class: key) }, :class_name => "CamaleonCms::CustomFieldGroup", foreign_key: :objectid
+    end
+    
+    # save cache value for this key
+    def cama_set_cache(key, val)
+      @cama_cache_vars ||= {}
+      @cama_cache_vars[cama_build_cache_key(key)] = val
+      val
+    end
 
-  # remove cache value for this key
-  def cama_remove_cache(key)
-    @cama_cache_vars.delete(cama_build_cache_key(key))
-  end
+    # remove cache value for this key
+    def cama_remove_cache(key)
+      @cama_cache_vars.delete(cama_build_cache_key(key))
+    end
 
-  # fetch the cache value for this key
-  def cama_fetch_cache(key)
-    @cama_cache_vars ||= {}
-    _key = cama_build_cache_key(key)
-    if @cama_cache_vars.has_key?(_key)
-      # puts "*********** using model cache var: #{_key}"
-      @cama_cache_vars[_key]
-    else
-      @cama_cache_vars[_key] = yield
-      @cama_cache_vars[_key]
+    # fetch the cache value for this key
+    def cama_fetch_cache(key)
+      @cama_cache_vars ||= {}
+      _key = cama_build_cache_key(key)
+      if @cama_cache_vars.has_key?(_key)
+        # puts "*********** using model cache var: #{_key}"
+        @cama_cache_vars[_key]
+      else
+        @cama_cache_vars[_key] = yield
+        @cama_cache_vars[_key]
+      end
     end
-  end
 
-  # return the cache value for this key
-  def cama_get_cache(key)
-    @cama_cache_vars ||= {}
-    @cama_cache_vars[cama_build_cache_key(key)] rescue nil
-  end
+    # return the cache value for this key
+    def cama_get_cache(key)
+      @cama_cache_vars ||= {}
+      @cama_cache_vars[cama_build_cache_key(key)] rescue nil
+    end
 
-  # internal helper to generate cache key
-  def cama_build_cache_key(key)
-    _key = "cama_cache_#{self.class.name}_#{self.id}_#{key}"
-  end
-  
-  # check if an attribute was changed
-  def cama_attr_changed?(attr_name)
-    if self.methods.include?(:saved_change_to_attribute?)
-      self.saved_change_to_attribute?(attr_name.to_sym)
-    else
-      self.send("#{attr_name}_changed?")
+    # internal helper to generate cache key
+    def cama_build_cache_key(key)
+      _key = "cama_cache_#{self.class.name}_#{self.id}_#{key}"
+    end
+
+    # check if an attribute was changed
+    def cama_attr_changed?(attr_name)
+      if self.methods.include?(:saved_change_to_attribute?)
+        self.saved_change_to_attribute?(attr_name.to_sym)
+      else
+        self.send("#{attr_name}_changed?")
+      end
     end
   end
 end