drg_cms 0.7.0.2 → 0.7.0.8

data/app/helpers/dc_image_helper.rb

@@ -0,0 +1,127 @@
+#--
+# Copyright (c) 2022+ 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.
+#++
+
+
+####################################################################
+# Helpers needed by some form fields
+####################################################################
+module DcImageHelper
+  
+############################################################################
+# Will return code for previewing image on top of dc_image entry form
+############################################################################
+def dc_image_preview(document, *parms)
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{document.first_available_image}"
+  %(<span class="dc-image-preview dc-image-preview-1"><img src="#{src}"></img></span>).html_safe
+end
+
+############################################################################
+# Will return code for previewing resized images on dc_image entry form
+############################################################################
+def dc_image_preview_resized(document, yaml, ignore)
+  size = yaml['name'].last
+  return '' if document["size_#{size}"].blank?
+
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{document.id}-#{size}.#{document.img_type}?#{Time.now.to_i}"
+  %(<span class="dc-image-preview"><img src="#{src}"></img></span><div id="dc-image-preview"></div>).html_safe
+end
+
+############################################################################
+# Will return choices for preset image sizes
+############################################################################
+def dc_image_choices_for_image_size
+  sizes = dc_get_site.params.dig('dc_image', 'sizes')
+  return ['300x200'] if sizes.blank?
+
+  sizes.split(",").map(&:strip)
+end
+
+############################################################################
+# Will return code for invoking dc_image_search form to select image select on a DRG Form.
+#
+# @param [String] field_name : Field name to which selected image value will be saved.
+###########################################################################
+def dc_image_invoke(field_name)
+  return '' unless dc_get_site.params.dig('dc_image', 'location')
+
+  url = url_for(controller: :cmsedit, form_name: :dc_image_search, table: :dc_image, field_name: field_name)
+  %(<span class="dc-window-open" data-url="#{url}" title="#{t('drgcms.dc_image.invoke')}">#{mi_icon('image-o')}</span>).html_safe
+end
+
+############################################################################
+# Will return code for previewing image on top of dc_image entry form
+############################################################################
+def dc_image_first(document, *parms)
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{document.first_available_image}"
+  %(<span class="dc-image-preview"><img src="#{src}"></img></span><span id="dc-image-preview">).html_safe
+end
+
+######################################################################
+# Will format qry result as html code for selecting image
+######################################################################
+def dc_image_select_links(doc, *parms)
+  %w[o s m l].inject('') { | r,size| r << dc_image_link_for_select(doc, size) }.html_safe
+end
+
+######################################################################
+# Will return HTML code for selecting image
+######################################################################
+def dc_image_link_for_select(doc, what)
+  field = "size_#{what}"
+  value = doc.send(field)
+  return '' if value.blank?
+
+  value = value.split(/\+/).first
+  src = "/#{dc_get_site.params.dig('dc_image', 'location')}/#{doc.id}-#{what}.#{doc.img_type}"
+  %(
+<div class="img-link"><div>
+ #{value}<br>
+  <i class="mi-o mi-preview" onclick="dc_image_preview('#{src}');" title="#{t('drgcms.dc_image.preview')}"></i>
+  <i class="mi-o mi-check_circle" onclick="dc_image_select('#{src}');" title="#{t('drgcms.dc_image.select')}"></i>
+</div></div>)
+end
+
+######################################################################
+# Will return image file for requested size.
+#
+# @param [String] file_name : Image file name
+# @param [String] size : Preferred image size
+#
+# @return [String] : Image file name if requested size is found. Otherwise first available image.
+######################################################################
+def dc_image_get_by_size(file_name, size)
+  id = file_name[file_name.rindex('/') + 1, 24]
+  return 'error: ID not valid' unless BSON::ObjectId.legal?(id)
+
+  image = DcImage.find(id)
+  return 'error: ID not found' unless image
+
+  what = %w[o s m l].inject('l') do |r, e|
+    field_name = "size_#{e}".to_sym
+    break e if doc.send(field_name) == size
+    e
+  end
+  "/#{dc_get_site.params.dig('dc_image', 'location')}/#{doc.id}-#{what}.#{doc.img_type}"
+end
+
+end

data/app/models/concerns/dc_policy_rule_concern.rb

@@ -52,7 +52,7 @@ after_destroy :cache_clear
 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 = I18n.t(key, locale: 'en') if c.class == Hash || c.match(/translation missing/i)
   c.split(',').inject([]) { |r,e| r << (ar = e.split(':'); [ar.first, ar.last.to_i]) }
 end
 

data/app/models/concerns/dc_user_concern.rb

@@ -80,7 +80,7 @@ index group: 1
 validates_length_of :username, minimum: 4
 validates           :username, uniqueness: true  
 validates           :email,    uniqueness: true
-validate :do_validate
+validate            :additional_validates
 
 before_save :do_before_save
 before_validation :do_before_validation
@@ -97,8 +97,16 @@ 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).first
-  (role && role.active)
+  role = dc_user_roles.find_by(dc_policy_role_id: role_id)
+
+  # user can be member of groups
+  if role.nil? && member.present?
+    member.each do |group_id|
+      role = DrgCms.cached(DcUser, group_id).dc_user_roles.find_by(dc_policy_role_id: role_id)
+      break if role
+    end
+  end
+  role&.active?
 end
 
 ##########################################################################
