drg_cms 0.6.0.6 → 0.6.1.4

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.0.6'
+  VERSION = '0.6.1.4'.freeze
 end

data/lib/drg_cms.rb

@@ -118,6 +118,103 @@ def self.from_root(file=nil)
   File.expand_path("../../#{file}", __FILE__).to_s
 end
 
+####################################################################
+# Checks if any errors exist on document and writes error log. It can also
+# crash if requested. This is mostly usefull in development for debuging
+# model errors or when updating multiple collections and each save must be
+# checked if succesfull.
+#
+# @param [Document] Document object which will be checked
+# @param [Boolean] If true method should end in runtime error. Default = false.
+#
+# @return [String] Error messages or empty string if everything is OK.
+#
+# @Example Check for error when data is saved.
+#   model.save
+#   if (msg = DrgCms.model_check(model) ).size > 0
+#     p msg
+#     error process ......
+#   end
+#
+####################################################################
+def self.model_check(document, crash = false)
+  return nil unless document.errors.any?
+
+  msg = ""
+  document.errors.each do |attribute, errors_array|
+    msg << "#{attribute}: #{errors_array}\n"
+  end
+  #
+  if crash and msg.size > 0
+    msg = "Validation errors in #{document.class}:\n" + msg
+    pp msg
+    Rails.logger.error(msg)
+    raise "Validation error. See log for more information."
+  end
+  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.
+#
+# @param [String] Optional key to be deleted
+####################################################################
+def self.cache_clear(key = nil)
+  return Rails.cache.clear if key.nil?
+
+  if redis_cache_store?
+    Rails.cache.redis.del(key)
+  else
+    Rails.cache.delete_matched("#{key}*")
+  end
+end
+
+####################################################################
+# 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
+
+####################################################################
+# 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
+
 ###############################################################################
 # All Routes required by DrgCms. 
 # 
@@ -138,6 +235,7 @@ def self.routes
       match 'dc_common/paste_clipboard' => :paste_clipboard, via: [:get, :post]
       put 'dc_common/restore_from_journal'  => :restore_from_journal
       get 'dc_common/add_json_ld_schema'    => :add_json_ld_schema
+      get 'dc_common/help' => :help
     end
     match 'elfinder' => 'dc_elfinder#connector', via: [:get, :post]
     match 'cmsedit/run' => 'cmsedit#run', via: [:get, :put, :post]

data/lib/generators/new_drg_form/new_drg_form_generator.rb

@@ -14,11 +14,13 @@ def create_form_file
   form_name = file_name #if formname.size == 0
   begin
     @model = file_name.classify.constantize
-  rescue e
-    logger.error ([e.message]+e.backtrace).join($/)
+  rescue Exception => e
+    msg = ([e.message]+e.backtrace).join($/)
+    Rails.logger.error(msg)
+    pp msg
     @model = nil
   end
-  return (p "Error loading #{file_name.classify} model! Aborting.") if @model.nil?
+  return (pp "Error loading #{file_name.classify} model! Aborting.") if @model.nil?
 #  
   yml = top_level_options + index_options + result_set_options + form_top_options + form_fields_options + localize_options
   create_file "app/forms/#{form_name}.yml", yml

data/lib/tasks/database.rake

@@ -6,61 +6,9 @@
 #########################################################################
 def determine_model(path)
   path =~ /(.*)\/(.*).rb/
-  begin
-    $2.camelize.constantize 
-  rescue Exception # it happends
-    nil
-  end
+  $2.camelize.constantize rescue nil # nil happens
 end
 
-#########################################################################
-# Create index for single module
-#########################################################################
-def create_index(model)
-  return if model.index_specifications.empty?
-#
-  if !model.embedded? || model.cyclic?
-    @logger.info("DRGCMS: Creating indexes on #{model}:")
-    model.create_indexes
-    model.index_specifications.each do |spec|
-      @logger.info("DRGCMS: Index: #{spec.key}, Options: #{spec.options}")
-    end
-    model
-  else
-    @logger.info("DRGCMS: Index ignored on: #{model}, please define in the root model.")
-    nil
-  end
-end
-
-#########################################################################
-# Will remove all undefined indexes from collection.
-#########################################################################
-def remove_undefined_indexes(model)
-  return if model.embedded?
-#  
-  begin
-    undefined = []
-    model.collection.indexes.each do |index|
-      # ignore default index
-      next if index['name'] == '_id_'
-      
-      key = index['key'].symbolize_keys
-      spec = model.index_specification(key)
-      undefined << index unless spec
-    end
-  rescue Mongo::Error::OperationFailure; end
-#  
-  undefined.each do |index|
-    key = index['key'].symbolize_keys
-    collection = model.collection
-    collection.indexes.drop(key)
-    @logger.info(
-        "MONGOID: Removed index '#{index['name']}' on collection " +
-        "'#{collection.name}' in database '#{collection.database.name}'."
-    )
-  end
-end  
-
 #########################################################################
 # Return array of all models found in application.
 #########################################################################
@@ -70,7 +18,7 @@ def all_models()
     models_dir = File.expand_path("../models", path)
     Dir["#{models_dir}/*.rb"].each do |model_file| 
       model = determine_model(model_file)
-      models << model if !model.nil? and model.respond_to?(:index_specifications)
+      models << model if model and model.respond_to?(:index_specifications)
     end
   end
   models
@@ -82,12 +30,14 @@ end
 namespace :drg_cms do
   desc "Create indexes for all mongoid models. Including those in gem plugins."
   task :create_indexes => :environment do
-    all_models.each {|model| create_index(model)}
+    @logger.info( "MONGOID: Checking indexes.")
+    Mongoid::Tasks::Database.create_indexes(all_models)
   end
 
   desc "Remove undefined indexes for all mongoid models. Including those in gem plugins."
   task :remove_undefined_indexes => :environment do
