camaleon_cms 2.5.3.1 → 2.6.0

data/app/models/camaleon_cms/term_relationship.rb

@@ -1,18 +1,20 @@
-class CamaleonCms::TermRelationship < ActiveRecord::Base
-  self.table_name = "#{PluginRoutes.static_system_info["db_prefix"]}term_relationships"
-  default_scope ->{ order(term_order: :asc) }
+module CamaleonCms
+  class TermRelationship < ActiveRecord::Base
+    self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}term_relationships"
+    default_scope ->{ order(term_order: :asc) }
 
-  belongs_to :term_taxonomies, :class_name => "CamaleonCms::TermTaxonomy", foreign_key: :term_taxonomy_id, inverse_of: :term_relationships
-  belongs_to :objects, ->{ order("#{CamaleonCms::Post.table_name}.id DESC") }, :class_name => "CamaleonCms::Post", foreign_key: :objectid, inverse_of: :term_relationships
+    belongs_to :term_taxonomy, inverse_of: :term_relationships
+    belongs_to :object, ->{ order("#{CamaleonCms::Post.table_name}.id DESC") }, class_name: 'CamaleonCms::Post', foreign_key: :objectid, inverse_of: :term_relationships
 
-  # callbacks
-  after_create :update_count
-  before_destroy :update_count
+    # callbacks
+    after_create :update_count
+    before_destroy :update_count
 
-  private
-  # update counter of post published items
-  # TODO verify counter
-  def update_count
-    self.term_taxonomies.update_column('count', self.term_taxonomies.posts.published.size) if self.term_taxonomies.present? && !self.term_taxonomies.try(:posts).nil?
+    private
+    # update counter of post published items
+    # TODO verify counter
+    def update_count
+      term_taxonomy.update_column('count', term_taxonomy.posts.published.size) if term_taxonomy&.try(:posts)
+    end
   end
-end
+end

data/app/models/camaleon_cms/term_taxonomy.rb

@@ -1,61 +1,56 @@
-class CamaleonCms::UniqValidator < ActiveModel::Validator
-  def validate(record)
-    unless record.skip_slug_validation?
-      record.errors[:base] << "#{I18n.t('camaleon_cms.admin.post.message.requires_different_slug')}" 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 > 0
+module CamaleonCms
+  class TermTaxonomy < ActiveRecord::Base
+    include CamaleonCms::Metas
+    include CamaleonCms::CustomFieldsRead
+
+    self.table_name = "#{PluginRoutes.static_system_info["db_prefix"]}term_taxonomy"
+    # attr_accessible :taxonomy, :description, :parent_id, :count, :name, :slug, :term_group, :status, :term_order, :user_id
+    # attr_accessible :data_options
+    # attr_accessible :data_metas
+
+    # callbacks
+    before_validation :before_validating
+    before_destroy :destroy_dependencies
+
+    # validates
+    validates :name, :taxonomy, presence: true
+    validates_with CamaleonCms::UniqValidator
+
+    # relations
+    has_many :term_relationships, class_name: "CamaleonCms::TermRelationship", foreign_key: :term_taxonomy_id, dependent: :destroy
+    # has_many :posts, foreign_key: :objectid, through: :term_relationships, :source => :objects
+    belongs_to :parent, class_name: "CamaleonCms::TermTaxonomy", foreign_key: :parent_id
+    belongs_to :owner, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
+
+    # return all children taxonomy
+    # sample: sub categories of a category
+    def children
+      CamaleonCms::TermTaxonomy.where("#{CamaleonCms::TermTaxonomy.table_name}.parent_id = ?", id)
     end
