drg_cms 0.6.1.9 → 0.7.0.2

data/lib/drg_cms/version.rb

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

data/lib/tasks/dc_cleanup.rake

@@ -36,30 +36,29 @@ namespace :drg_cms do
   task :clear_sessions, [:name] => :environment do |t, args|
     p 'This is just an example how to clear sessions collection. It wont do anything because of next line.'
     return if true
-# This should remove all sessions documents created by robots
-# It is quite a task to compare two dates in mongoid. This should not be problem if it is run daily
+    # This should remove all sessions documents created by robots
+    # It is quite a task to compare two dates in mongoid. This should not be problem if it is run daily
     ActionDispatch::Session::MongoidStore::Session.all.each do |doc|
-      doc.delete if (doc.created_at == doc.updated_at or doc.updated_at < 100.days.ago)
+      doc.delete if (doc.created_at == doc.updated_at || doc.updated_at < 100.days.ago)
     end
-# or if you want to clear everything older than 1 week    
+    # or if you want to clear everything older than 1 week
     ActionDispatch::Session::MongoidStore::Session.where(:updated_at.lt => 1.week.ago).delete
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'sessions' } )" )
+    DcSite.collection.database.command(compact: 'sessions')
   end
 
 ###########################################################################
   desc 'Clears mongodb session documents created by web robots'
   task :clear_sessions_from_robots, [:name] => :environment do |t, args|
-# This should remove all sessions documents created by web robots
-# ActionDispatch::Session::MongoidStore::Session.where('$where' => 'this.created_at == this.updated_at').limit(1000).each do |doc|
+    # This should remove all sessions documents created by web robots
     n = 0
     ActionDispatch::Session::MongoidStore::Session.batch_size(1000).all.each do |doc|
-      if (doc.created_at + 2 > doc.updated_at or doc.updated_at < 1.year.ago)
+      if (doc.created_at + 2 > doc.updated_at || doc.updated_at < 1.year.ago)
         doc.delete 
-        p "Deleted #{n}" if (n+=1)%1000 == 0
+        p "Deleted #{n}" if (n += 1) % 1000 == 0
       end
     end
     p "Deleted #{n}"
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'sessions' } )" )
+    DcSite.collection.database.command(compact: 'sessions')
   end
 
 ###########################################################################
@@ -72,16 +71,14 @@ namespace :drg_cms do
     return (p "#{archive_file} exists") if File.exist?(archive_file)
 
     date_to = Time.local(date[0,4].to_i, date[4,2].to_i, date[6,2].to_i).beginning_of_day
-    n = 0
-    save = ''
+    n, save = 0, ''
     DcVisit.where(:time.lt => date_to).each do |visit|
       save << visit.to_json + "\n"
-#      visit.delete
-      p "Deleted #{n}" if (n+=1)%10000 == 0
+      p "Deleted #{n}" if (n += 1) % 10000 == 0
     end
     DcVisit.where(:time.lt => date_to).delete
-    File.open(archive_file,'w') {|f| f.write(save)}
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'dc_visits' } )" )
+    File.write(archive_file, save)
+    DcSite.collection.database.command(compact: 'dc_visits')
   end
 
 ###########################################################################
@@ -90,39 +87,20 @@ namespace :drg_cms do
     input = read_input("Just press Enter to start. If you type in anything process won't start.")
     return unless input.to_s.size == 0
     today = Time.now.beginning_of_day
-    n = 0
-    save_stat, save_ads = '', ''
+    n, save_stat, save_ads = 0, '', ''
     DcAd.all.each do |ad|
-      if !ad.active or (ad.valid_to and ad.valid_to < today)
+      if !ad.active || (ad.valid_to && ad.valid_to < today)
         save_ads << ad.to_json + "\n"
         DcAdStat.where(:dc_ad_id => ad._id).each do |stat|
           save_stat << stat.to_json + "\n"
-          p "Deleted #{n}" if (n+=1)%10000 == 0
+          p "Deleted #{n}" if (n += 1) % 10000 == 0
         end        
         DcAdStat.where(:dc_ad_id => ad._id).delete
       end
     end