@@ -169,7 +177,7 @@ end
 ##########################################################################
 # Perform some additional validations
 ##########################################################################
-def do_validate
+def additional_validates
   if group && member.present?
     errors.add('member', I18n.t('errors.messages.present'))
   end

data/app/models/dc_category.rb

@@ -63,6 +63,16 @@ validates :name, presence: true
 
 before_destroy :can_destroy?
 
+after_save :cache_clear
+after_destroy :cache_clear
+
+####################################################################
+# Clear cache if cache is configured
+####################################################################
+def cache_clear
+  DrgCms.cache_clear(:dc_category)
+end
+
 private
 
 #########################################################################
@@ -88,6 +98,8 @@ def self.values_for_parent(site_id = nil) #:nodoc:
        parent = v.parent
        until parent.nil?
          doc    = find(parent)
+         break if doc.nil?
+
          name   = doc.name + ' / ' + name
          parent = doc.parent
        end

data/app/models/dc_design.rb

@@ -124,10 +124,11 @@ end
 # have site assigned will be selected. Too much designs to select often confuses
 # end user.
 ########################################################################
-def self.choices4_design(site=nil)
-  list = site.nil? ? where(active: true) : where(active: true).in(site_id: [nil,site.id]).to_a
-  list.sort! { |w1, w2| w1.description.casecmp(w2.description) }
-  list.inject([]) { |r, design| r << [ design.description, design._id] }
+def self.choices4_design(site)
+  (site.blank? ? where(active: true) : where(:site_id.in => [nil, BSON::ObjectId.from_string(site) ], active: true))
+    .only(:id, :description)
+    .order_by(description: 1)
+    .map { |design| [design.description, design.id] }
 end
   
 end

data/app/models/dc_filter.rb

@@ -53,32 +53,33 @@ end
 ######################################################################
 def self.get_filter(filter)
   yaml = YAML.load(filter) rescue nil
-  return yaml if yaml.nil?
-  return nil if yaml['table'].nil? # old data
-#  
+  return if yaml.nil? || yaml['table'].nil? # old data
+
   model = yaml['table'].classify.constantize
   field = yaml['field'] == 'id' ? '_id' : yaml['field'] # must be
-# evaluate
-  if yaml['operation'] == 'eval' and model.respond_to?(yaml['field'])
-    return model.send( yaml['field'] )
+  # evaluate
+  if yaml['operation'] == 'eval'
+    return eval(yaml['value']) if yaml['value'] && yaml['value'] != '#NIL' # evaluated as string
+    return model.send( yaml['field'] ) if model.respond_to?(yaml['field']) # defined as scope or method in the model
+    return
   end
-# if empty
+  # if empty
   if yaml['operation'] == 'empty'
-    return model.in(field => [nil,''])
+    return model.in(field => [nil, ''])
   end