-  end
-end
-class CamaleonCms::TermTaxonomy < ActiveRecord::Base
-  include CamaleonCms::Metas
-  include CamaleonCms::CustomFieldsRead
-  self.table_name = "#{PluginRoutes.static_system_info["db_prefix"]}term_taxonomy"
-  # attr_accessible :taxonomy, :description, :parent_id, :count, :name, :slug, :term_group, :status, :term_order, :user_id
-  # attr_accessible :data_options
-  # attr_accessible :data_metas
-
-  # callbacks
-  before_validation :before_validating
-  before_destroy :destroy_dependencies
-
-  # validates
-  validates :name, :taxonomy, presence: true
-  validates_with CamaleonCms::UniqValidator
-
-  # relations
-  has_many :term_relationships, :class_name => "CamaleonCms::TermRelationship", :foreign_key => :term_taxonomy_id, dependent: :destroy
-  # has_many :posts, foreign_key: :objectid, through: :term_relationships, :source => :objects
-  belongs_to :parent, class_name: "CamaleonCms::TermTaxonomy", foreign_key: :parent_id
-  belongs_to :owner, class_name: CamaManager.get_user_class_name, foreign_key: :user_id
-
-  # return all children taxonomy
-  # sample: sub categories of a category
-  def children
-    CamaleonCms::TermTaxonomy.where("#{CamaleonCms::TermTaxonomy.table_name}.parent_id = ?", self.id)
-  end
 
-  # return all menu items in which this taxonomy was assigned
-  def in_nav_menu_items
-    CamaleonCms::NavMenuItem.where(url: self.id, kind: self.taxonomy)
-  end
+    # return all menu items in which this taxonomy was assigned
+    def in_nav_menu_items
+      CamaleonCms::NavMenuItem.where(url: id, kind: taxonomy)
+    end
 
-  # permit to skip slug validations for children models, like menu items
-  def skip_slug_validation?
-    false
-  end
+    # permit to skip slug validations for children models, like menu items
+    def skip_slug_validation?
+      false
+    end
 
-  private
-  # callback before validating
-  def before_validating
-    slug = self.slug
-    slug = self.name if slug.blank?
-    self.name = slug unless self.name.present?
-    self.slug = slug.to_s.parameterize.try(:downcase)
-  end
+    private
+    # callback before validating
+    def before_validating
+      slug = self.slug
+      slug = name if slug.blank?
+      self.name = slug if name.blank?
+      self.slug = slug.to_s.parameterize.try(:downcase)
+    end
 
-  # destroy all dependencies
-  # unassign all items from menus
-  def destroy_dependencies
-    in_nav_menu_items.destroy_all
+    # destroy all dependencies
+    # unassign all items from menus
+    def destroy_dependencies
+      in_nav_menu_items.destroy_all
+    end
   end
-
 end

data/app/models/camaleon_cms/theme.rb

@@ -1,31 +1,32 @@
-class CamaleonCms::Theme < CamaleonCms::TermTaxonomy
-  # attrs:
-  #   slug => plugin key
-  cama_define_common_relationships('Theme')
-  belongs_to :site, class_name: "CamaleonCms::Site", foreign_key: :parent_id
+module CamaleonCms
+  class Theme < CamaleonCms::TermTaxonomy
+    # attrs:
+    #   slug => plugin key
+    cama_define_common_relationships('Theme')
+    belongs_to :site, class_name: "CamaleonCms::Site", foreign_key: :parent_id
 
-  default_scope { where(taxonomy: :theme) }
+    default_scope { where(taxonomy: :theme) }
 
-  before_validation :fix_name
-  before_destroy :destroy_custom_fields
+    before_validation :fix_name
+    before_destroy :destroy_custom_fields
 
-  # return theme settings configured in config.json
-  def settings
-    PluginRoutes.theme_info(self.slug)
-  end
+    # return theme settings configured in config.json
+    def settings
+      PluginRoutes.theme_info(slug)
+    end
 
-  # return the path to the settings file for current theme
-  def settings_file
-    File.join(self.settings["path"], "views/admin/settings").to_s
-  end
+    # return the path to the settings file for current theme
+    def settings_file
+      File.join(self.settings["path"], "views/admin/settings").to_s
+    end
 
-  private
-  def fix_name
-    self.name = self.slug unless self.name.present?
-  end
+    private
+    def fix_name
+      self.name = slug if name.blank?
+    end
 
-  def destroy_custom_fields
-    self.get_field_groups.destroy_all
+    def destroy_custom_fields
+      get_field_groups.destroy_all
+    end
   end
-
 end

data/app/models/camaleon_cms/user.rb

