drg_cms 0.5.52.16 → 0.6.1.0

data/app/models/concerns/dc_page_concern.rb

@@ -1,4 +1,3 @@
-#coding: utf-8
 #--
 # Copyright (c) 2012+ Damjan Rems
 #
@@ -33,7 +32,6 @@ include Mongoid::Document
 include Mongoid::Timestamps
 
 field :subject,      type: String,  default: ''
-field :title,        type: String
 field :subject_link, type: String,  default: ''
 field :alt_link,     type: String,  default: ''
 field :sub_subject,  type: String,  default: ''
@@ -56,16 +54,19 @@ field :active,       type: Boolean, default: true
 field :created_by,   type: BSON::ObjectId
 field :updated_by,   type: BSON::ObjectId
 field :kats,         type: Array         # Categories
-
+# IFRAME
 field :if_url,       type: String
 field :if_border,    type: Integer, default: 0
 field :if_width,     type: Integer
 field :if_height,    type: Integer
 field :if_scroll,    type: String
 field :if_id,        type: String
-field :if_class,        type: String
+field :if_class,     type: String
 field :if_params,    type: String
 
+# SEO
+include DcSeoConcern
+
 field :policy_id,    type: BSON::ObjectId
 
 embeds_many :dc_parts
@@ -80,6 +81,17 @@ index  alt_link:  1
 before_save :do_before_save
 
 validates :publish_date, presence: true
+validate  :validate_images_alt_present
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_page)
+end
   
 ######################################################################
 # Will return subject_link. Field name link should be common for all documents
@@ -88,7 +100,15 @@ validates :publish_date, presence: true
 def link
   subject_link
 end
-    
+   
+######################################################################
+# Will return validation error if all images in body field do not have 
+# alt attribute present.
+######################################################################
+def validate_images_alt_present
+  errors.add('body', I18n.t('drgcms.img_alt_not_present')) unless DcPage.images_alt_present?(self.body)
+end
+
 protected
 
 ######################################################################
@@ -109,7 +129,7 @@ end
 # than link size is not larger than 100 chars.
 ######################################################################
 def self.clear_link(link)