-# if value == NIL no filter is necessary
-  return nil if yaml['value'].class == String and yaml['value'] == '#NIL'
+  # if value == NIL no filter is necessary
+  return if yaml['value'].class == String && yaml['value'] == '#NIL'
   
-# do regex if operation is like  
+  # do regex if operation is like
   value = yaml['operation'] == 'like' ? /#{yaml['value']}/i : yaml['value'] 
-# when field type is ObjectId transform value    
-  if model.fields[field] and model.fields[field].type == BSON::ObjectId
+  # when field type is ObjectId transform value
+  if model.fields[field] && model.fields[field].type == BSON::ObjectId
     value = BSON::ObjectId.from_string(value) rescue nil
   end
-#
-  if ['eq','like'].include?(yaml['operation'])
+
+  if %w[eq like].include?(yaml['operation'])
     model.where(field => value)
-# TODO in operator    
+  # TODO in operator
   else
     model.where(field.to_sym.send(yaml['operation']) => value)
   end
@@ -109,7 +110,7 @@ end
 def self.get_filter_field(parent)
   return '' if parent.session[ parent.form['table'] ].nil?
 
-  filter = parent.session[ parent.form['table'] ][:filter]
+  filter = parent.session[parent.form['table']][:filter]
   return '' if filter.nil?
 
   filter = YAML.load(filter) rescue nil 
@@ -124,7 +125,7 @@ def self.get_filter_field(parent)
   # 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')
+    unless choices.match(/translation missing/i) || choices.match('helpers.label')
       field['choices'] = choices
     end
   end

data/app/models/dc_image.rb