@@ -1,18 +1,23 @@
 unless PluginRoutes.static_system_info['user_model'].present?
-  class CamaleonCms::User < ActiveRecord::Base
-    include CamaleonCms::UserMethods
-    self.table_name = PluginRoutes.static_system_info["cama_users_db_table"] || "#{PluginRoutes.static_system_info["db_prefix"]}users"
-    default_scope {order(role: :asc)}
-    validates :username, :presence => true
-    validates :email, :presence => true, :format => { :with => /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i } #, :unless => Proc.new { |a| a.auth_social.present? }
-    has_secure_password
+  module CamaleonCms
+    class User < ActiveRecord::Base
+      include CamaleonCms::UserMethods
 
-    def self.find_by_email(email)
-      where(['lower(email) = ?', email.to_s.downcase]).take
-    end
+      self.table_name = PluginRoutes.static_system_info['cama_users_db_table'] || "#{PluginRoutes.static_system_info['db_prefix']}users"
+
+      default_scope { order(role: :asc) }
+
+      validates :username, presence: true
+      validates :email, presence: true, format: { with: /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i } #, :unless => Proc.new { |a| a.auth_social.present? }
+      has_secure_password
+
+      def self.find_by_email(email)
+        where(['lower(email) = ?', email.to_s.downcase]).take
+      end
 
-    def self.find_by_username(username)
-      where(['lower(username) = ?', username.to_s.downcase]).take
+      def self.find_by_username(username)
+        where(['lower(username) = ?', username.to_s.downcase]).take
+      end
     end
   end
-end
+end

data/app/models/camaleon_cms/user_role.rb

@@ -1,138 +1,140 @@
-class CamaleonCms::UserRole < CamaleonCms::TermTaxonomy
-  after_destroy :set_users_as_cilent
+module CamaleonCms
+  class UserRole < CamaleonCms::TermTaxonomy
+    after_destroy :set_users_as_cilent
 
-  default_scope { where(taxonomy: :user_roles) }
-  cama_define_common_relationships('UserRole')
-  belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
+    default_scope { where(taxonomy: :user_roles) }
+    cama_define_common_relationships('UserRole')
+    belongs_to :site, class_name: 'CamaleonCms::Site', foreign_key: :parent_id
 
-  def roles_post_type
-    self.get_meta("_post_type")
-  end
+    def roles_post_type
+      self.get_meta('_post_type')
+    end
 
-  def roles_manager
-    self.get_meta("_manager")
-  end
+    def roles_manager
+      self.get_meta('_manager')
+    end
 