-  link.gsub!(/\.|\?|\!\&|»|«|\,|\"|\'|\:/,'')
+  link.gsub!(/\.|\?|\!\&|\||»|«|\,|\"|\'|\:/,'')
   link.gsub!('<br>','')
   link.gsub!('–','-')
   link.gsub!(' ','-')
@@ -144,6 +164,20 @@ def self.dc_filters
    'field' => 'dc_site_id', 'value' => '@current_site'}
 end
 
+######################################################################
+# Clears subject link of chars that shouldn't be there and also takes care 
+# than link size is not larger than 100 chars.
+######################################################################
+def self.images_alt_present?(text)
+  return true if text.blank?
+#  
+  document = Nokogiri::HTML.parse(text)
+  document.xpath('//img').each do |image|
+    return false if !image.attributes['alt'] or image.attributes['alt'].text.blank?
+  end
+  true
+end
+
 end
 
 end

data/app/models/concerns/dc_policy_rule_concern.rb

@@ -25,17 +25,20 @@
 # ActiveSupport::Concern definition for DcPolicyRule class. 
 #########################################################################
 module DcPolicyRuleConcern
-  extend ActiveSupport::Concern
-  included do
+extend ActiveSupport::Concern
+included do
 
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  belongs_to :dc_policy_role
+belongs_to :dc_policy_role
 
-  field      :permission,    type: Integer, default: 0
+field      :permission,    type: Integer, default: 0
 
-  embedded_in :policy_rules, polymorphic: true 
+embedded_in :policy_rules, polymorphic: true
+
+after_save :cache_clear
+after_destroy :cache_clear
 
 #########################################################################
 # Returns values for permissions ready to be used in select field.
@@ -50,7 +53,7 @@ def self.values_for_permissions
   key = 'helpers.label.dc_policy_rule.choices4_permission'
   c = I18n.t(key)  
   c = I18n.t(key, locale: 'en') if c.class == Hash or c.match( 'translation missing' )
-  c.split(',').inject([]) {|r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
+  c.split(',').inject([]) { |r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
 end
 
 #########################################################################
@@ -74,5 +77,14 @@ def self.permission_name_for_value(value)
   'error'
 end
 
+private
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  _parent.send(:cache_clear) if _parent.respond_to?(:cache_clear)
+end
+
 end
 end

data/app/models/concerns/dc_seo_concern.rb

@@ -0,0 +1,66 @@
+#--
+# Copyright (c) 2019+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+##########################################################################
+# dc_seo_concern, ads SEO optimization fields to any model.
+#
+# title                String               Browser title. Optimization for SEO.
+# meta_description     String               SEO optimised page description
+# meta_additional      String               Additional meta page data. Enter as meta_name=meta data
+# dc_json_lds          Embedded:DcJsonLd    Page structure data
+# 
+# If you want to add SEO optimization data to your document add:
+# 
+# "include DcSeoConcern" to your model definition
+# 
+# and
+# 
+# "include: dc_seo" option to top of DRGCMS edit form for your document.
+##########################################################################
+module DcSeoConcern
+extend ActiveSupport::Concern
+
+included do  
+  field :title,            type: String
+  field :meta_description, type: String
+  field :canonical_link,   type: String
+  embeds_many :dc_json_lds # JSON-LD structure
+  
+  ######################################################################
+  # Will return JSON LD data if defined for the page
+  ######################################################################
+  def get_json_ld()
+    parent_data = {'datePublished' => self.created_at, 'dateModified' => self.updated_at}
+    data = []
+    if dc_json_lds.size > 0
+      dc_json_lds.where(active: true).each do |element|
+        dta = element.get_json_ld(parent_data)
+        data << dta if dta.size > 0
+      end
+    end
+    data  
+  end
+end
+
+
+end

data/app/models/concerns/dc_site_concern.rb

@@ -27,44 +27,55 @@
 module DcSiteConcern
 extend ActiveSupport::Concern
 included do
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  field :name,                type: String
-  field :description,         type: String
-  field :homepage_link,       type: String
-  field :error_link,          type: String
-  field :header,              type: String, default: ''
-  field :css,                 type: String, default: ''
-  field :route_name,          type: String, default: ''
-  field :page_title,          type: String  
-  field :document_extension,  type: String  
-  field :page_table,          type: String
-  field :page_class,          type: String, default: 'DcPage'
-  field :site_layout,         type: String, default: 'content'
-  field :menu_class,          type: String, default: 'DcSimpleMenu'
-  field :request_processor,   type: String
-  field :files_directory,     type: String
-  field :logo,                type: String
-  field :active,              type: Boolean, default: true
-  field :created_by,          type: BSON::ObjectId
-  field :updated_by,          type: BSON::ObjectId  
-  field :menu_name,           type: String
-  field :menu_id,             type: BSON::ObjectId
-  field :settings,            type: String
-  field :alias_for,           type: String  
-  field :rails_view,          type: String,  default: ''
-  field :design,              type: String,  default: ''
-  field :inherit_policy,      type: BSON::ObjectId 
-  
-  embeds_many :dc_policies
-  embeds_many :dc_parts
-  
-  index( { name: 1 }, { unique: true } )
-  index( { alias_for: 1 } )
-  
-  validates :name, presence: true
-  validates :name, uniqueness: true      
+
+include Mongoid::Document
+include Mongoid::Timestamps
+
+field :name,                type: String
+field :description,         type: String
+field :homepage_link,       type: String
+field :error_link,          type: String
+field :header,              type: String, default: ''
+field :css,                 type: String, default: ''
+field :route_name,          type: String, default: ''
+field :page_title,          type: String
+field :document_extension,  type: String
+field :page_table,          type: String
+field :page_class,          type: String, default: 'DcPage'
+field :site_layout,         type: String, default: 'content'
+field :menu_class,          type: String, default: 'DcSimpleMenu'
+field :request_processor,   type: String
+field :files_directory,     type: String
+field :logo,                type: String
+field :active,              type: Boolean, default: true
+field :created_by,          type: BSON::ObjectId
+field :updated_by,          type: BSON::ObjectId
+field :menu_name,           type: String
+field :menu_id,             type: BSON::ObjectId
+field :settings,            type: String
+field :alias_for,           type: String
+field :rails_view,          type: String,  default: ''
+field :design,              type: String,  default: ''
+field :inherit_policy,      type: BSON::ObjectId
+
+embeds_many :dc_policies
+embeds_many :dc_parts
+
+index( { name: 1 }, { unique: true } )
+index( { alias_for: 1 } )
+
+validates :name, presence: true
+validates :name, uniqueness: true
+
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_site)
+end
 
 ########################################################################
 # Returns value of site setting. If no value is send as parameter it returns 
@@ -78,15 +89,15 @@ end
 ########################################################################
 # Returns class object of collection name
 ########################################################################
-def page_klass()
+def page_klass
   (self.page_table.blank? ? self.page_class : self.page_table).classify.constantize
 end
 
 ########################################################################
 # Returns class object of menu collection name
 ########################################################################
-def menu_klass()
-  (self.menu_class.blank? ? 'DcMenu' : self.menu_class).classify.constantize
+def menu_klass
+  (menu_class.blank? ? 'DcMenu' : menu_class).classify.constantize
 end
 
 ########################################################################
@@ -99,11 +110,23 @@ end
 
 ########################################################################
 # Return choices for selecting policies for the site
+# @deprecated
 ########################################################################
-def self.choices4_policies
-  site = ApplicationController.dc_get_site_()
+#def self.choices4_policies
+#  site = ApplicationController.dc_get_site_()
   #all.inject([]) { |r,site| r << [ (site.active ? '' : t('drgcms.disabled') ) + site.name, site._id] }
-  [['a','b']]
+#  [['a','b']]
+#end
+
+########################################################################
+# Return choices for selecting policies for the site
+########################################################################
+def self.choices_for_menu(menu_class)
+  return [] if menu_class.blank?
+  menu = menu_class.classify.constantize
+  menu.where(active: true).inject([]) do |r, a_menu|
+    r << [a_menu.description, a_menu.id]
+  end
 end
 
 end  

data/app/models/concerns/dc_user_concern.rb

@@ -56,8 +56,8 @@ field :valid_to,    type: Date
 field :created_by,  type: BSON::ObjectId
 field :updated_by,  type: BSON::ObjectId
 
-field :type,        type: Integer, default: 0 # 0 => User, 1 => Group
-field :members,     type: Array
+field :group,       type: Boolean, default: false # false => User, true => Group
+field :member,      type: Array
 
 embeds_many :dc_user_roles
 
@@ -73,43 +73,39 @@ has_secure_password
 
 index( { username: 1 }, { unique: true } )
 index( { email: 1 }, { unique: true } )
-index 'dc_user_roles.dc_policy_role_id' => 1  
-index 'members' => 1  
+index 'dc_user_roles.dc_policy_role_id' => 1
+index member: 1
+index group: 1
 
 validates_length_of :username, minimum: 4
 validates           :username, uniqueness: true  
-validates           :email,    uniqueness: true  
-before_save :do_before_save
+validates           :email,    uniqueness: true
+validate :do_validate
 
-##########################################################################
-# before_save callback takes care of name field and ensures that e-mail is unique 
-# when entry is left empty. 
-##########################################################################
-def do_before_save
-  self.name  = "#{self.title} #{self.first_name} #{self.middle_name + ' ' unless self.middle_name.blank?}#{self.last_name}".strip
-# to ensure unique e-mail            
-  self.email = "unknown@#{self.id}" if self.email.to_s.strip.size < 5
-end
+before_save :do_before_save
+before_validation :do_before_validation
 
 ##########################################################################
-# Checks if user has role 'role_id' defined in his roles
+# Checks if user has role 'role_id' defined in his roles.
+# 
+# Role may be passed as BSON id or as String like role name. 
 ##########################################################################
 def has_role?(role_id)
   return false unless role_id
-#
+
   unless BSON::ObjectId.legal?(role_id)
     role    = DcPolicyRole.get_role(role_id)
     role_id = role.id if role
   end
-  role = self.dc_user_roles.where(dc_policy_role_id: role_id)
-  (role && role.active?)
+  role = self.dc_user_roles.where(dc_policy_role_id: role_id).first
+  (role && role.active)
 end
 
 ##########################################################################
 # Will return all possible values for country field ready for input in select field. 
 # Values are loaded from github when method is first called.
 ##########################################################################
-def self.choices4_country()
+def self.choices4_country
   if @@countries.nil?
     uri = URI.parse("https://raw.githubusercontent.com/umpirsky/country-list/master/country/cldr/en/country.json")
     http = Net::HTTP.new(uri.host, uri.port)
@@ -123,7 +119,7 @@ def self.choices4_country()
 end
 
 ##########################################################################
-# Performs ligically test on passed email parameter.
+# Performs logically test on passed email parameter.
 # 
 # Parameters:
 # [email] String: e-mail address
@@ -141,5 +137,50 @@ def self.is_email?(email)
   email.to_s =~ /^[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/
 end
 
+##########################################################################
+# Will return list of available groups
+##########################################################################
+def self.groups_for_select
+  where(group: true, active: true).order_by(name: 1).inject([]) { |r, e| r << [e.name, e.id] }
+end
+
+private
+
+##########################################################################
+# before_save callback takes care of name field and ensures that e-mail is unique
+# when entry is left empty.
+##########################################################################
+def do_before_save
+  self.name  = "#{title} #{first_name} #{middle_name + ' ' unless middle_name.blank?}#{last_name}".strip
+  # to ensure unique e-mail
+  self.email = "unknown@#{id}" if email.blank?
+end
+
+##########################################################################
+# Create random password for groups. Must be done before validation
+##########################################################################
+def do_before_validation
+  if new_record? && group
+    self.password = DcUser.random_password(30)
+    self.password_confirmation = password
+  end
+end
+
+##########################################################################
+# Perform some additional validations
+##########################################################################
+def do_validate
+  if group && member.present?
+    errors.add('member', I18n.t('errors.messages.present'))
+  end
+end
+##########################################################################
+# Will create random password
+##########################################################################
+def self.random_password(number)
+  charset = Array('A'..'Z') + Array('0'..'9') + Array('a'..'z')
+  Array.new(number) { charset.sample }.join
+end
+
 end
 end