-    all_models.each {|model| remove_undefined_indexes(model)}
+    @logger.info( "MONGOID: Remove undefined indexes.")
+    Mongoid::Tasks::Database.remove_undefined_indexes(all_models)
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.0.6
+  version: 0.6.1.4
 platform: ruby
 authors:
 - Damjan Rems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-13 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
@@ -210,8 +210,10 @@ files:
 - app/controllers/dc_common_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controls/browse_models_control.rb
+- app/controls/dc_help_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
+- app/controls/dc_report.rb
 - app/controls/design_element_settings_control.rb
 - app/forms/all_options.yml
 - app/forms/cms_forms.yml
@@ -227,6 +229,7 @@ files:
 - app/forms/dc_filter.yml
 - app/forms/dc_folder_permission.yml
 - app/forms/dc_gallery.yml
+- app/forms/dc_help_1.yml
 - app/forms/dc_ident.yml
 - app/forms/dc_journal.yml
 - app/forms/dc_json_ld.yml
@@ -256,12 +259,11 @@ files:
 - app/forms/dc_user_role.yml
 - app/forms/drgcms_cms.yml
 - app/forms/json_ld_schema.yml
-- app/helpers/application_helper.rb
-- app/helpers/cmsedit_edit_helper.rb
-- app/helpers/cmsedit_helper.rb
-- app/helpers/cmsedit_index_helper.rb
+- app/helpers/cms_common_helper.rb
+- app/helpers/cms_edit_helper.rb
+- app/helpers/cms_helper.rb
+- app/helpers/cms_index_helper.rb
 - app/helpers/dc_application_helper.rb
-- app/models/__dc_dummy.rb
 - app/models/concerns/dc_page_concern.rb
 - app/models/concerns/dc_piece_concern.rb
 - app/models/concerns/dc_policy_rule_concern.rb
@@ -325,6 +327,7 @@ files:
 - app/models/drgcms_form_fields/html_field.rb
 - app/models/drgcms_form_fields/journal_diff.rb
 - app/models/drgcms_form_fields/link_to.rb
+- app/models/drgcms_form_fields/method.rb
 - app/models/drgcms_form_fields/multitext_autocomplete.rb
 - app/models/drgcms_form_fields/number_field.rb
 - app/models/drgcms_form_fields/password_field.rb
@@ -359,6 +362,7 @@ files:
 - app/views/cmsedit/index.html.erb
 - app/views/cmsedit/login.html.erb
 - app/views/cmsedit/new.html.erb
+- app/views/dc_common/_help.html.erb
 - app/views/dc_common/_iframe_edit.html.erb
 - app/views/dc_common/paste_clipboard.html.erb
 - app/views/layouts/__cmsedit.html.erb
@@ -421,11 +425,11 @@ 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: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -433,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.0.3
-signing_key: 
+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/lib/generators/new_drg_form_generator_test.rb
 - test/drg_cms_test.rb
-- test/integration/navigation_test.rb
 - test/dummy/README.rdoc
-- test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/secret_token.rb
+- test/dummy/Rakefile
+- 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/environment.rb
+- test/dummy/config/environments/development.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/session_store.rb
 - test/dummy/config/initializers/mime_types.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/environment.rb
-- test/dummy/config/application.rb
-- test/dummy/config/database.yml
+- test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/public/favicon.ico
+- test/dummy/config.ru
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/Rakefile
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/config.ru
+- test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/integration/navigation_test.rb
+- test/lib/generators/new_drg_form_generator_test.rb

data/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/app/models/__dc_dummy.rb

@@ -1,102 +0,0 @@
-#--
-# Copyright (c) 2012+ 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_dummy : Collection name used when form does not belong to database model.
-#
-#  _id                  BSON::ObjectId       _id 
-# 
-# Which is not collection at all. DcDummy model is used for entering data on forms 
-# where data will not be saved to database but will instead be processed by custom 
-# made routine. For example entering begin and end date on report.
-# 
-# Example (as used in forms):
-# 
-#    table: dc_dummy
-#    title: Enter time period
-#
-#      form:
-#        actions:
-#          1:
-#            type: ajax
-#            method: post
-#            controller: reports
-#            action: do_some_report
-#            caption: Run report
-#
-#        fields:
-#          10:
-#            name: date_start
-#            type: date_picker
-#            caption: Start date
-#          20:
-#            name: date_end
-#            type: date_picker
-#            caption: End date
-#            
-# And suppose your report saved data to file named public/report.pdf. 
-# Put this line at the end of do_some_report method:
-# 
-#    render inline: { :window_report => '/report.pdf' }.to_json, formats: 'js'
-#    
-# As result report.pdf file will be opened in new browser window.
-########################################################################
-class DcDummy
-  include Mongoid::Document
-  
-########################################################################
-# Respond_to should always return true.
-########################################################################
-def respond_to?(m)
-  true
-end
-
-########################################################################
-# Redefine send method. Send is used to assign value by cmsedit controller.
-########################################################################
-def send(field,value=nil)
-  if field.to_s.match('=')
-    field.chomp!('=')
-    @internals ||= {}
-    @internals[field] = value
-  end
-end
-  
-########################################################################
-# Method missing will return value if value defined by m parameter is saved to
-# @internals array or will assign new value to @internals hash if m matches '='.
-########################################################################
-def method_missing(m, *args, &block) #:nodoc:
-  @internals ||= {}
-  m = m.to_s
-  if m.match('=')
-    m.chomp!('=')
-    @internals[m] = args.first
-  else
-    @internals[m]
-  end   
-end
-
-end