drg_cms 0.7.0.2 → 0.7.0.8

data/config/locales/models_sl.yml

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012-2013 Damjan Rems
+# 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
@@ -574,6 +574,36 @@ sl:
         active: Aktiven
         dc_json_lds: Podelement strukture
 
+      dc_image:
+        tabletitle: Organizator slik
+
+        upload_file: Naloži datoteko
+        name: Originalno ime
+        short: Kratek opis
+        text: Daljši opis
+        keep_original: Ohrani original
+        size_o: Prvotna dimenzija
+        size_l: Velika dimenzija
+        size_m: Srednja dimenzija
+        size_s: Mala dimenzija
+        size_ls: Velika dimenzija
+        size_ms: Srednja dimenzija
+        size_ss: Mala dimenzija
+        offset_lx: Zamik X
+        offset_ly: Zamik Y
+        offset_mx: Zamik X
+        offset_my: Zamik Y
+        offset_sx: Zamik X
+        offset_sy: Zamik Y
+        preview_s: Slika
+        preview_m: Slika
+        preview_l: Slika
+
+        categories: Kategorije
+        cats_input: Kategorije
+        categories_line: Kategorije
+        created_by: Naložil
+
 # help pomoč na obrazcih ####################################################
 
     help:
@@ -985,3 +1015,16 @@ sl:
         add_schema: Dodaj strukturo
         add_error: Element %{schema} že obstaja!
 
+      dc_image:
+        upload_file: Naloži datotekov obdelavo
+        name: Originalno ime datoteke
+        short: Kratek opis slike
+        text: Daljši opis slike
+        keep_original: Ohrani originalno sliko
+        size_o: Dimenzije originalne slike
+        size_l: Dimenzije velike slike
+        size_m: Dimenzije srednje velike slike
+        size_s: Dimenzije male slike
+        categories: Kategorije za poznejše lažje iskanje slike
+        created_by: Uporabnik, ki je naložil sliko
+        offset: Offset image before resizing. Offset origin is the top left corner.

data/drg_cms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails'#, '~> 6.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
-  s.add_dependency 'non-stupid-digest-assets'  
+  s.add_dependency 'non-digest-assets'
 
   s.add_dependency 'bcrypt' #, '~> 3.0.0'
   s.add_dependency 'mongoid'#, '~> 7'

data/lib/drg_cms/version.rb

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

data/lib/drg_cms.rb

@@ -29,7 +29,7 @@ end
 # When new plugin with its own DRG forms is added to application, path to
 # forms directory must be send to DrgCms module. Paths are saved into @@paths hash variable. 
 # 
-# Adding path is best done in plugin mudule initialization code.
+# Adding path is best done in plugin module initialization code.
 # 
 # Parameters:
 # [path] String. Path to forms directory
@@ -54,7 +54,7 @@ def self.add_forms_path(path)
 end
 
 ###############################################################################
-# Patching is one of the rubies best strenghts and also its curse. Loading 
+# Patching is one of the rubies best strengths and also its curse. Loading
 # patches in development has become real problem for developers. This is my
 # way of patch loading.
 # 
@@ -85,7 +85,7 @@ end
 # General add path method. Paths are saved into @@paths hash variable. Paths can
 # then be reused in different parts of application.
 # 
-# Adding paths is best done in plugin mudule initialization code.
+# Adding paths is best done in plugin module initialization code.
 # 
 # Parameters:
 # [type] Symbol. Defines type of data. Current used values are :forms, :patches
@@ -120,9 +120,9 @@ 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
+# crash if requested. This is mostly useful in development for debugging
 # model errors or when updating multiple collections and each save must be
-# checked if succesfull.
+# checked if successful.
 #
 # @param [Document] Document object which will be checked
 # @param [Boolean] If true method should end in runtime error. Default = false.
@@ -165,6 +165,7 @@ end
 # @param [String] Optional key to be deleted
 ####################################################################
 def self.cache_clear(key = nil)
+  return unless Rails.cache
   return Rails.cache.clear if key.nil?
 
   if redis_cache_store?
@@ -211,6 +212,19 @@ def self.cache_write(keys, data)
   data
 end
 