-    File.open("ads_stat_#{Time.now.strftime('%Y%d%m')}.json",'w') {|f| f.write(save_stat)}
-    File.open("ads_#{Time.now.strftime('%Y%d%m')}.json",'w') {|f| f.write(save_ads)}
-    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'dc_ad_stats' } )" )
+    File.write("ads_stat_#{Time.now.strftime('%Y%d%m')}.json", save_stat)
+    File.write("ads_#{Time.now.strftime('%Y%d%m')}.json", save_ads)
+    DcSite.collection.database.command(compact: 'dc_ad_stats')
   end
-  
-=begin  
-###########################################################################
-  desc "Correct error when ad_id ield is used instead of dc_ad_id."
-  task :repair_ad_stats, [:name] => :environment do |t, args|
-    input = read_input("Just press Enter to start. If you type in anything process won't start.")
-    return unless input.to_s.size == 0
-    n = 0
-    p DcAdStat.only(:id).where(:dc_ad_id => nil).to_a.size
-    DcAdStat.where(:dc_ad_id => nil).each do |stat|
-      stat.dc_ad_id = stat.ad_id
-      stat.ad_id = nil
-      stat.save
-      
-      p n if (n+=1)%1000 == 0
-    end
-  end
-=end
-  
+
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1.9
+  version: 0.7.0.2
 platform: ruby
 authors:
 - Damjan Rems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- History.log
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -217,6 +217,7 @@ files:
 - app/controllers/dc_main_controller.rb
 - app/controls/browse_models_control.rb
 - app/controls/cmsedit_control.rb
+- app/controls/dc_category_control.rb
 - app/controls/dc_help_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
@@ -232,6 +233,7 @@ files:
 - app/forms/dc_browse_fields.yml
 - app/forms/dc_browse_models.yml
 - app/forms/dc_category.yml
+- app/forms/dc_category_as_tree.yml
 - app/forms/dc_design.yml
 - app/forms/dc_filter.yml
 - app/forms/dc_folder_permission.yml
@@ -262,15 +264,19 @@ files:
 - app/forms/dc_simple_menu.yml
 - app/forms/dc_simple_menu_item.yml
 - app/forms/dc_site.yml
+- app/forms/dc_steps_template.yml
 - app/forms/dc_user.yml
 - app/forms/dc_user_role.yml
 - app/forms/drgcms_cms.yml
+- app/forms/help/dc_category_as_tree.en
+- app/forms/help/dc_category_as_tree.sl
 - app/forms/json_ld_schema.yml
 - 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/helpers/dc_category_helper.rb
 - app/models/concerns/dc_page_concern.rb
 - app/models/concerns/dc_piece_concern.rb
 - app/models/concerns/dc_policy_rule_concern.rb
@@ -449,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and

data/History.log

