drg_cms 0.5.52.12 → 0.6.0.8

data/app/models/concerns/dc_page_concern.rb

@@ -33,12 +33,11 @@ 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: ''
 field :picture,      type: String   
-field :gallery,      type: String   
+field :gallery,      type: Boolean, default: false   
 field :body,         type: String,  default: ''
 field :css,          type: String,  default: ''
 field :script,       type: String,  default: ''
@@ -56,16 +55,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 +82,7 @@ index  alt_link:  1
 before_save :do_before_save
 
 validates :publish_date, presence: true
+validate  :validate_images_alt_present
   
 ######################################################################
 # Will return subject_link. Field name link should be common for all documents
@@ -88,7 +91,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 pressent.
+######################################################################
+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 +120,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 +155,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_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

@@ -86,7 +86,7 @@ end
 # Returns class object of menu collection name
 ########################################################################
 def menu_klass()
-  (self.menu_class.blank? ? 'DcMenu' : self.menu_class).classify.constantize
+  (menu_class.blank? ? 'DcMenu' : menu_class).classify.constantize
 end
 
 ########################################################################
@@ -106,5 +106,16 @@ def self.choices4_policies
   [['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  
 end

data/app/models/concerns/dc_user_concern.rb

@@ -92,7 +92,9 @@ def do_before_save
 end
 
 ##########################################################################
-# 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
@@ -101,8 +103,8 @@ def has_role?(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
 
 ##########################################################################

data/app/models/dc_design.rb

@@ -31,6 +31,7 @@
 #  updated_at           Time                 updated_at
 #  description          String               Short description of design
 #  body                 String               Body of design which will be rendered like any Rails view
+#  params               String               Parameters used by design
 #  css                  String               CSS for design
 #  rails_view           String               Rails view (file) name which will be used to render design
 #  author               String               Creater if design
@@ -94,6 +95,7 @@ class DcDesign
   field   :css,         type: String,  default: ''
   field   :rails_view,  type: String,  default: ''
   field   :control,     type: String,  default: ''
+  field   :params,      type: String,  default: ''
   field   :control_method,  type: String,  default: ''
   field   :author,      type: String
   field   :active,      type: Boolean, default: true 

data/app/models/dc_filter.rb

@@ -55,10 +55,14 @@ def self.get_filter(filter)
   yaml = YAML.load(filter) rescue nil
   return yaml if yaml.nil?
   return nil if yaml['table'].nil? # old data
-#
+#  
   model = yaml['table'].classify.constantize
   field = yaml['field'] == 'id' ? '_id' : yaml['field'] # must be
-# if empty required 
+# evaluate
+  if yaml['operation'] == 'eval' and model.respond_to?(yaml['field'])
+    return model.send( yaml['field'] )
+  end
+# if empty
   if yaml['operation'] == 'empty'
     return model.in(field => [nil,''])
   end
@@ -106,45 +110,54 @@ def self.get_filter_field(parent)
   return '' if parent.session[ parent.form['table'] ].nil?
   filter = parent.session[ parent.form['table'] ][:filter]
   return '' if filter.nil?
-#
+
   filter = YAML.load(filter) rescue nil 
   return '' if filter.nil?
-#
+
   field = get_field_form_definition(filter['field'], parent)
   return '' if field.nil? and filter['input'].nil?
   field = {} if field.nil?
-# If field has choices available in labels, use them. This is most likely select input field.
+  # If field has choices available in labels, use them. This is most likely select input field.
   if field['name']
     choices = parent.t('helpers.label.' + parent.form['table'] + '.choices4_' + field['name'] )
     unless choices.match( 'translation missing' ) or choices.match('helpers.label')
       field['choices'] = choices
     end
   end
-# field redefined with input keyword. Name must start with _
+  # field redefined with input keyword. Name must start with _
   field['name']     = '_filter_field'
   field['type']     = filter['input'] if filter['input'].to_s.size > 5
   field['type']   ||= 'text_field'
   field['readonly'] = false   # must be
   field['html']   ||= {} 
   field['html']['size']  = 20
-# Start with last entered value
-  field['html']['value'] = filter['value'] unless filter['value'] == '#NIL'
+  # Start with last entered value
+  field['html']['value']    = filter['value'] unless filter['value'] == '#NIL'
   field['html']['selected'] = field['html']['value'] # for select field
-# url for filter ON action
+  # url for filter ON action
   field['html']['data-url'] = parent.url_for(
     controller: 'cmsedit',action: :index, filter: 'on',
-    table: parent.form['table'], form_name: parent.form['form_name'])
+    table: parent.form['table'], form_name: parent.params['form_name'])
   url = field['html']['data-url']
+  # remove if present
+  field['with_new'] = nil if field['with_new']
 # create input field object
   klas_string = field['type'].camelize
   klas = DrgcmsFormFields::const_get(klas_string) rescue nil
   return '' if klas.nil?
 # return data from object and create html code to display field
-  object = klas.new(parent, nil, field).render
-  js     = object.js
-  "<span class=\"filter_field\" data-url=\"#{url}\">#{object.html} " <<
-    parent.fa_icon('filter lg', class: 'record_filter_field_icon dc-link-icon dc-animate') <<
-    (js.size > 2 ? parent.javascript_tag(js) : '') << '</span>'
+  object = klas.new(parent, nil, field).render rescue nil
+  # Error. Forget filter and return 
+  if object.nil?
+    parent.session[ parent.form['table'] ][:filter] = nil
+    return ''
+  end
+  js = object.js.blank? ? '' : parent.javascript_tag(object.js)
+%Q[<li class="no-background">
+<span class="filter_field" data-url="#{url}">#{object.html}
+#{parent.fa_icon('search lg', class: 'record_filter_field_icon')}
+#{js}</span>
+</li>]
 end
 
 ######################################################################
@@ -155,7 +168,8 @@ def self.menu_filter(parent)
   table = parent.form['table']
   documents = self.where(table: table, active: true).to_a
   documents.each do |document|
-    html << "<li data-filter=\"\">#{document.description}</li>"
+    description = document.description.match('.') ? I18n.t(document.description) : document.description
+    html << "<li data-filter=\"#{document.id}\">#{description}</li>"
   end
 
 # add filters defined in model
@@ -176,7 +190,6 @@ def self.menu_filter(parent)
   end
 # divide standard and custom filter options  
   html << '<hr>' if html.size > 30 # 
-#  html << '<li onclick="$(\'#drgcms_filter\').toggle(300);">' + I18n.t('drgcms.filter_set') + '</li>'
   html << '<li id="open_drgcms_filter">' + I18n.t('drgcms.filter_set') + '</li>'
   html << '</ul>'
 end
@@ -189,10 +202,14 @@ def self.title4_filter_off(filter_yaml)
   filter = YAML.load(filter_yaml)
   operations = I18n.t('drgcms.choices4_filter_operators').chomp.split(',').inject([]) {|r,v| r << v.split(':') }
   operation = ''
-  operations.each{|a| (operation = a.first; break) if a.last == filter['operation']}
+  if filter['operation'] == 'eval'
+   filter['field']
+  else
+    operations.each{|a| (operation = a.first; break) if a.last == filter['operation']}
 #
-  '[ ' + I18n.t("helpers.label.#{filter['table']}.#{filter['field']}") + 
-  " ] #{operation} [ #{filter['value'].to_s} ] : #{I18n.t('drgcms.filter_off')}"
+    '[ ' + I18n.t("helpers.label.#{filter['table']}.#{filter['field']}") + 
+    " ] #{operation} [ #{filter['value'].to_s} ] : #{I18n.t('drgcms.filter_off')}"
+  end
 end
 
 end

data/app/models/dc_gallery.rb

@@ -0,0 +1,64 @@
+#--
+# 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.
+#++
+
+#########################################################################
+# == Schema information
+#
+# Collection name: dc_gallery : Pictures gallery
+#
+#  _id                  BSON::ObjectId       _id
+#  doc_id               BSON::ObjectId       Document id of the gallery
+#  title                String               Title name for picture
+#  description          String               Short description
+#  picture              String               Picture filename
+#  thumbnail            String               Picture thumbnail
+#  
+#  active               Mongoid::Boolean     Picture is active
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       updated_by
+#  created_at           Time                 created_at
+#  updated_at           Time                 updated_at
+# 
+# Picture gallery collection holds data about picture galleries for 
+# different types of documents.
+#########################################################################
+class DcGallery
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :title,       type: String
+  field :description, type: String
+  field :picture,     type: String
+  field :thumbnail,   type: String
+  field :doc_id,      type: BSON::ObjectId
+  field :order,       type: Integer, default: 10
+  
+  field :active,      type: Boolean, default: true 
+  field :created_by,  type: BSON::ObjectId
+  field :updated_by,  type: BSON::ObjectId
+ 
+  index doc_id: 1
+  
+  validates :picture, presence: true
+  validates :doc_id, presence: true
+end 

data/app/models/dc_json_ld.rb

@@ -0,0 +1,152 @@
+#--
+# 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.
+#++
+
+########################################################################
+# == Schema information
+#
+# Collection name: dc_json_ld : JSON_LD data for site optimization
+#
+#  _id                  BSON::ObjectId       _id
+#  type                 String               Type of structure
+#  data                 String               Structure data in YAML
+#  dc_json_lds          Object               Can embed substructure
+#  created_at           Time                 created_at
+#  updated_at           Time                 Last updated at
+#  created_by           BSON::ObjectId       created_by
+#  updated_by           BSON::ObjectId       Last updated by
+# 
+########################################################################
+class DcJsonLd 
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name,        type: String
+  field :type,        type: String
+  field :data,        type: String
+  field :active,      type: Boolean,      default: true
+
+  embeds_many :dc_json_lds, :cyclic => true
+
+  field :created_by,  type: BSON::ObjectId
+  field :updated_by,  type: BSON::ObjectId
+  
+  validates :name, presence: true
+  validates :type, presence: true
+  
+##########################################################################
+# Returns JSON LD data as YAML
+##########################################################################
+def get_json_ld(parent_data)
+  yaml = (YAML.load(self.data) rescue nil) || {}
+  yaml['@type'] = self.type if yaml.size > 0
+  if dc_json_lds.size > 0
+    dc_json_lds.where(active: true).each do |element|
+      yml = element.get_json_ld(parent_data)
+      if yml.size > 0
+        yaml[element.name] ||= []
+        yaml[element.name] << yml 
+      end
+    end
+  end
+  yaml
+end
+
+########################################################################
+# Searches forms path for file_name and returns full file name or nil if not found.
+# 
+# @param [String] Form file name. File name can be passed as gem_name.filename. This can
+# be useful when you are extending form but want to retain same name as original form
+# For example. You are extending dc_user form from drg_cms gem and want to
+# retain same dc_user name. This can be done by setting drg_cms.dc_user to extend option. 
+# 
+# @return [String] Form file name including path or nil if not found.
+########################################################################
+def self.dc_find_form_file(form_file)
+  form_path=nil
+  if form_file.match(/\.|\//)
+    form_path,form_file=form_file.split(/\.|\//)
+  end
+  DrgCms.paths(:forms).reverse.each do |path|
+    f = "#{path}/#{form_file}.yml"
+    return f if File.exist?(f) and (form_path.nil? or path.to_s.match(/\/#{form_path}\//i))
+  end
+  p "Form file #{form_file} not found!"
+  nil
+end
+
+########################################################################
+# Find document by ids when document are embedded into main d even if embedded
+# 
+# @param [tables] Tables parameter as send in url. Tables are separated by ;
+# @param [ids] ids as send in url. ids are separated by ;
+# 
+# @return [Document] 
+########################################################################
+def self.find_document_by_ids(tables, ids)
+  collection = tables.split(';').first.classify.constantize
+  ar_ids = ids.split(';')
+# Find top document  
+  document = collection.find(ar_ids.shift)
+# Search for embedded document
+  ar_ids.each {|id| document = document.dc_json_lds.find(id) }
+  document
+end
+
+#########################################################################
+# Returns possible options for type select field on form.
+#########################################################################
+def self.choices4_type()
+  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  
+  yaml.inject([]) {|result, schema_name| result << schema_name.first }
+end
+
+#########################################################################
+# Create menu to add schema element. Called from DRGCMS Form action.
+#########################################################################
+def self.add_schema_menu(parent)
+  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  if (level = parent.params['ids'].split(';').size) == 1
+    # select only top level elements
+    yaml.delete_if { |schema_name, schema_data| schema_data['level'].nil? }
+  else
+    # select only elemets which are subelements of type
+    parent_type = self.find_document_by_ids(parent.params['table'],parent.params['ids']).type
+    _yaml = []
+    yaml[parent_type].each do |name, data|
+      next unless data.class == Hash
+      _yaml << [data['type'], yaml[data['type']] ] if data['type'] and yaml[data['type']]
+    end
+    yaml = _yaml
+  end
+# create menu code
+  html = '<ul>'
+  yaml.each do |schema_name, schema_data|
+    next if level == 1 and schema_data['level'].nil?
+    url = "/dc_common/add_json_ld_schema?table=#{parent.params['table']}&ids=#{parent.params['ids']}&schema=#{schema_name}&url=#{parent.request.url}"
+    html << %Q[<li class="dc-link-ajax dc-animate" data-url="#{url}">#{schema_name}</li>]    
+  end
+  html << '</ul>' 
+end
+  
+end