drg_cms 0.6.1.1.1 → 0.6.1.4

data/app/models/drgcms_form_fields/embedded.rb

@@ -67,9 +67,11 @@ def render
     tables = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
     ids    = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record.id
   end
-  opts = { controller: 'cmsedit', action: @yaml['action'], 
+  # edit enabled embedded form on a readonly form
+  readonly = @yaml['readonly'].class == FalseClass ? nil : @readonly
+  opts = { controller: 'cmsedit', action: @yaml['action'],
            ids: ids, table: tables, form_name: @yaml['form_name'], 
-           field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: @readonly }
+           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']         
          

data/app/models/drgcms_form_fields/number_field.rb

@@ -69,14 +69,14 @@ def render
   @yaml['html']['data-delimiter'] = @yaml.dig('format','delimiter') || I18n.t('number.currency.format.delimiter')
   @yaml['html']['data-separator'] = @yaml.dig('format','separator') || I18n.t('number.currency.format.separator')
  # @yaml['html']['data-currency']  = @yaml.dig('format','currency') == 'yes' ? I18n.t('number.currency.format.currency') : @yaml.dig('format','currency')
-  value = @record[@yaml['name']] || 0 
+  value = @yaml['html']['value'] || @record[@yaml['name']] || 0
   @yaml['html']['value'] = @parent.dc_format_number(value, @yaml['html']['data-decimal'], @yaml['html']['data-separator'], @yaml['html']['data-delimiter'] )
   
   return ro_standard(@yaml['html']['value']) if @readonly
 
   @yaml['html']['autocomplete'] ||= 'off'
   @html << @parent.hidden_field( record, @yaml['name'], value: value )
-  @html << @parent.text_field( nil,"record_#{@yaml['name']}_", @yaml['html']) 
+  @html << @parent.text_field( nil, "record_#{@yaml['name']}_", @yaml['html'])
   self
 end
 
@@ -85,7 +85,8 @@ end
 ###########################################################################
 def self.get_data(params, name)
   return 0 if params['record'][name].blank?
-  params['record'][name].match('.') ? params['record'][name].to_f : Integer.new(params['record'][name])
+
+  params['record'][name].match('.') ? params['record'][name].to_f : params['record'][name].to_i
 end
 
 end

data/app/models/drgcms_form_fields/readonly.rb

@@ -51,29 +51,25 @@ class Readonly < DrgcmsField
 ###########################################################################
 # Render readonly field html code
 ###########################################################################
-def render 
+def render
   @html << @parent.hidden_field('record', @yaml['name']) # retain field as hidden field
   @html << '<div class="dc-readonly">'
-  
+
   @html << if @yaml['eval']
-    if @yaml['eval'].match('dc_name4_id')
-      a = @yaml['eval'].split(',')
-      if a.size == 3
-        @parent.dc_name4_id(a[1], a[2], nil, @record[ @yaml['name'] ])
-      else
-        @parent.dc_name4_id(a[1], a[2], a[3], @record[ @yaml['name'] ])
-      end
-      
-#      @parent.dc_name4_id(a[1], a[2], @record[ @yaml['name'] ])
-    else
-      eval( "#{@yaml['eval']} '#{@record.send(@yaml['name'])}'") 
-    end
-  else
-    @parent.dc_format_value(@record.send(@yaml['name']),@yaml['format'])    
-  end  
+             if @yaml['eval'].match(/dc_name4_id|dc_name_for_id/)
+               parms = @parent.dc_eval_to_array(@yaml['eval'])
+               parms << nil if parms.size == 3
+               @parent.dc_name_for_id(parms[1], parms[2], parms[3], @record[@yaml['name']])
+             else
+               eval( "#{@yaml['eval']} '#{@record.send(@yaml['name'])}'")
+             end
+           else
+             @parent.dc_format_value(@record.send(@yaml['name']), @yaml['format'])
+           end
   @html << '</div>'
   self
 end
+
 end
 
 end

data/app/models/drgcms_form_fields/select.rb

@@ -96,7 +96,7 @@ def choices_in_eval(e)
   if @yaml['depend'].nil?
     method = e.split(/\ |\(/).first
     return eval(e) if respond_to?(method) # id method defined here
-    return eval('@parent.'+e) if @parent.respond_to?(method) # is method defined in helpers
+    return eval('@parent.' + e) if @parent.respond_to?(method) # is method defined in helpers
     # eval whatever it is there
     eval e
   else
@@ -120,19 +120,18 @@ end
 ###########################################################################
 def get_choices
   begin
-    choices = case 
-              when @yaml['choices'] then
-                @yaml['choices'].match('helpers.') ? choices_in_helper(@yaml['choices']) : @yaml['choices']
+    choices = case
               when @yaml['eval'] then
                 choices_in_eval(@yaml['eval'])
+              when @yaml['choices'] then
+                @yaml['choices'].match('helpers.') ? choices_in_helper(@yaml['choices']) : @yaml['choices']
               else
                 choices_in_helper()
               end
-  # Convert string to Array
-    choices.class == String ?
-      choices.chomp.split(',').inject([]) { |r,v| r << (v.match(':') ? v.split(':') : v ) } :
-      choices
-  rescue Exception => e 
+    return choices unless choices.class == String
+
+    choices.chomp.split(',').map { |e| e.match(':') ? e.split(':') : e }
+  rescue Exception => e
     Rails.logger.debug "\nError in select eval. #{e.message}\n"
     Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     ['error'] # return empty array when error occures

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -76,21 +76,27 @@ def render
   end
   return ro_standard 'Table or field keyword not defined!' unless (table && ret_name)
   # TODO check if table exists
-  t = table.classify.constantize
+  model_klass = table.classify.constantize
   # find record and return value of field
   value_send_as = 'p_' + @yaml['name']
   value = if @parent.params[value_send_as]
-    @parent.params[value_send_as]
-  elsif @record and @record[@yaml['name']]
-    @record[@yaml['name']]
-  end
+            @parent.params[value_send_as]
+          elsif @record && @record[@yaml['name']]
+            @record[@yaml['name']]
+          end
+  not_id = @parent.dc_dont?(@yaml['is_id'], false)
   # Found value to be written in field. If field is not found write out value.
-  if value
-    record = t.find(value) unless @yaml['not_id'] # don't if it's is not an id
-    value_displayed = record ? record.send(ret_name) : value
+  value_displayed = value
+  if value && !not_id
+    if BSON::ObjectId.legal?(value)
+      record = model_klass.find(value)
+      value_displayed = record.send(ret_name) if record
+    else
+      value_displayed = model_klass.send(ret_name, method, @parent, value)
+    end
   end
-  # return if readonly
   return ro_standard(value_displayed) if @readonly
+
   # Add method back, so autocomplete will know that it must search for method inside class
   ret_name = "#{ret_name}.#{method}" if method
   @yaml['html'] ||= {}
@@ -108,7 +114,6 @@ def render
   @html << '</span>' + @parent.hidden_field(record, @yaml['name'], value: value)        # actual value will be in hidden field
   # JS stuff
   # allow unselected values on is_id: false option
-  not_id = @parent.dc_dont?(@yaml['is_id'], false)
   not_id_code = %(
 if (ui.item == null) {  
 $("##{record}_#{@yaml['name']}").val($("##{record}__#{@yaml['name']}").val() );
@@ -120,7 +125,7 @@ $(document).ready(function() {
   $("##{record}_#{_name}").autocomplete( {
     source: function(request, response) {
       $.ajax({
-        url: '/dc_common/autocomplete',
+        url: "/dc_common/autocomplete",
         type: "POST",
         dataType: "json",
         data: { input: request.term, table: "#{table}", search: "#{ret_name}" #{(',id: "'+@yaml['id'] + '"') if @yaml['id']} },
@@ -154,4 +159,5 @@ def self.get_data(params, name)
 end
 
 end
+
 end

data/app/renderers/dc_page_renderer.rb

@@ -72,6 +72,7 @@ end
 #########################################################################
 def iframe
   return '' if @page.if_url.blank?
+
   html =  "\n<iframe"
   html << " id=\"#{@page.if_id}\"" unless @page.if_id.blank?
   html << " class=\"#{@page.if_class}\"" unless @page.if_class.blank?
@@ -79,7 +80,7 @@ def iframe
   html << " height=\"#{@page.if_height}\"" unless @page.if_height.blank?
   html << " width=\"#{@page.if_width}\"" unless @page.if_width.blank?
   html << " scrolling=\"#{@page.if_scroll}\""
-# Parameters
+  # Parameters
   parameters = @page.if_url.match(/\?/) ? '' : '?' 
   params = YAML.load(@page.if_params) rescue {}
   params = {} unless params.class == Hash
@@ -98,20 +99,20 @@ end
 def default
   can_view, msg = dc_user_can_view(@parent, @page)
   return msg unless can_view
-# 
-  html = ''
+
+  html = "<div class=\"#{@page.div_class} #{@opts[:div_class]}\">"
   html << dc_page_edit_menu() if @opts[:edit_mode] > 1
   @parent.page_title = @page.title.blank? ? @page.subject : @page.title
   html << @page.body
-# render poll if defined
+  # render poll if defined
   if @page.dc_poll_id
     @opts.merge!(:poll_id => @page.dc_poll_id, :return_to => @parent.request.url, method: nil)
     comment = DcPollRenderer.new(@parent, @opts)
     html << "<div class='wrap row'>#{comment.render_html}</div>"
     @css << "\n#{comment.render_css}"
   end
-# also add iframe
-  html << iframe()
+  # also add iframe
+  html << iframe() << '</div>'
 end
 
 #########################################################################

data/app/views/cmsedit/_edit_stuff.html.erb

@@ -38,11 +38,14 @@
 
       </div>
     </div>
-    
-    <div class="cmsedit-container">  
+
+    <div id="menu-hamburger"><%= fa_icon('bars') %></div>
+
+    <div class="cmsedit-container">
       <div id="menu">
         <%= dc_choices4_cmsmenu.html_safe %>
       </div>
+
       <div class="cmsedit-iframe" style="width: 99%;">
         <iframe id="iframe_cms" name="iframe_cms"></iframe>
       </div>

data/app/views/cmsedit/edit.html.erb

@@ -1,7 +1,8 @@
 <%= dc_head_for_form %>
 <%= dc_table_title dc_edit_title() %>
 
-<%= form_tag( @parms, method: :put, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
+<%= form_tag( @parms, method: :put, id: params['form_name'] || params['table'],
+              class: 'cmsform', multipart: @form['form']['multipart'] ) do %>
   <%= render partial: 'form' %>
 <% end %>
 

data/app/views/cmsedit/index.html.erb

@@ -1,4 +1,4 @@
-<div class="dc-form-frame">
+<div id="<%= params['form_name'] || params['table'] %>" class="dc-form-frame">
   <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>

data/app/views/cmsedit/new.html.erb

@@ -1,6 +1,7 @@
-<%= dc_table_title dc_new_title() %>
+<%= dc_table_title dc_new_title %>
 
-<%= form_tag( @parms, method: :post, id: 'cmsform', multipart: @form['form']['multipart'] ) do %>
+<%= form_tag(@parms, method: :post, id: params['form_name'] || params['table'],
+             class: 'cmsform', multipart: @form['form']['multipart']) do %>
   <%= render partial: 'form' %>
 <% end %>
 

data/config/locales/models_en.yml

@@ -302,6 +302,7 @@ en:
         if_id: CSS id
         if_class: CSS class 
         _update_menu: Update menu
+        div_class: DIV class
 
       dc_seo:
         seo: SEO
@@ -780,6 +781,7 @@ en:
         if_id: CSS id of IFrame object
         if_class: CSS class of IFrame object
         _update_menu: Update link in selected menu to point to this document
+        div_class: Class name given to top level div
 
       dc_seo:
         title: SEO optimised page title

data/config/locales/models_sl.yml

@@ -333,7 +333,8 @@ sl:
         if_id: CSS id
         if_class: CSS class 
         _update_menu: Spremeni meni
-        
+        div_class: DIV class
+
       dc_seo:
         seo: SEO
         title: Naslov za brskalnik
@@ -779,7 +780,6 @@ sl:
         subject_link: Povezava (link) do sestavka
         sub_subject: Povzetek, kratek opis vsebine
         alt_link: Alternativna povezava do sestavka
-        picture: Slika v povezavi s stranjo
         gallery: Dokument vsebuje slikovno galerijo.
         css: CSS
         script: Skript
@@ -800,7 +800,7 @@ sl:
         dc_design_id: Dizajn, mu pripada sestavek
         dc_site_id: Spletišče. ki mu pripada stran
         kats: Kategorije, ki jim pripada članek
-        picture: Slika uporabljena za prikaz sestavka
+        picture: Slika uporabljena v zvezi s sestavkom
         dc_poll_id: Anketa, če sestavek vsebuje tudi anketo
         if_url: URL naslov od koder bo naložena vsebina IFrame-a
         if_width:  Širina IFrame področja
@@ -811,6 +811,7 @@ sl:
         if_id: CSS id IFrame objekta
         if_class: CSS class IFrame objekta
         _update_menu: Popravi tudi povezavo do dokumenta v menuju
+        div_class: Class, ki bo določen na vrhnem razdelku (DIV)
         
       dc_seo:
         title: Naslov, ki se izpiše v gornji vrstici brskalnika. Optimiziraj za SEO.

data/drg_cms.gemspec

@@ -1,26 +1,26 @@
-# Copyright 2012-2016 Damjan Rems
+# Copyright 2012-2021 Damjan Rems
 
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
-# Maintain your gem's version:
-require "drg_cms/version"
+# Maintain gem's version:
+require 'drg_cms/version'
 
-# Describe your gem and declare its dependencies:
+# Describe gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "drg_cms"
+  s.name        = 'drg_cms'
   s.version     = DrgCms::VERSION
-  s.authors     = ["Damjan Rems"]
-  s.email       = ["damjan.rems@gmail.com"]
-  s.homepage    = "http://www.drgcms.org"
-  s.summary     = "DRG: Rapid web application development tool and CMS for Ruby, Rails and MongoDB"
-  s.description = "DRG, development tool for rapid building of in-house (Intranet, private cloud) applications as well as CMS for creating complex, data-entry intensive web sites."
-  s.license     = "MIT"
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "History.log", "drg_cms.gemspec"]
-  s.test_files = Dir["test/**/*"]
+  s.authors     = ['Damjan Rems']
+  s.email       = ['damjan.rems@gmail.com']
+  s.homepage    = 'https://www.drgcms.org'
+  s.summary     = 'DRG: Rapid web application development tool and CMS for Ruby, Rails and MongoDB'
+  s.description = 'DRG, development tool for rapid building of in-house (Intranet, private cloud) applications as well as CMS for creating complex, data-entry intensive web sites.'
+  s.license     = 'MIT'
+  s.files       = Dir['{app,config,db,lib}/**/*'] + %w[MIT-LICENSE Rakefile README.md History.log drg_cms.gemspec]
+  s.test_files  = Dir['test/**/*']
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'rails', '~> 6'
+  s.add_dependency 'rails', '~> 6.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'non-stupid-digest-assets'  

data/lib/drg_cms/version.rb

@@ -23,5 +23,5 @@
 
 # drg_cms gem version
 module DrgCms #:nodoc:
-  VERSION = '0.6.1.1.1'.freeze
+  VERSION = '0.6.1.4'.freeze
 end

data/lib/drg_cms.rb

@@ -154,6 +154,15 @@ def self.model_check(document, crash = false)
   msg
 end
 
+########################################################################
+# Determines if redis cache store is active
+#
+# @return [Boolean] : True if  redis cache store is active
+########################################################################
+def self.redis_cache_store?
+  (Rails.application.config.cache_store.first == :redis_cache_store) rescue false
+end
+
 ####################################################################
 # Clear cache. If key is specified only this key will be deleted.
 #
@@ -162,17 +171,48 @@ end
 def self.cache_clear(key = nil)
   return Rails.cache.clear if key.nil?
 
-  if ((Rails.application.config.cache_store.first == :redis_cache_store) rescue false)
+  if redis_cache_store?
     Rails.cache.redis.del(key)
   else
     Rails.cache.delete_matched("#{key}*")
   end
 end
 
-def self.__cache_clear(key = nil)
-  return Rails.cache.clear if key.nil?
+####################################################################
+# Read from cache
+#
+# @keys [Array] Array of keys
+#
+# @return [Object] Data returned from cache
+####################################################################
+def self.cache_read(keys)
+  if redis_cache_store?
+    keys  = keys.dup
+    first = keys.shift
+    data  = Rails.cache.redis.hget(first, keys.join(''))
+    data ? Marshal.load(data) : nil
+  else
+    Rails.cache.read(keys.join(''))
+  end
+end
 
-  Rails.cache.delete_matched("#{key}*")
+####################################################################
+# Write data to cache
+#
+# @param [Array] keys : array of keys
+# @param [Object] data : Document object
+#
+# @return [Object] data so dc_cache_write can be used as last statement in method.
+####################################################################
+def self.cache_write(keys, data)
+  if redis_cache_store?
+    keys  = keys.dup
+    first = keys.shift
+    Rails.cache.redis.hset(first, keys.join(''), Marshal.dump(data))
+  else
+    Rails.cache.write(keys.join(''), data)
+  end
+  data
 end
 
 ###############################################################################

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.1.1
+  version: 0.6.1.4
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-11 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -425,7 +425,7 @@ files:
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
 - test/lib/generators/new_drg_form_generator_test.rb
-homepage: http://www.drgcms.org
+homepage: https://www.drgcms.org
 licenses:
 - MIT
 metadata: {}
@@ -437,47 +437,47 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and
   MongoDB'
 test_files:
 - test/drg_cms_test.rb
-- test/integration/navigation_test.rb
-- test/lib/generators/new_drg_form_generator_test.rb
-- test/dummy/script/rails
 - test/dummy/README.rdoc
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/public/422.html
-- test/dummy/public/404.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/500.html
 - test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/config/environment.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/routes.rb
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
+- test/dummy/config/boot.rb
 - test/dummy/config/database.yml
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
+- test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/config.ru
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/script/rails
+- test/integration/navigation_test.rb
+- test/lib/generators/new_drg_form_generator_test.rb