@@ -1,109 +0,0 @@
-
-New features for DRG CMS version up to 0.5.51.1
-    Rails version 5.1 compatibility
-    Ruby version 2.3 is now required
-    select field with multiple can now properly process non BSON array values
-    DRG CMS Form readonly field with readonly : yes option will not be saved to database on save
-    dc_dummy collection will be deprecated and replaced with dc_memory collection. Name was chosen unfortunately  
-    DrgForms can now be used for editing YAML settings saved in dc_page document. This enables editing dynamic settings of elements embedded in design
-    cms_edit url can now be used only as cms 
-
-Bugs resolved for DRG CMS version up to 0.5.51.1
-    journal is now able to undelete deleted document
-
-New features for DRG CMS version up to 0.5.50.4
-    Rails 5.0 compatibility
-    category types can now be defined in dc_big_table under dc_category_type key
-    DrgCms gem routes can now be defined as DrgCms.routes
-    new field tree_select added to DRG CMS Forms. Tree select will be used as data entry field for categories instead of select field with multiple option
-    switch to Rails concern for main model definitions which may be reused.
-    site policy can be inherited from other site
-    menus can now belong to site
-    clear_link method is now a class method of DcPage model and can thus be called directly from other parts of application
-
-Bugs resolved for DRG CMS version up to 0.5.50.4
-    journal is now able to undelete deleted document
-
-
-New features for DRG CMS version 0.5.10.14
-    table_style added to result_set DRGCMS Forms option. This allows CSS style like width: 150% which will result in horizontal scroler on table and view more columns on result set.
-    result_set filter now has is empty option allowing to filter fields with null value.
-    filter OFF icon now displays currently active filter when hovered.
-    request_process field added to dc_site collection. It allowis for site to have different requests processing as defined in rails routes file. Single rails instance can now mix single document sites with complex sites.
-    multiple option is added to DRGCMS Forms select_field. 
-    is_email? class method added to dc_user model.
-    form generator has now list of all model fields added at the end of generated form. Field names can be used as template in YAML translation file.
-    dc_choices4_field method implemented. It returns choices that are defined in localization files.
-    categories field changed from multitext_autocomplete to select field with multiple options.
-    a poll form can now be surrounded by div tag thus allowing for additional styling of polls
-    drgcms_controlls files can now also be defined only as control files.
-    journal documents can now be filtered by document id
-    CMS menu redesigned. Instead of pulldown menus are now displayed fixed on the left side of edit area
-
-Bugs resolved for DRG CMS version 0.5.10.14
-    prevent double form submit when browser is restarted.
-    when user has no role defined guest role is automatically applied
-    dc_cleanup rake task deletes 1000 session documents created by robots at once instead of all which ended in error if number of documents was higher then 100.000
-
-
-New features for DRG CMS version 0.5.10
-
-    jQuery javascript library forced to jQuery2
-    Choices for select fields are now UTF-8 sorted since MongoDB does not provide utf sorting.
-    Placeholder text added for text_autocomplete field. It can also be defined in form field html options.
-    Filters option can now have "like" keyword for fields that are not defined on form. For example created_by like user_id.
-    
-Bugs resolved for DRG CMS version 0.5.10
-
-    jQuery migrate udated to version 1.3. This was required by jquery-rails gem which included latest version of jQuery which resulted in an runtime error.
-    Call before_new callback only when new empty record has been created.
-
---
-
-New features for DRG CMS version 0.5.9
-
-    Main CMS menu was becoming to large and was divided into two menus.
-    Result set browse filter data entry redesigned. Values can now be entered directly on actions area. Value of entered fied is also retained beetwen calls. 
-    New DcInternals model introduced. It will be used for accessing internal variables.
-    DRG Forms has new option columns. Option defines number of columns per tab or fields. Field option also got colspan option indicating over how many columns field spans.
-    DRG Forms field size can now also be defined on same level as field type. Before it was defined in html sublevel.
-    
-Bugs resolved for DRG CMS version 0.5.9
-
-    Improved readonly display of select and text_autocomplete DRG Forms fields.
-    Text_autocomplete field is set to nil when content of field is deleted.
-
---
-
-New features for DRG CMS version 0.5.8
-
-    Browsing array of hashes is now possible with DRG Forms
-    Simple browsing of all defined models and field definitions added to CMS System menu
-    new result_set options table_style, table_class, tr_style, tr_class, td_style, td_class. Welcome colors to result_set browser
-    result_set has been renewed for more modern design. Header elements have now sorting icons
-    dblclick and click actions can now be defined on result set and can fire any action when clicked or double clicked on result set row.
-
-Bugs resolved for DRG CMS version 0.5.8
-
-    associated menu can now be selected on dc_page form also for non dc_simple_menu menus
-
---
-
-New features for DRG CMS version 0.5.7
-
-    single site document. All data for the site can be saved to single dc_site document and processed by dc_single_sitedoc_request
-    site parts can now also be saved and collected from dc_site document
-    CMS menu done right
-    Page title is now set from dc_page_renderer default method
-
-Bugs resolved for DRG CMS version 0.5.7
-
-    Corrected bug when multitext_autocomplete field was not displaying right values when displayed readonly
-
-    dc_choices4 now checks if model has active field defined and returns only choices of documents that have active field value set to true
-
-    Design and page edit icons are now displayed only when design or page documents are available
-
-    return_to from drgcms_control was not properly handled
-
-    Mouse cursor now changes to pointer when moved over ajax link