@@ -0,0 +1,237 @@
+#--
+# Copyright (c) 2022+ 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_images : Images
+#
+#  _id                  BSON::ObjectId     _id
+#  created_at           Time               created_at
+#  updated_at           Time               updated_at
+#  dc_site_id           BSON::ObjectId     Site id
+#  dc_user_id           BSON::ObjectId     User's id
+#  name                 String             ip
+#  short                String             short name
+#  text                 String             text
+#  size_l               String             Large image size
+#  size_m               String             Medium image size
+#  size_s               String             Small image size
+#
+# DRG CMS module for saveing and manipulating images.
+#
+# If you want to use this module you must install image magick tools
+# and mini_magick ruby gem.
+##########################################################################
+class DcImage
+include Mongoid::Document
+include Mongoid::Timestamps
+
+field :name,        type: String
+field :img_type,    type: String
+field :text,        type: String
+field :short,       type: String
+field :keep_original, type: Boolean, default: false
+field :size_o,      type: String
+field :size_l,      type: String
+field :size_m,      type: String
+field :size_s,      type: String
+field :categories,  type: Array, default: []
+field :created_by,  type: BSON::ObjectId
+
+belongs_to :dc_user
+
+index dc_site_id: 1
+index created_by: 1
+index categories: 1
+
+before_validation :set_original
+
+validate :validate_image_values
+
+#########################################################################
+# checks that image size values are in correct format. Must be hsize[x]vsize (ex. 300x200)
+#########################################################################
+def set_original
+  if keep_original
+    if size_o.blank?
+      image = MiniMagick::Image.open(name)
+      self.size_o = "#{image.width}x#{image.height}"
+    end
+  else
+    self.size_o = ''
+  end
+end
+
+#########################################################################
+# checks that image size values are in correct format. Must be hsize[x]vsize (ex. 300x200)
+#########################################################################
+def validate_image_values
+  %w[l m s o].each do |size|
+    field = "size_#{size}"
+    value = send(field)
+    next if value.blank?
+
+    a = value.strip.split(/x|\+/)
+    a[0, 2].each { |e| errors.add(field, I18n.t('drgcms.not_valid')) unless e.to_i > 0 }
+  end
+end
+
+#########################################################################
+# For mapping categories array to input text_area field
+#########################################################################
+def cats_input=(what)
+  self.categories = if what.blank?
+                      []
+                    else
+                      what.chomp.split("\n").map(&:downcase).map(&:strip)
+                    end
+end
+
+#########################################################################
+# For mapping categories array to input text_area field
+#########################################################################
+def cats_input
+  self.categories.join("\n")
+end
+
+#########################################################################
+# For mapping categories array to display field
+#########################################################################
+def categories_line
+  categories ? categories.join(", ") : ''
+end
+
+#########################################################################
+# Will return first available image starting from small up
+#########################################################################
+def first_available_image
+  image = %w[o s m l].each do |size|
+    field = "size_#{size}"
+    value = send(field)
+    return "#{id}-#{size}.#{img_type}" if value.present?
+  end
+end
+
+#########################################################################
+# Will return size for large image
+#########################################################################
+def size_ls
+  size_l.blank? ? '' : size_l.split(/x|\+/)[0, 2].join('x')
+end
+
+#########################################################################
+# Will set new size for large image
+#########################################################################
+def size_ls=(value)
+  self.size_l = value.blank? ? '' : value
+end
+
+#########################################################################
+# Will return x offset for cropping large image
+#########################################################################
+def offset_lx
+  size_l.blank? ? '' : size_l.split(/x|\+/)[2].to_i
+end
+
+#########################################################################
+# Will set x offset for cropping large image
+#########################################################################
+def offset_lx=(value)
+  self.size_l << (size_l.blank? ? '' : "+#{value}")
+end
+
+#########################################################################
+# Will return y offset for cropping large image
+#########################################################################
+def offset_ly
+  size_l.blank? ? '' : size_l.split(/x|\+/)[3].to_i
+end
+
+#########################################################################
+# Will set y offset for cropping large image
+#########################################################################
+def offset_ly=(value)
+  self.size_l << (size_l.blank? ? '' : "+#{value}")
+end
+
+def size_ms
+  size_m.blank? ? '' : size_m.split(/x|\+/)[0, 2].join('x')
+end
+
+def size_ms=(value)
+  self.size_m = value.blank? ? '' : value
+end
+
+def offset_mx
+  size_m.blank? ? '' : size_m.split(/x|\+/)[2].to_i
+end
+
+def offset_mx=(value)
+  self.size_m << (size_m.blank? ? '' : "+#{value}")
+end
+
+def offset_my
+  size_m.blank? ? '' : size_m.split(/x|\+/)[3].to_i
+end
+
+def offset_my=(value)
+  self.size_m << (size_m.blank? ? '' : "+#{value}")
+end
+
+def size_ss
+  size_s.blank? ? '' : size_s.split(/x|\+/)[0, 2].join('x')
+end
+
+def size_ss=(value)
+  self.size_s = value.blank? ? '' : value
+end
+
+def offset_sx
+  size_s.blank? ? '' : size_s.split(/x|\+/)[2].to_i
+end
+
+def offset_sx=(value)
+  self.size_s << (size_s.blank? ? '' : "+#{value}")
+end
+
+def offset_sy
+  size_s.blank? ? '' : size_s.split(/x|\+/)[3].to_i
+end
+
+def offset_sy=(value)
+  self.size_s << (size_s.blank? ? '' : "+#{value}")
+end
+
+#########################################################################
+# Return all users that have contributed images
+#########################################################################
+def self.all_users
+  DcUser.where(:id.in => distinct(:created_by)).order_by(name: 1).map { |doc| [doc.name, doc.id] }
+end
+
+def self.html_code
+  'code'
+end
+
+end

data/app/models/dc_internals.rb

@@ -28,11 +28,10 @@
 ##########################################################################
 module DcInternals
   INTERNALS = {
-    'current_user' => 'session[:user_id]',
+    'current_user' => 'session[:user_id].to_s',
     'current_user_name' => 'session[:user_name]',
-    'current_site' => 'dc_get_site.id'
+    'current_site' => 'dc_get_site.id.to_s'
   }
-#
   @additions = {}
   
 ##########################################################################
@@ -40,7 +39,7 @@ module DcInternals
 # to be added to structure and be used together with predefined values.
 ##########################################################################
 def self.add_internal(hash)
-  hash.each {|key,value| additions[key] = value} 
+  hash.each { |key, value| additions[key] = value }
 end
 
 ##########################################################################