-  def editable?
-      term_group.nil?
-  end
+    def editable?
+        term_group.nil?
+    end
 
 
-  ROLES = {
-      post_type: [
-          {
-              key: 'edit',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_create_or_edit')}",
-              color: 'success',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.create_or_edit')}"
-          },
-          {
-              key: 'edit_other',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_edit_other')}",
-              color: 'success',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.edit_other')}"
-          },
-          {
-              key: 'edit_publish',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_edit_publish')}",
-              color: 'success',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.edit_publish')}"
-          },
-          {
-              key: 'publish',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.publish')}",
-              color: 'success',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.publish')}"
-          },
-          {
-              key: 'delete',
-              label: "#{I18n.t('camaleon_cms.admin.button.delete')}",
-              color: 'danger',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.delete')}"
-          },
-          {
-              key: 'delete_other',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_delete_other')}",
-              color: 'danger',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.delete_other')}"
-          },
-          {
-              key: 'delete_publish',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_delete_publish')}",
-              color: 'danger',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.delete_publish')}"
-          },
-          #{
-          #    key: 'read_private',
-          #    label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_read_private')}",
-          #    color: 'info',
-          #    description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.read_private')}"
-          #},
-          {
-              key: 'manage_categories',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_manage_categories')}",
-              color: 'warning',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.manage_categories')}"
-          },
-          {
-              key: 'manage_tags',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_manage_tags')}",
-              color: 'warning',
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.manage_tags')}"
-          }
-      ],
-      manager: [
-          {
-              key: 'media',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.media')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.media')}"
-          },
-          {
-              key: 'comments',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.comments')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.comments')}"
-          },
-          {
-              key: 'themes',
-              label: "#{I18n.t('camaleon_cms.admin.users.roles_values.themes')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.themes')}"
-          },
-          {
-              key: 'widgets',
-              label: "#{I18n.t('camaleon_cms.admin.sidebar.widgets')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.widgets')}"
-          },
-          {
-              key: 'nav_menu',
-              label: "#{I18n.t('camaleon_cms.admin.sidebar.menus')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.menus')}"
-          },
-          {
-              key: 'plugins',
-              label: "#{I18n.t('camaleon_cms.admin.sidebar.plugins')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.plugins')}"
-          },
-          {
-              key: 'users',
-              label: "#{I18n.t('camaleon_cms.admin.sidebar.users')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.users')}"
-          },
-          {
-              key: 'settings',
-              label: "#{I18n.t('camaleon_cms.admin.sidebar.settings')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.settings')}"
-          },
-          {
-              key: 'theme_settings',
-              label: "#{I18n.t('camaleon_cms.admin.settings.theme_setting', default: 'Theme Settings')}",
-              description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.themes')}"
-          }
-      ]
-  }
+    ROLES = {
+        post_type: [
+            {
+                key: 'edit',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_create_or_edit')}",
+                color: 'success',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.create_or_edit')}"
+            },
+            {
+                key: 'edit_other',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_edit_other')}",
+                color: 'success',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.edit_other')}"
+            },
+            {
+                key: 'edit_publish',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_edit_publish')}",
+                color: 'success',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.edit_publish')}"
+            },
+            {
+                key: 'publish',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.publish')}",
+                color: 'success',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.publish')}"
+            },
+            {
+                key: 'delete',
+                label: "#{I18n.t('camaleon_cms.admin.button.delete')}",
+                color: 'danger',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.delete')}"
+            },
+            {
+                key: 'delete_other',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_delete_other')}",
+                color: 'danger',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.delete_other')}"
+            },
+            {
+                key: 'delete_publish',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_delete_publish')}",
+                color: 'danger',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.delete_publish')}"
+            },
+            #{
+            #    key: 'read_private',
+            #    label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_read_private')}",
+            #    color: 'info',
+            #    description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.read_private')}"
+            #},
+            {
+                key: 'manage_categories',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_manage_categories')}",
+                color: 'warning',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.manage_categories')}"
+            },
+            {
+                key: 'manage_tags',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.html_manage_tags')}",
+                color: 'warning',
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.manage_tags')}"
+            }
+        ],
+        manager: [
+            {
+                key: 'media',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.media')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.media')}"
+            },
+            {
+                key: 'comments',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.comments')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.comments')}"
+            },
+            {
+                key: 'themes',
+                label: "#{I18n.t('camaleon_cms.admin.users.roles_values.themes')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.themes')}"
+            },
+            {
+                key: 'widgets',
+                label: "#{I18n.t('camaleon_cms.admin.sidebar.widgets')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.widgets')}"
+            },
+            {
+                key: 'nav_menu',
+                label: "#{I18n.t('camaleon_cms.admin.sidebar.menus')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.menus')}"
+            },
+            {
+                key: 'plugins',
+                label: "#{I18n.t('camaleon_cms.admin.sidebar.plugins')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.plugins')}"
+            },
+            {
+                key: 'users',
+                label: "#{I18n.t('camaleon_cms.admin.sidebar.users')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.users')}"
+            },
+            {
+                key: 'settings',
+                label: "#{I18n.t('camaleon_cms.admin.sidebar.settings')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.settings')}"
+            },
+            {
+                key: 'theme_settings',
+                label: "#{I18n.t('camaleon_cms.admin.settings.theme_setting', default: 'Theme Settings')}",
+                description: "#{I18n.t('camaleon_cms.admin.users.tool_tip.themes')}"
+            }
+        ]
+    }
 
-  private
+    private
 
-  def set_users_as_cilent
-    site.users.where(role: slug).update_all(role: 'client')
+    def set_users_as_cilent
+      site.users.where(role: slug).update_all(role: 'client')
+    end
   end
 end