drg_cms 0.6.1.9 → 0.7.0.2

data/app/models/dc_json_ld.rb

@@ -37,21 +37,21 @@
 # 
 ########################################################################
 class DcJsonLd 
-  include Mongoid::Document
-  include Mongoid::Timestamps
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field :name,        type: String
-  field :type,        type: String
-  field :data,        type: String
-  field :active,      type: Boolean,      default: true
+field :name,        type: String
+field :type,        type: String
+field :data,        type: String
+field :active,      type: Boolean,      default: true
 
-  embeds_many :dc_json_lds, :cyclic => true
+embeds_many :dc_json_lds, :cyclic => true
 
-  field :created_by,  type: BSON::ObjectId
-  field :updated_by,  type: BSON::ObjectId
-  
-  validates :name, presence: true
-  validates :type, presence: true
+field :created_by,  type: BSON::ObjectId
+field :updated_by,  type: BSON::ObjectId
+
+validates :name, presence: true
+validates :type, presence: true
   
 ##########################################################################
 # Returns JSON LD data as YAML
@@ -71,29 +71,6 @@ def get_json_ld(parent_data)
   yaml
 end
 
-########################################################################
-# Searches forms path for file_name and returns full file name or nil if not found.
-# 
-# @param [String] Form file name. File name can be passed as gem_name.filename. This can
-# be useful when you are extending form but want to retain same name as original form
-# For example. You are extending dc_user form from drg_cms gem and want to
-# retain same dc_user name. This can be done by setting drg_cms.dc_user to extend option. 
-# 
-# @return [String] Form file name including path or nil if not found.
-########################################################################
-def self.dc_find_form_file(form_file)
-  form_path=nil
-  if form_file.match(/\.|\//)
-    form_path,form_file=form_file.split(/\.|\//)
-  end
-  DrgCms.paths(:forms).reverse.each do |path|
-    f = "#{path}/#{form_file}.yml"
-    return f if File.exist?(f) and (form_path.nil? or path.to_s.match(/\/#{form_path}\//i))
-  end
-  p "Form file #{form_file} not found!"
-  nil
-end
-
 ########################################################################
 # Find document by ids when document are embedded into main d even if embedded
 # 
@@ -105,9 +82,9 @@ end
 def self.find_document_by_ids(tables, ids)
   collection = tables.split(';').first.classify.constantize
   ar_ids = ids.split(';')
-# Find top document  
+  # Find top document
   document = collection.find(ar_ids.shift)
-# Search for embedded document
+  # Search for embedded document
   ar_ids.each {|id| document = document.dc_json_lds.find(id) }
   document
 end
@@ -116,7 +93,7 @@ end
 # Returns possible options for type select field on form.
 #########################################################################
 def self.choices4_type()
-  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  yaml = YAML.load_file( CmsHelper.form_file_find('json_ld_schema') )
   
   yaml.inject([]) {|result, schema_name| result << schema_name.first }
 end
@@ -125,7 +102,7 @@ end
 # Create menu to add schema element. Called from DRGCMS Form action.
 #########################################################################
 def self.add_schema_menu(parent)
-  yaml = YAML.load_file( dc_find_form_file('json_ld_schema') )
+  yaml = YAML.load_file( CmsHelper.form_file_find('json_ld_schema') )
   if (level = parent.params['ids'].split(';').size) == 1
     # select only top level elements
     yaml.delete_if { |schema_name, schema_data| schema_data['level'].nil? }
@@ -139,7 +116,7 @@ def self.add_schema_menu(parent)
     end
     yaml = _yaml
   end
-# create menu code
+  # create menu code
   html = '<ul>'
   yaml.each do |schema_name, schema_data|
     next if level == 1 and schema_data['level'].nil?
@@ -149,4 +126,4 @@ def self.add_schema_menu(parent)
   html << '</ul>' 
 end
   
-end
+end

data/app/models/drgcms_form_fields/date_picker.rb

@@ -66,30 +66,28 @@ class DatePicker < DrgcmsField
 ###########################################################################
 def render
   value = @record.try(@yaml['name']) ? I18n.localize(@record[@yaml['name']].to_date) : nil
-  #return ro_standard( @parent.dc_format_value(value)) if @readonly
-
-  @yaml['options'] ||= {}
   set_initial_value
   @yaml['html']['size'] ||= @yaml['size'] || 10
   @yaml['html']['value'] ||= value
   @yaml['html']['autocomplete'] ||= 'off'
   @yaml['html']['class'] = @yaml['html']['class'].to_s + ' date-picker'
 
-  @yaml['options']['lang']   ||= "'#{I18n.locale}'"
-  @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.date')}'"
-  @yaml['options']['timepicker'] = false
-  @yaml['options']['scrollMonth'] ||= false
-  @yaml['options']['scrollInput'] ||= false
+  options = options_to_hash(@yaml['options'])
+  options['lang']   ||= I18n.locale.to_s
+  options['format'] ||= t('datetimepicker.formats.date')
+  options['timepicker'] = false
+  options['scrollMonth'] ||= false
+  options['scrollInput'] ||= false
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
-  @js << %Q[
+  @js << %(
 $(document).ready(function() {
-  $("##{record}_#{@yaml['name']}").datetimepicker( {
-    #{hash_to_options(@yaml['options'])}
+  $("##{record}_#{@yaml['name']}").datetimepicker({
+    #{hash_to_options(options)}
   });
 });
-] unless @readonly
+) unless @readonly
   
   self
 end

data/app/models/drgcms_form_fields/datetime_picker.rb

@@ -30,12 +30,12 @@ module DrgcmsFormFields
 # * +name:+ Field name (required) 
 # * +options:+ options which apply to date_picker field. All options can be found here http://xdsoft.net/jqplugins/datetimepicker/ .
 # Options can be defined in single line like:
-# * options: 'step: 15,inline: true,lang: "sl"' or
+# * options: 'step: 15,inline: true,lang: sl' or
 # 
 # * options: 
 #   * step: 15
 #   * inline: true
-#   * lang: '"sl"'
+#   * lang: sl
 #   
 # * +html:+ html options which apply to date_time_picker field (optional)
 # 
@@ -52,27 +52,26 @@ class DatetimePicker < DrgcmsField
 ###########################################################################
 def render
   value = @record.try(@yaml['name']) ? I18n.localize(@record[@yaml['name']].localtime) : nil
-  #return ro_standard( @parent.dc_format_value(value)) if @readonly
-
-  @yaml['options'] ||= {}
   set_initial_value
+
   @yaml['html']['size'] ||= @yaml['size'] || 14
   @yaml['html']['value'] ||= value if @record[@yaml['name']]
   @yaml['html']['autocomplete'] ||= 'off'
   @yaml['html']['class'] = @yaml['html']['class'].to_s + ' date-picker'
 
-  @yaml['options']['lang']   ||= "'#{I18n.locale}'"
-  @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.datetime')}'"
+  options = options_to_hash(@yaml['options'])
+  options['lang']   ||= I18n.locale.to_s
+  options['format'] ||= t('datetimepicker.formats.datetime')
 
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
-  @js << %Q[
+  @js << %(
 $(document).ready(function() {
-  $("##{record}_#{@yaml['name']}").datetimepicker( {
-    #{hash_to_options(@yaml['options'])}
+  $("##{record}_#{@yaml['name']}").datetimepicker({
+    #{hash_to_options(options)}
   });
 }); 
-] unless @readonly
+) unless @readonly
   
   self
 end

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -250,16 +250,58 @@ end
 #    options:
 #      height: 400
 #      width: 800
-#      toolbar: "'basic'"
+#      toolbar: "basic"
 #      
-#  => "height:400, width:800, toolbar:'basic'"
+#  => "height:400, width:800, toolbar: 'basic'"
 # 
 # Return: 
 # String: Options formated as javascript options.
 #      
 ####################################################################
-def hash_to_options(hash)
-  hash.to_a.inject([]) {|r,v| r << "#{v[0]}: #{v[1]}" }.join(',')
+def hash_to_options(options)
+  c = ''
+  options.each do |key, option|
+    c << "#{key} : "
+    c << case
+         when option.to_s.match(/function/i) then option
+         when option.class == String then "\"#{option}\""
+         else option.to_s
+         end
+    c << ",\n"
+  end
+  c
+end
+
+####################################################################
+# Options may be defined on form as hash or as string. This method will
+# ensure conversion of options into hash.
+#
+# Parameters:
+# [String or Hash] : Form options
+#
+# Form example: As used in forms
+#    options:
+#      height: 400
+#      width: 800
+#      toolbar: "'basic'"
+#  or
+#
+#  options: "height:400, width:800, toolbar:'basic'"
+#
+# Return:
+# Hash: Options as Hash
+####################################################################
+def options_to_hash(options)
+  return {} if options.nil?
+  return options unless options.class == String
+
+  options.chomp.split(',').inject({}) do |r, e|
+    key, value = e.chomp.split(':')
+    value.strip!
+    value = value[1..value.size - 2] if value[0] =~ /\'|\"/
+    r[key.strip] = value
+    r
+  end
 end
 
 ####################################################################

data/app/models/drgcms_form_fields/readonly.rb

@@ -56,7 +56,7 @@ def render
   @record[@yaml['name']] = @yaml['html']['value'] if @yaml['html']['value']
 
   @html << @parent.hidden_field('record', @yaml['name']) # retain field as hidden field
-  @html << '<div class="dc-readonly">'
+  @html << %(<div class="dc-readonly" id="record_#{@yaml['name']}_">)
 
   @html << if @yaml['eval']
              if @yaml['eval'].match(/dc_name4_id|dc_name_for_id/)

data/app/models/drgcms_form_fields/select.rb

@@ -146,8 +146,8 @@ def add_view_code
 
   table, form_name = @yaml['view'].split(/\ |\,/).delete_if { |e| e.blank? }
   url  = @parent.url_for(controller: 'cmsedit', id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
-  icon = @parent.fa_icon('eye')
-  %(<span class="dc-window-open" data-url="#{url}">#{icon}</span>)
+  icon = @parent.mi_icon('eye-o md-18')
+  %(<span class="dc-window-open" data-url="#{url}"> #{icon}</span>)
 end
 
 ###########################################################################

data/app/models/drgcms_form_fields/text_autocomplete.rb

@@ -114,7 +114,7 @@ def render
              style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )
   end
   # with edit icon
-  if @yaml['with_edit'] && @record[@yaml['name']].present?
+  if @yaml['with_edit'] && @record && @record[@yaml['name']].present?
     @html << ' ' + @parent.fa_icon('edit-o', class: 'in-edit-add', title: t('drgcms.edit'),
              style: "vertical-align: top;", 'data-table' => @yaml['with_edit'], 'data-id' => @record[@yaml['name']] )
   end
@@ -148,7 +148,7 @@ $(document).ready(function() {
     change: function (event, ui) { 
       #{not_id_code}
       if (ui.item == null) return;
-      $("##{record}_#{@yaml['name']}").val(ui.item.id);
+      $("##{record}_#{@yaml['name']}").val(ui.item.id).trigger('change');
     },
 
     minLength: 2

data/app/models/drgcms_form_fields/text_with_select.rb

@@ -83,6 +83,7 @@ $(document).ready(function() {
  $('##{@yaml['name']}_').change( function() {
   if ($(this).val().toString().length > 0) {
     $('##{record}_#{@yaml['name']}').val( $(this).val() );
+    $('##{record}_#{@yaml['name']}').trigger("change");
   }
   $('##{record}_#{@yaml['name']}').focus();
  });

data/app/models/drgcms_form_fields/tree_select.rb

@@ -59,6 +59,7 @@ class TreeSelect < Select
 ###########################################################################
 def make_tree(parent)
   return '' unless @choices[parent.to_s]
+
   @html << '<ul>'
   choices = if @choices[parent.to_s].first[3] != 0
     @choices[parent.to_s].sort_by {|e| e[3].to_i } # sort by order if first is not 0
@@ -66,16 +67,16 @@ def make_tree(parent)
     @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
   end
   choices.each do |choice|
-    data = [ %Q["selected" : #{choice.last ? 'true' : 'false'} ] ]
+    data = [ %("selected" : #{choice.last ? 'true' : 'false'} ) ]
     # only for parent objects
     if @choices[ choice[1].to_s ]
-    # parent is not selectable
+      # parent is not selectable
       data << '"disabled" : true' unless @parent.dc_dont?(@yaml['parent_disabled'], true)
-    # parents are opened on start
+      # parents are opened on start
       data << '"opened" : true' unless @parent.dc_dont?(@yaml['parent_opened'], true)
     end
     # data-jstree must be singe quoted
-    @html << %Q[<li data-id="#{choice[1]}" data-jstree='{#{data.join(' , ')}}'>#{choice.first}\n]
+    @html << %(<li data-id="#{choice[1]}" data-jstree='{#{data.join(' , ')}}'>#{choice.first}\n)
     # call recursively for children     
     make_tree(choice[1]) if @choices[ choice[1].to_s ]
     @html << "</li>"
@@ -87,25 +88,24 @@ end
 # Render tree_select field html code
 ###########################################################################
 def render
-  #return ro_standard if @readonly  
   set_initial_value('html','value')
   require 'sort_alphabetical'  
   
   record = record_text_for(@yaml['name'])
   clas   = 'tree-select' + (@readonly ? ' dc-readonly' : '')
   @html << "<div id=\"#{@yaml['name']}\" class=\"#{clas}\" #{set_style()} >"
-# Fill @choices hash. The key is parent object id
+  # Fill @choices hash. The key is parent object id
   @choices = {}
   choices_in_eval(@yaml['eval']).each do |data| 
     @choices[ data[2].to_s ] ||= [] 
     @choices[ data[2].to_s ] << (data << false)
   end
-# put current values hash with. To speed up selection when there is a lot of categories
+  # put current values hash with. To speed up selection when there is a lot of categories
   current_values = {}
   current = @record[@yaml['name']] || []
   current = [current] unless current.class == Array # non array fields
-  current.each {|e| current_values[e.to_s] = true}
-# set third element of @choices when selected
+  current.each { |e| current_values[e.to_s] = true }
+  # set third element of @choices when selected
   @choices.keys.each do |key|
     0.upto( @choices[key].size - 1 ) do |i|
       choice = @choices[key][i]
@@ -114,16 +114,16 @@ def render
   end
   make_tree(nil)
   @html << '</div>'
-# add hidden communication field  
+  # add hidden communication field
   @html << @parent.hidden_field(record, @yaml['name'], value: current.join(','))
-# save multiple indicator for data processing on return
+  # save multiple indicator for data processing on return
   @html << @parent.hidden_field(record, "#{@yaml['name']}_multiple", value: 1) if @yaml['multiple']
-# javascript to update hidden record field when tree looses focus
-readonly_code = %Q[
+  # javascript to update hidden record field when tree looses focus
+readonly_code = %(
 ,
 "conditionalselect" : function (node) {
 return false; }
-]
+)
 
   @js =<<EOJS
 $(function(){
@@ -131,7 +131,7 @@ $(function(){
     "checkbox" : {"three_state" : false},        
     "core" : { "themes" : { "icons": false },
                "multiple" : #{@yaml['multiple'] ? 'true' : 'false'}  },
-    "plugins" : ["checkbox","conditionalselect"]
+    "plugins" : ["checkbox", "conditionalselect"]
     #{@readonly ? readonly_code : ''}
   });
 });
@@ -155,13 +155,14 @@ end
 ###########################################################################
 def self.get_data(params, name)
   return nil if params['record'][name].blank?
-#
+
   result = params['record'][name].split(',')
-  result.delete_if {|e| e.blank? }
+  result.delete_if(&:blank?)
   return nil if result.size == 0
-# convert to BSON objects if is BSON object ID
+
+  # convert to BSON objects if is BSON object ID
   result = result.map{ |e| BSON::ObjectId.from_string(e) } if BSON::ObjectId.legal?(result.first)
-# return only first element if multiple values select was not alowed
+  # return only first element if multiple values select was not allowed
   params['record']["#{name}_multiple"] == '1' ? result : result.first  
 end
 

data/app/renderers/dc_common_renderer.rb

@@ -68,9 +68,10 @@ end
 #    dc_render(:dc_common_renderer, method: 'google_analytics', code: 'UA-12345678-9')
 ########################################################################
 def google_analytics
+  html = ''
   ga_acc = @opts[:code] || @opts[:ga_acc]
-  return '' if ga_acc.nil? or ga_acc == '/'
-  html =<<EOT 
+  if ga_acc && ga_acc != '/'
+    html << %(
   <!-- Google analytics. -->
 <script type="text/javascript">
   (function(i,s,o,g,r,a,m){
@@ -86,7 +87,23 @@ def google_analytics
     ga('send', 'pageview')
   }
 </script>
-EOT
+)
+  end
+
+  ga4_acc = @opts[:code4] || @opts[:ga4_acc]
+  if ga4_acc && ga4_acc != '/'
+    html << %(
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=#{ga4_acc}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '#{ga4_acc}');
+</script>)
+  end
+
   html.html_safe
 end
 

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

@@ -1,17 +1,24 @@
+<div id="dc-form-container">
+  <div id="dc-form-left">
+    <%= dc_form_left %>
+  </div>
 
-<%= dc_flash_messages %>
-<%= dc_error_messages_for @record %>
-<%= dc_warning_messages_for @record %>
+  <div id="dc-form-right">
+    <%= dc_flash_messages %>
+    <%= dc_error_messages_for @record %>
+    <%= dc_warning_messages_for @record %>
 
-<div class="dc-form-frame">
+    <div class="dc-form-frame">
+    <% fields = dc_fields_for_form %>
+    <%= dc_actions_for_form 'top' %>
 
-  <%= dc_actions_for_form 'top' %>
-  
-  <%= dc_fields_for_form %>
-  <%= dc_document_statistics %>
+    <%= fields %>
+    <%= dc_document_statistics %>
 
-  <%= dc_actions_for_form 'bottom' %>
-</div>
+    <%= dc_actions_for_form 'bottom' %>
+    </div>
 
-<%= javascript_tag(@js)  unless @js.blank? %>
-<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>
+    <%= javascript_tag(@js)  unless @js.blank? %>
+    <% unless @css.blank? %><style><%= @css %></style><% end %>
+  </div>
+</div>

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

@@ -1,9 +1,13 @@
-<%= dc_head_for_form %>
-<%= dc_table_title dc_edit_title() %>
+<% dc_form_update %>
 
-<%= form_tag( @parms, method: :put, id: params['form_name'] || params['table'],
-              class: 'cmsform', multipart: @form['form']['multipart'] ) do %>
-  <%= render partial: 'form' %>
-<% end %>
+<div <%= dc_form_id %>>
+  <%= dc_head_for_form %>
+  <%= dc_table_title dc_edit_title() %>
+
+  <%= form_tag( @form_params, method: :put, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),
+                class: 'cmsform', multipart: @form['form']['multipart'], window_close: params[:window_close] ) do %>
+    <%= render partial: 'form' %>
+  <% end %>
+</div>
 
 <div id="popup" style="display: none;"></div>

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

@@ -1,12 +1,14 @@
-<div id="<%= params['form_name'] || params['table'] %>" class="dc-form-frame">
+<% dc_form_update %>
+
+<div <%= dc_form_id %> class="dc-form-frame">
   <%= dc_title_for_index @records %>
 
   <%= dc_actions_for_index %>
   <%= dc_div_filter %>
   <%= dc_flash_messages %> 
-  <div id='result'> <%= render partial: 'result' %></div>
+  <div id="result"> <%= render partial: 'result' %></div>
 </div>
 
 <%= javascript_tag(@js) unless @js.blank? %>
-<% unless @css.blank? %><style type="text/css"><%= @css %></style><% end %>
+<% unless @css.blank? %><style><%= @css %></style><% end %>
 <div id="popup" style="display: none;"></div>

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

@@ -1,8 +1,12 @@
-<%= dc_table_title dc_new_title %>
+<% dc_form_update %>
 
-<%= form_tag(@parms, method: :post, id: params['form_name'] || params['table'],
-             class: 'cmsform', multipart: @form['form']['multipart']) do %>
-  <%= render partial: 'form' %>
-<% end %>
+<div <%= dc_form_id %>>
+  <%= dc_table_title dc_new_title %>
+
+  <%= form_tag(@form_params, method: :post, id: CmsHelper.form_param(params) || CmsHelper.table_param(params),
+               class: 'cmsform', multipart: @form['form']['multipart']) do %>
+    <%= render partial: 'form' %>
+  <% end %>
+</div>
 
 <div id="popup" style="display: none;"></div>

data/app/views/dc_common/_help.html.erb

@@ -8,6 +8,7 @@
     <% if @commnets %>
       <button onclick="location.href='#comments'; return false;"><%= t('drgcms.dc_help.comments_button') %></button>
     <% end %>
+    <div style="float: right"><%= fa_icon('close', class: 'dc-link') %></div>
   </div>
 
   <div class="help-body"><%= dc_help_body if @help %></div>

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

@@ -4,7 +4,7 @@
   <title><%= @page_title %></title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <%= stylesheet_link_tag "application", media: 'all' %>
-  <style type="text/css" media="all"><%= "#{@site.css if @site}#{@design.css if @design}\n#{@page.css if @page}".html_safe %></style>
+  <style media="all"><%= "#{@site.css if @site}#{@design.css if @design}\n#{@page.css if @page}".html_safe %></style>
   <%= @site.header.html_safe %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

data/config/locales/drgcms_en.yml

@@ -75,7 +75,11 @@ en:
     filter: Filter
     refresh: Refresh
     back: Back
+    next: Next
+    finish: Finish
+    steps: Steps
     close: Close
+    cancel: Cancel
     delete: Delete
     enable: Enable
     disable: Disable
@@ -98,6 +102,7 @@ en:
     updated_by: Updated by
     created_at: Created at
     updated_at: Updated at
+    active: Active
     new_record: New record
     
     filter_poll: Filter
@@ -108,6 +113,8 @@ en:
     choices4_filter_operators: 'Equal to:eq,Contains:like,Greater then:gt,Less then:lt,Is empty:empty'
     
     browse_collections: Browse all collections
+    category_has_subs: Category can't be deleted, because it contains sub-elements.
+    category_as_tree: Edit in treeview
 
     dc_journal:
       zero_selected: No data selected!

data/config/locales/drgcms_sl.yml

@@ -75,7 +75,11 @@ sl:
     filter: Filter
     refresh: Osveži
     back: Nazaj
+    next: Naprej
+    steps: Koraki
+    finish: Zaključek
     close: Zapri
+    cancel: Preklic
     delete: Izbris
     enable: Omogoči
     disable: Onemogoči
@@ -98,6 +102,7 @@ sl:
     updated_by: Spremenil
     created_at: Ustvarjeno
     updated_at: Spremenjeno
+    active: Aktiven
     new_record: Nov zapis
     
     filter_poll: Filter
@@ -108,6 +113,8 @@ sl:
     choices4_filter_operators: 'Je enak:eq,Vsebuje:like,Je večji od:gt,Je manjši od:lt,Je prazen:empty'
     
     browse_collections: Brskanje po definicijah zbirk
+    category_has_subs: Kategorije ni mogoče izbrisati, ker vsebuje podrejene elemente.
+    category_as_tree: Uredi v drevesnem pogledu
 
     dc_journal:
       zero_selected: Ni izbranih podatkov!

data/drg_cms.gemspec

@@ -15,18 +15,18 @@ Gem::Specification.new do |s|
   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.files       = Dir['{app,config,db,lib}/**/*'] + %w[MIT-LICENSE Rakefile README.md CHANGELOG.md drg_cms.gemspec]
   s.test_files  = Dir['test/**/*']
 
   s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'rails', '~> 6.1'
+  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 'bcrypt' #, '~> 3.0.0'
-  s.add_dependency 'mongoid', '~> 7'
+  s.add_dependency 'mongoid'#, '~> 7'
 
   s.add_dependency 'kaminari-mongoid'
   s.add_dependency 'kaminari-actionview'