@@ -48,11 +47,8 @@ end
 # to be added to structure and be used together with predefined values.
 ##########################################################################
 def self.get(key)
-  key = key.sub('@','')
-
-  value = INTERNALS[key]
-  value = @additions[key] if value.nil?
-  value
+  key.sub!('@', '')
+  INTERNALS[key] || @additions[key]
 end
 
 end

data/app/models/dc_policy_role.rb

@@ -55,30 +55,30 @@ after_save :cache_clear
 after_destroy :cache_clear
 
 ####################################################################
-# Clear cache if cache is configured
+# Clear cache when cache is configured
 ####################################################################
 def cache_clear
   DrgCms.cache_clear(:dc_permission)
   DrgCms.cache_clear(:dc_site)
+  DrgCms.cache_clear(:dc_policy_role)
 end
 
 ########################################################################
 # Return all defined roles as choices for use in select field.
 ########################################################################
 def self.choices4_roles
-  where(active: true).order_by(name: 1).inject([]) { |r,role| r << [ role.name, role._id] }
+  where(active: true).order_by(name: 1).inject([]) { |r, role| r << [ role.name, role._id] }
 end
 
 ########################################################################
 # Search for role when role parameter is String.
 ########################################################################
 def self.get_role(role)
-  if role.class == String
-    rol = role
-    role = find_by(name: rol) || find_by(system_name: rol)
-  end
-  role
-end
+  doc = DrgCms.cache_read(['dc_policy_role', role])
+  return doc if doc
 
+  doc = find_by(name: role) || find_by(system_name: role)
+  DrgCms.cache_write(['dc_policy_role', role], doc)
+end
 
 end

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -114,11 +114,11 @@ end
 # Returns: 
 # String. Translated text. 
 ####################################################################
-def t(key, default='')
+def t(key, default = '')
   c = I18n.t(key)
-  if c.match( 'translation missing' )
+  if c.match(/translation missing/i)
     c = I18n.t(key, locale: 'en') 
-# Still not found. Return default if set
+    # Still not found. Return default if set
     c = default unless default.blank?
   end
   c
@@ -127,15 +127,8 @@ end
 ####################################################################
 # Standard code for returning readonly field.
 ####################################################################
-def ro_standard(value=nil)
-  if value.nil?
-    value = if @yaml['html']['value']
-      @yaml['html']['value']
-    else
-      @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
-    end
-  end
-  #@html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
+def ro_standard(value = nil)
+  value ||= @yaml['html']['value'] || (@record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil)
   @html << %(<div id="#{@yaml['name']}" class="dc-readonly">#{value}</div>)
   self
 end
@@ -157,8 +150,9 @@ def set_initial_value(opt1 = 'html', opt2 = 'value')
   value_send_as = 'p_' + @yaml['name']
   if @parent.params[value_send_as]
     @yaml[opt1][opt2] = @parent.params[value_send_as] 
-  elsif @parent.flash[:record] and @parent.flash[:record][@yaml['name']]
-    @yaml[opt1][opt2] = @parent.flash[:record][@yaml['name']]
+  elsif @parent.flash[:record]
+    value = @parent.flash[:record][@yaml['name']] || @parent.flash[:record][@yaml['name'].to_sym]
+    @yaml[opt1][opt2] = value if value
   end
   set_default_value(opt1, opt2) if @yaml['default']
 end
@@ -217,24 +211,13 @@ def set_style()
   end 
 end
 
-####################################################################
-# DEPRECATED!
-#  
-# Returns css code for the field if specified. It replaces all occurences of '# ' 
-# with field name id, as defined on form.
-####################################################################
-def __css_code
-  return '' if @css.blank?
-  @css.gsub!('# ',"#td_record_#{@yaml['name']} ")
-  "\n<style type=\"text/css\">#{@css}</style>"
-end
-
 ####################################################################
 # Sets css code for the field if specified. It replaces all occurences of '# ' 
 # with field name id, as defined on form.
 ####################################################################
 def set_css_code(css)
   return '' if css.blank?
+
   css.gsub!('# ',"#td_record_#{@yaml['name']} ") if css.match('# ')
   css
 end