drg_cms 0.7.0.2 → 0.7.1.1

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,11 +110,11 @@ 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 
-  return '' if filter.nil?
+  return '' if filter.nil? || filter['operation'].to_s == 'eval'
 
   field = get_field_form_definition(filter['field'], parent)
   return '' if field.nil? && filter['input'].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
@@ -185,14 +186,10 @@ def self.menu_filter(parent)
     # only single defined. Convert to array.
     filters = [filters] if filters.class == Hash
     filters.each do |filter|
-      url = parent.dc_link_to(filter['title'], nil, controller: 'cmsedit', action: :run, t: table,
-                              f: CmsHelper.form_param(parent.params),
-                              control: 'cmsedit.filter_on',
-                              filter_field: filter['field'],
-                              filter_oper: filter['operation'],
-                              filter_value: filter['value'])
-
-      url = parent.url_for(controller: 'cmsedit', action: :run, t: table, f: CmsHelper.form_param(parent.params),
+      url = parent.url_for(controller: :cmsedit,
+                           action: :run,
+                           table: table,
+                           form_name: CmsHelper.form_param(parent.params),
                            control: 'cmsedit.filter_on',
                            filter_field: filter['field'],
                            filter_oper: filter['operation'],

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_site
+
+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_memory.rb

@@ -63,8 +63,8 @@
 # As result report.pdf file will be opened in new browser window.
 ########################################################################
 class DcMemory
-  include Mongoid::Document
-  
+include Mongoid::Document
+
 ########################################################################
 # Initilize object
 ########################################################################

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/dc_setup.rb

@@ -0,0 +1,111 @@
+#--
+# Copyright (c) 2024+ 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.
+#++
+
+##############################################################################
+# DcSetup collection is used for settings, that are specific to the application,
+# or part of application (gem). It consists of data dafinitions and form for editing data.
+# Data is saved internaly in YAML format.
+#
+# When editing, admin can see and edit form definition (adding new data to application setup), while user
+# sees only data entry form.
+#
+# Usage:
+#   my_app_settings = DcSetup.find_by(name: 'my_app')
+#   my_app_settings = DcSetup.get('my_app')
+#   company = my_app_settings.company_name
+#   company, ceo = my_app_settings[:company_name, 'ceo_name']
+#
+##############################################################################
+class DcSetup
+include Mongoid::Document
+include Mongoid::Timestamps
+
+attr_reader :my_data
+attr_reader :my_fields
+
+field :name,      type: String, default: ''
+field :data,      type: String, default: ''
+field :form,      type: String, default: ''
+field :editors,   type: Array,  default: []
+
+field :created_by,  type: BSON::ObjectId
+field :updated_by,  type: BSON::ObjectId
+
+index name: 1
+
+validates_length_of :name, minimum: 3
+
+before_save do
+  self.data = my_data.to_yaml
+end
+
+##############################################################################
+# Will return settings record for specified application.
+#
+# @param [String] app_name The name of the application
+# @return [Object, nil] The settings record if found, nil otherwise
+##############################################################################
+def self.get(app_name)
+  DcSetup.find_by(name: app_name.to_s)
+end
+
+##############################################################################
+# Will return value for single setting if called as method.
+##############################################################################
+def method_missing(m, *args, &block)
+  m = m.to_s
+  if m.match('=')
+    m.chomp!('=')
+    my_data[m] = args.first
+  else
+    my_data[m]
+  end
+end
+
+##############################################################################
+# Will return value for single setting. Called as parameter in square brackets.
+# If more then one parameter is passed it will return them as array.
+##############################################################################
+def [](*keys)
+  return my_data[keys.first.to_s] if keys.size == 1
+
+  keys.inject([]) { |r, k| r << my_data[k.to_s] }
+end
+
+##############################################################################
+# Will return true if setting is defined on the form
+##############################################################################
+def respond_to?(field_name)
+  return true #if my_fields[field_name.to_s]
+
+  super.respond_to?(field_name)
+end
+
+##############################################################################
+#
+##############################################################################
+def my_data
+  @my_data ||= (YAML.unsafe_load(data)) || {}
+end
+
+end

data/app/models/drgcms_form_fields/datetime_picker.rb

@@ -81,7 +81,7 @@ end
 ###########################################################################
 def self.get_data(params, name)
   t = params['record'][name] ? params['record'][name].to_datetime : nil
-  t ? Time.zone.local(t.year, t.month, t.day, t.hour, t.min) : nil
+  t ? Time.new(t.year, t.month, t.day, t.hour, t.min) : nil
 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

data/app/models/drgcms_form_fields/embedded.rb

@@ -53,19 +53,26 @@ def render
   # HTML defaults. Some must be set    
   @yaml['html'] ||= {}
   @yaml['html']['width'] ||= '99%'
+  # message when new record
+  if @record.new_record?
+    @yaml['html']['srcdoc'] = %(
+<div style='font-family: helvetica; font-size: 1.7rem; font-weight: bold; color: #ddd; padding: 1rem'>
+  #{I18n.t('drgcms.iframe_save_to_view')}
+</div>)
+  end
   html = @yaml['html'].inject('') { |r, val| r << "#{val.first}=\"#{val.last}\" " }
 
   @yaml['action'] ||= 'index'
   # defaults both way 
-  @yaml['table']     ||= @yaml['form_name'] if @yaml['form_name']
-  @yaml['form_name'] ||= @yaml['table'] if @yaml['table']
+  @yaml['table']     ||= @yaml['form_name']
+  @yaml['form_name'] ||= @yaml['table']
 
-  if @yaml['name'] == @yaml['table'] or @yaml['table'] == 'dc_memory'
+  if @yaml['name'] == @yaml['table'] || @yaml['table'] == 'dc_memory'
     tables = @yaml['table']
     ids    = @record.id
   else
-    tables = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
-    ids    = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record.id
+    tables = (@parent.tables.map(&:first) + [@yaml['table']]).join(';')
+    ids    = (@parent.ids + [@record.id]).join(';')
   end
   # edit enabled embedded form on a readonly form
   readonly = @yaml['readonly'].class == FalseClass ? nil : @readonly
@@ -73,20 +80,24 @@ def render
            ids: ids, table: tables, form_name: @yaml['form_name'], 
            field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: readonly }
   # additional parameters if specified
-  @yaml['params'].each { |k,v| opts[k] = @parent.dc_value_for_parameter(v) } if @yaml['params']         
-         
+  @yaml['params'].each { |k, v| opts[k] = @parent.dc_value_for_parameter(v) } if @yaml['params']
+
   @html << "<iframe class='iframe_embedded' id='if_#{@yaml['name']}' name='if_#{@yaml['name']}' #{html}></iframe>"
-  unless @record.new_record?
-    url  = @parent.url_for(opts)
-    data = if @yaml['load'].nil? || @yaml['load'].match('default')
-      "src"
-    else
-      "data-src-#{@yaml['load']}"
-    end
-    @js << %Q[
+  if @record.new_record?
+  else
+    url = @parent.url_for(opts)
+    attributes = case
+                 when @yaml['load'].nil? || @yaml['load'].match('default')
+                   "'src', '#{url}'"
+                 when @yaml['load'].match('delay')
+                   "'data-src-#{@yaml['load']}', '#{url}'"
+                 when @yaml['load'].match('always')
+                   "{'data-src-#{@yaml['load']}': '#{url}', src: '#{url}'}"
+                 end
+    @js << %(
 $(document).ready( function() {
-  $('#if_#{@yaml['name']}').attr('#{data}', '#{url}');
-});]
+  $('#if_#{@yaml['name']}').attr(#{attributes});
+});)
   end
   self
 end