+####################################################################
+# Reads data from mongoid cache. Mongoid has it's own cache, which can be
+# used to cache results on single request.
+#
+# @param [model] class: Model name
+# @param [id] String || BSON::ObjectId : Id
+#
+# @return [Object] data document.
+####################################################################
+def self.cached(model, id)
+  Mongoid::QueryCache.cache { model.find(id) }
+end
+
 ###############################################################################
 # All Routes required by DrgCms. 
 # 

data/lib/generators/convert_to_ar/USAGE

@@ -0,0 +1,8 @@
+Description:
+    new_drg_form_generator will create DRG form from model description. 
+
+Example:
+    rails generate new_drg_form model_name
+
+    This will create:
+        forms/model_name.yml

data/lib/generators/convert_to_ar/convert_to_ar_generator.rb

@@ -0,0 +1,158 @@
+class ConvertToArGenerator < Rails::Generators::NamedBase
+  
+source_root File.expand_path('../templates', __FILE__)
+desc "This generator converts mongoid model to active_record migration"
+argument :model_name, :type => :string, :default => 'dc_*'
+argument :migration_name, :type => :string, :default => 'initial_migration'
+
+TYPES = {
+  String => :string,
+  Time => :datetime,
+  DateTime => :datetime,
+  Object => :integer,
+  Integer => :integer,
+  BSON::ObjectId => :integer,
+  Mongoid::Boolean => :boolean,
+  BigDecimal => [:decimal, :precision => 8, :scale => 2, :default => 0.00],
+  Date => :date,
+  Hash => :text,
+  Array => :text
+}
+
+###########################################################################
+#
+###########################################################################
+def create_migration
+  p model_name, migration_name
+
+  code = model_name.match(/\*/) ? migrate_many(model_name) : migrate_one(model_name)
+  code = top(migration_name) + code + bottom
+  create_file "db/#{source_file_name(migration_name).underscore}.rb", code
+end
+
+private
+
+###########################################################################
+#
+###########################################################################
+def source_file_name(migration)
+  "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{migration}"
+end
+
+###########################################################################
+#
+###########################################################################
+def migrate_one(model_name)
+  mongo_model = model_name.classify.constantize
+  new_model_name = model_name.start_with?('dc_') ? model_name.sub('dc_', 'ar_') : model_name
+  code = %(    create_table :#{new_model_name.pluralize} do |t|\n)
+  left = '      t.'
+  timestamps = false
+  # fields
+  document = mongo_model.new
+  document.attribute_names.each do |attribute_name|
+    next if attribute_name == '_id'
+    if %w[created_at updated_at].include?(attribute_name)
+      timestamps = true
+      next
+    end
+
+    options = mongo_model.fields[attribute_name].options
+    pp "Undefined type #{options[:type]} for #{mongo_model}.#{attribute_name}" unless TYPES[options[:type]]
+    att_name = attribute_name.sub(/^dc_/,'ar_')
+    code << %(#{left}#{TYPES[options[:type]]} :#{att_name})
+    code << %(, default: #{get_default(options[:default], options[:type])}) if options[:default]
+    code << "\n"
+  end
+  code << %(\n#{left}timestamps\n) if timestamps
+
+  # indexes
+  if document.index_specifications.any?
+    code << "\n"
+    document.index_specifications.each do |index|
+      code << "#{left}index "
+      code << (index.fields.size > 1 ? "[:#{index.fields.join(', :')}]" : ":#{index.fields.first}")
+      code << ", #{index.options.to_s.gsub(/\{|\}/, '')}" if index.options.size > 0
+      code << "\n"
+    end
+  end
+
+  # export some test data
+  data = []
+  mongo_model.all.limit(5).each do |doc|
+    #data << doc.as_document.inject([]) { |r, e| [e.first.sub(/^dc_/,'ar_'), e.last] }
+    data << doc.as_document.map { |e| [e.first.sub(/^dc_/,'ar_'), e.last] }
+  end
+  File.write("db/#{new_model_name}.json", data.to_json)
+
+  code << "    end\n\n"
+end
+
+###########################################################################
+#
+###########################################################################
+def get_default(default, type)
+  case type.to_s
+  when 'String' then "'#{default}'"
+  else default
+  end
+end
+
+#########################################################################
+# Return array of all models found in application.
+#########################################################################
+def all_collections
+  collections = []
+  DrgCms.paths(:forms).each do |path|
+    models_dir = File.expand_path("../models", path)
+    Dir["#{models_dir}/*.rb"].each do |model_file|
+      model_file =~ /(.*)\/(.*).rb/
+      # check if model exists
+      collection = $2.camelize.constantize.new rescue nil
+      collections << collection.class.to_s.underscore if collection&.respond_to?(:_id)
+    end
+  end
+  collections.sort
+end
+
+###########################################################################
+#
+###########################################################################
+def migrate_many(model_name)
+  selector = model_name[0, model_name.index('*') - 1].downcase
+  p selector
+
+  list = all_collections.select { |name| name.starts_with?(selector) }
+  list.inject('') { |r, e| r << migrate_one(e) }
+end
+
+###########################################################################
+#class #{migration_name} < ActiveRecord::Migration[7.0]
+#   def change
+#     create_table :products do |t|
+#       t.string :name
+#       t.text :description
+#
+#       t.timestamps = true
+#     end
+#   end
+# end
+###########################################################################
+def top(migration_name)
+  <<EOT
+class #{migration_name.classify} < ActiveRecord::Migration[7.0]
+  def change
+EOT
+end
+
+###########################################################################
+#
+###########################################################################
+def bottom
+  <<EOT
+  end
+end
+EOT
+end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.0.2
+  version: 0.7.0.8
 platform: ruby
 authors:
 - Damjan Rems
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: non-stupid-digest-assets
+  name: non-digest-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,7 +196,7 @@ files:
 - app/assets/images/throbber.gif
 - app/assets/javascripts/drg_cms/drg_cms.js
 - app/assets/javascripts/drg_cms/jquery-migrate.js
-- app/assets/javascripts/drg_cms/jquery.bpopup.min.js
+- app/assets/javascripts/drg_cms/jquery.bpopup.js
 - app/assets/javascripts/drg_cms/jquery.datetimepicker.js
 - app/assets/javascripts/drg_cms/jstree.min.js
 - app/assets/javascripts/drg_cms/select-multiple.js
@@ -217,8 +217,9 @@ 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_gallery_control.rb
 - app/controls/dc_help_control.rb
+- app/controls/dc_image_control.rb
 - app/controls/dc_page_control.rb
 - app/controls/dc_poll_result_control.rb
 - app/controls/dc_report.rb
@@ -240,6 +241,8 @@ files:
 - app/forms/dc_gallery.yml
 - app/forms/dc_help_1.yml
 - app/forms/dc_ident.yml
+- app/forms/dc_image.yml
+- app/forms/dc_image_search.yml
 - app/forms/dc_journal.yml
 - app/forms/dc_json_ld.yml
 - app/forms/dc_key_value.yml
@@ -277,6 +280,7 @@ files:
 - app/helpers/cms_index_helper.rb
 - app/helpers/dc_application_helper.rb
 - app/helpers/dc_category_helper.rb
+- app/helpers/dc_image_helper.rb
 - app/models/concerns/dc_page_concern.rb
 - app/models/concerns/dc_piece_concern.rb
 - app/models/concerns/dc_policy_rule_concern.rb
@@ -295,6 +299,7 @@ files:
 - app/models/dc_folder_permission.rb
 - app/models/dc_gallery.rb
 - app/models/dc_ident.rb
+- app/models/dc_image.rb
 - app/models/dc_internals.rb
 - app/models/dc_journal.rb
 - app/models/dc_json_ld.rb
@@ -376,7 +381,6 @@ files:
 - 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
 - app/views/layouts/cms.html.erb
 - app/views/layouts/content.html.erb
 - app/views/layouts/models.html.erb
@@ -396,6 +400,8 @@ files:
 - lib/drg_cms.rb
 - lib/drg_cms/engine.rb
 - lib/drg_cms/version.rb
+- lib/generators/convert_to_ar/USAGE
+- lib/generators/convert_to_ar/convert_to_ar_generator.rb
 - lib/generators/new_drg_form/USAGE
 - lib/generators/new_drg_form/new_drg_form_generator.rb
 - lib/tasks/browse_models.rake
@@ -440,7 +446,7 @@ homepage: https://www.drgcms.org
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -455,8 +461,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: 'DRG: Rapid web application development tool and CMS for Ruby, Rails and
   MongoDB'

data/app/assets/javascripts/drg_cms/jquery.bpopup.min.js

@@ -1,7 +0,0 @@
-/*================================================================================
- * @name: bPopup - if you can't get it up, use bPopup
- * @author: (c)Bjoern Klinggaard (twitter@bklinggaard)
- * @demo: http://dinbror.dk/bpopup
- * @version: 0.11.0.min
- ================================================================================*/
- (function(c){c.fn.bPopup=function(A,E){function L(){a.contentContainer=c(a.contentContainer||b);switch(a.content){case "iframe":var d=c('<iframe class="b-iframe" '+a.iframeAttr+"></iframe>");d.appendTo(a.contentContainer);t=b.outerHeight(!0);u=b.outerWidth(!0);B();d.attr("src",a.loadUrl);l(a.loadCallback);break;case "image":B();c("<img />").load(function(){l(a.loadCallback);F(c(this))}).attr("src",a.loadUrl).hide().appendTo(a.contentContainer);break;default:B(),c('<div class="b-ajax-wrapper"></div>').load(a.loadUrl,a.loadData,function(d,b,e){l(a.loadCallback,b);F(c(this))}).hide().appendTo(a.contentContainer)}}function B(){a.modal&&c('<div class="b-modal '+e+'"></div>').css({backgroundColor:a.modalColor,position:"fixed",top:0,right:0,bottom:0,left:0,opacity:0,zIndex:a.zIndex+v}).appendTo(a.appendTo).fadeTo(a.speed,a.opacity);C();b.data("bPopup",a).data("id",e).css({left:"slideIn"==a.transition||"slideBack"==a.transition?"slideBack"==a.transition?f.scrollLeft()+w:-1*(x+u):m(!(!a.follow[0]&&n||g)),position:a.positionStyle||"absolute",top:"slideDown"==a.transition||"slideUp"==a.transition?"slideUp"==a.transition?f.scrollTop()+y:z+-1*t:p(!(!a.follow[1]&&q||g)),"z-index":a.zIndex+v+1}).each(function(){a.appending&&c(this).appendTo(a.appendTo)});G(!0)}function r(){a.modal&&c(".b-modal."+b.data("id")).fadeTo(a.speed,0,function(){c(this).remove()});a.scrollBar||c("html").css("overflow","auto");c(".b-modal."+e).unbind("click");f.unbind("keydown."+e);k.unbind("."+e).data("bPopup",0<k.data("bPopup")-1?k.data("bPopup")-1:null);b.undelegate(".bClose, ."+a.closeClass,"click."+e,r).data("bPopup",null);clearTimeout(H);G();return!1}function I(d){y=k.height();w=k.width();h=D();if(h.x||h.y)clearTimeout(J),J=setTimeout(function(){C();d=d||a.followSpeed;var e={};h.x&&(e.left=a.follow[0]?m(!0):"auto");h.y&&(e.top=a.follow[1]?p(!0):"auto");b.dequeue().each(function(){g?c(this).css({left:x,top:z}):c(this).animate(e,d,a.followEasing)})},50)}function F(d){var c=d.width(),e=d.height(),f={};a.contentContainer.css({height:e,width:c});e>=b.height()&&(f.height=b.height());c>=b.width()&&(f.width=b.width());t=b.outerHeight(!0);u=b.outerWidth(!0);C();a.contentContainer.css({height:"auto",width:"auto"});f.left=m(!(!a.follow[0]&&n||g));f.top=p(!(!a.follow[1]&&q||g));b.animate(f,250,function(){d.show();h=D()})}function M(){k.data("bPopup",v);b.delegate(".bClose, ."+a.closeClass,"click."+e,r);a.modalClose&&c(".b-modal."+e).css("cursor","pointer").bind("click",r);N||!a.follow[0]&&!a.follow[1]||k.bind("scroll."+e,function(){if(h.x||h.y){var d={};h.x&&(d.left=a.follow[0]?m(!g):"auto");h.y&&(d.top=a.follow[1]?p(!g):"auto");b.dequeue().animate(d,a.followSpeed,a.followEasing)}}).bind("resize."+e,function(){I()});a.escClose&&f.bind("keydown."+e,function(a){27==a.which&&r()})}function G(d){function c(e){b.css({display:"block",opacity:1}).animate(e,a.speed,a.easing,function(){K(d)})}switch(d?a.transition:a.transitionClose||a.transition){case "slideIn":c({left:d?m(!(!a.follow[0]&&n||g)):f.scrollLeft()-(u||b.outerWidth(!0))-200});break;case "slideBack":c({left:d?m(!(!a.follow[0]&&n||g)):f.scrollLeft()+w+200});break;case "slideDown":c({top:d?p(!(!a.follow[1]&&q||g)):f.scrollTop()-(t||b.outerHeight(!0))-200});break;case "slideUp":c({top:d?p(!(!a.follow[1]&&q||g)):f.scrollTop()+y+200});break;default:b.stop().fadeTo(a.speed,d?1:0,function(){K(d)})}}function K(d){d?(M(),l(E),a.autoClose&&(H=setTimeout(r,a.autoClose))):(b.hide(),l(a.onClose),a.loadUrl&&(a.contentContainer.empty(),b.css({height:"auto",width:"auto"})))}function m(a){return a?x+f.scrollLeft():x}function p(a){return a?z+f.scrollTop():z}function l(a,e){c.isFunction(a)&&a.call(b,e)}function C(){z=q?a.position[1]:Math.max(0,(y-b.outerHeight(!0))/2-a.amsl);x=n?a.position[0]:(w-b.outerWidth(!0))/2;h=D()}function D(){return{x:w>b.outerWidth(!0),y:y>b.outerHeight(!0)}}c.isFunction(A)&&(E=A,A=null);var a=c.extend({},c.fn.bPopup.defaults,A);a.scrollBar||c("html").css("overflow","hidden");var b=this,f=c(document),k=c(window),y=k.height(),w=k.width(),N=/OS 6(_\d)+/i.test(navigator.userAgent),v=0,e,h,q,n,g,z,x,t,u,J,H;b.close=function(){r()};b.reposition=function(a){I(a)};return b.each(function(){c(this).data("bPopup")||(l(a.onOpen),v=(k.data("bPopup")||0)+1,e="__b-popup"+v+"__",q="auto"!==a.position[1],n="auto"!==a.position[0],g="fixed"===a.positionStyle,t=b.outerHeight(!0),u=b.outerWidth(!0),a.loadUrl?L():B())})};c.fn.bPopup.defaults={amsl:50,appending:!0,appendTo:"body",autoClose:!1,closeClass:"b-close",content:"ajax",contentContainer:!1,easing:"swing",escClose:!0,follow:[!0,!0],followEasing:"swing",followSpeed:500,iframeAttr:'scrolling="no" frameborder="0"',loadCallback:!1,loadData:!1,loadUrl:!1,modal:!0,modalClose:!0,modalColor:"#000",onClose:!1,onOpen:!1,opacity:.7,position:["auto","auto"],positionStyle:"absolute",scrollBar:!0,speed:250,transition:"fadeIn",transitionClose:!1,zIndex:9997}})(jQuery);

data/app/views/layouts/__cmsedit.html.erb

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>  
-  <title><%= @page_title %></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <%= stylesheet_link_tag "cms", media: 'all' %>
-  <style type="text/css" media="all"><%= "#{@site.css}#{@design.css}\n#{@page.css}".html_safe if @page %></style>
-  <%= @site.header.html_safe if @site %>
-  <%= javascript_include_tag "cms" %>
-  <%= csrf_meta_tags %>
-</head>
-
-<body>
-<%= yield %>
-</body>
-</html>