drg_cms 0.6.1.0 → 0.6.1.6

data/config/locales/drgcms_en.yml

@@ -60,9 +60,10 @@ en:
     login: Login into CMS
     username: User name
     password: Password
-    form_error: Error loading form #{form_name}
+    form_error: Error loading form %{form_name}
     img_large: Click for larger image
-    no_class: Class %{class} not defined!
+    no_class: Class [%{class}] not defined!
+    no_method: Method (helper) [%{method}] not defined!
     img_alt_not_present: All images in body must have alternative text entered
     
     toggle_cms: Toggle CMS edit/view mode
@@ -120,6 +121,8 @@ en:
 
     dc_help:
       help: HELP
+      fields_button: Data description
+      comments_button: Comments
       title: Manage help documents
       project: Project
       lang: Locale

data/config/locales/drgcms_sl.yml

@@ -60,9 +60,10 @@ sl:
     login: Prijava v CMS
     username: Uporabnik
     password: Geslo
-    form_error: Napaka pri branju forme #{form_name}
+    form_error: Napaka pri branju forme %{form_name}
     img_large: Klik za večjo sliko
-    no_class: Class %{class} ni definiran!
+    no_class: Razred (class) [%{class}] ni definiran!
+    no_method: Metoda (helper) [%{method}] ne obstaja!
     img_alt_not_present: Vse slike v vsebini morajo imeti vpisano nadomestno besedilo    
 
     toggle_cms: Preklopi med CMS urejanjem in prikazom
@@ -117,6 +118,8 @@ sl:
 
     dc_help:
       help: POMOČ
+      fields_button: Opis podatkov
+      comments_button: Opombe
       title: Urejanje dokumentov pomoči
       project: Projekt
       lang: Jezik

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.
@@ -983,3 +984,4 @@ sl:
         active: Podatki so aktivni
         add_schema: Dodaj strukturo
         add_error: Element %{schema} že obstaja!
+

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.0'.freeze
+  VERSION = '0.6.1.6'.freeze
 end

data/lib/drg_cms.rb

@@ -140,12 +140,8 @@ 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 = document.errors.inject('') { |r, error| r << "#{error.attribute}: #{error.message}\n" }
+  if crash && msg.size > 0
     msg = "Validation errors in #{document.class}:\n" + msg
     pp msg
     Rails.logger.error(msg)
@@ -154,6 +150,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 +167,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
 
 ###############################################################################
@@ -205,5 +241,3 @@ def self.routes
 end
 
 end
-
-DrgCms.add_patches_path(File.dirname(__FILE__) + '../app/models/drgcms_form_fields/patches')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.0
+  version: 0.6.1.6
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2022-01-24 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
@@ -163,6 +163,12 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/fonts/ibm-plex-sans-300.woff2
+- app/assets/fonts/ibm-plex-sans-400.woff2
+- app/assets/fonts/ibm-plex-sans-500.woff2
+- app/assets/fonts/ibm-plex-sans-600.woff2
+- app/assets/fonts/ibm-plex-sans-700.woff2
+- app/assets/fonts/ibm-plex-sans-italic.woff2
 - app/assets/images/32px.png
 - app/assets/images/drg_cms/32px.png
 - app/assets/images/drg_cms/40px.png
@@ -425,7 +431,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 +443,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