drg_cms 0.5.10.7 → 0.5.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13427f3d66b3e41332787f5e5a1b9136c65874d7
-  data.tar.gz: cb7dd4a48763fc5da35b1e6f009f29687ebd4449
+  metadata.gz: bdf44bace6e210feb0eb13a51f30edac416f50af
+  data.tar.gz: 883617538b019a15dd6cb1aa320b56cf9f578247
 SHA512:
-  metadata.gz: 4ae87d5b1417d792d1c253f5d623b032c6b8a0b19e08b89efe1e2631b4c6488acd5cdf55891ef937edec4e049da3970d28ab1e197eda1efb101f2b8d40abb80f
-  data.tar.gz: 2cce2a337d7da3f95dda769dfb330ba03d7b5e14481749326522618a7853c67138feaf26bb73fbbc4e0396940838d7a0056708aeb9d187fddcf9be454c5b9616
+  metadata.gz: ef0e470d00455dbf50ade1b16c041ea73926e329c6cc94ae2345860ffa314148089e823f4e979266d469fd92a755b1f79487966943c5f4e6940163c6ebb71e2e
+  data.tar.gz: 9525e91d098007daedf5171f7973d1a5a9d38f46c8b4304c39ff70c5c8b3c90172dd4df83d425b3eb565f71153e1055068e640af7dfa0f0b1a8446f4838c0d52

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -584,8 +584,10 @@ height: 26px;
 }
 
 .cmsedit-menu ul {
-display: inline-block; 
+display: inline-block;
+list-style-type: none;
 color: #666;
+margin: 0px;
 margin-right: 4px;
 font-size: 14px;
 }

data/app/controllers/dc_application_controller.rb

@@ -198,12 +198,6 @@ def dc_user_can(permission, table=params[:table])
       add_permissions_for table_name
     end
   end
-# Sometimes anonymous user is allowed to use cmsedit. Search for system default role.
-#TODO This might not be the best idea. Check in the future.
-  if session[:user_roles].nil? or session[:user_roles] == []
-    guest = DcUserRole.find_by(:system_name => 'guest')
-    session[:user_roles] = guest ? [guest.id] : []
-  end
 # Return true if any of the permissions user has is higher or equal to requested permission 
   session[:user_roles].each {|r| return true if @permissions[r] and @permissions[r] >= permission }
   false
@@ -268,6 +262,36 @@ def dc_not_modified?(*documents)
   false
 end
 
+##########################################################################
+# Will determine design content or view filename which defines design.
+# 
+# Returns:
+#  design_body: design body as defined in site or design document.
+#  design_view: view file name which will be used for rendering design
+##########################################################################
+def get_design_and_render(design_doc)
+  layout      = @site.site_layout.blank? ? 'content' : @site.site_layout
+  site_top    = '<%= dc_page_top %>'
+  site_bottom = '<%= dc_page_bottom %>'
+#  
+  if design_doc
+    if !design_doc.rails_view.blank? 
+      if design_doc.rails_view.downcase != 'site'
+        return render design_doc.rails_view, layout: layout
+      end
+    elsif !design_doc.body.blank?
+      design = site_top + design_doc.body + site_bottom
+      return render(inline: design, layout: layout)
+    end
+  end
+# 
+  if @site.rails_view.blank? 
+    design = site_top + @site.design + site_bottom
+    return render(inline: design, layout: layout)
+  end
+  render @site.rails_view, layout: layout
+end
+
 ##########################################################################
 # This is default page process action. It will search for site, page and
 # design documents, collect parameters from different objects, add CMS edit code if allowed
@@ -334,7 +358,8 @@ def dc_process_default_request()
     dc_log_visit()
   end
   @page_title = @page.title.blank? ? "#{@site.page_title}-#{@page.subject}" : @page.title
-  layout      = @site.site_layout.blank? ? 'content' : @site.site_layout 
+# define design
+=begin
   design      = @design ? @design.body : @site.design
 # render view. inline if defined in design
   view_filename = @design ? @design.rails_view.to_s : ''
@@ -346,6 +371,8 @@ def dc_process_default_request()
   else
     render view_filename, layout: layout
   end
+=end
+  get_design_and_render @design
 end
 
 ##########################################################################
@@ -378,6 +405,7 @@ def dc_single_sitedoc_request
 #  
   @page_title = "#{@site.page_title} #{@part.name}"
   @js, @css = '', ''
+=begin  
   layout = @site.site_layout.blank? ? 'content' : @site.site_layout
   if @site.rails_view.blank?
     design = @site.design + '<style type="text/css"><%= @css.html_safe %></style><%= javascript_tag @js %>'
@@ -386,6 +414,8 @@ def dc_single_sitedoc_request
   else
     render @site.rails_view, layout: layout
   end
+=end
+  get_design_and_render nil
 end
 
 ########################################################################

data/app/controllers/dc_common_controller.rb

@@ -149,8 +149,7 @@ end
 def restore_from_journal
 # Only administrators can perform this operation  
   unless dc_user_has_role('admin')
-    { 'msg_info' => (t ('drgcms.not_authorized')) }
-    return render inline: result.to_json, formats: 'js'
+    return render inline: { 'msg_info' => (t ('drgcms.not_authorized')) }.to_json, formats: 'js'
   end
 # selected fields to hash  
   restore = params[:select].inject({}) {|r,v| r[v.first] = 0 if v.last == '1'; r}
@@ -305,11 +304,10 @@ def fill_login_data(user, remember_me)
   session[:user_id]   = user.id
   session[:user_name] = user.name
   session[:edit_mode] = 0 
-  session[:user_roles] = nil
+  session[:user_roles] = []
 # special for SUPERADMIN
   sa = DcPolicyRole.find_by(system_name: 'superadmin')
   if sa and (role = user.dc_user_roles.find_by(dc_policy_role_id: sa.id))
-    session[:user_roles] = []
     session[:user_roles] << role.dc_policy_role_id
     session[:edit_mode]  = 2
     return
@@ -328,9 +326,16 @@ def fill_login_data(user, remember_me)
 # set edit_mode      
 #    session[:edit_mode] = 1 if policy_role.has_cms_menu
     session[:edit_mode] = 1 if policy_role.permission > 1
-    session[:user_roles] ||= []  # 
     session[:user_roles] << role.dc_policy_role_id
   end
+# Add default guest role if no role set
+# This was previously in dc_user_can. I belive it should be here. 
+#TODO This might not be the best idea. Check in the future.
+  if session[:user_roles].size == 0
+    guest = DcUserRole.find_by(:system_name => 'guest')
+    session[:user_roles] << guest.id if guest
+  end
+  
 # Save remember me cookie if not CMS user and remember me is selected
   if session[:edit_mode] == 0 and remember_me
     cookies.signed[:remember_me] = { :value => user.id, :expires => 180.days.from_now}

data/app/forms/all_options.yml

@@ -135,7 +135,7 @@ form:
         name: dc_site_id
         type: select
         multiple: true || 1
-        eval: dc_choices4('model','description_field_name','_id')
+        eval: "dc_choices4('model','description_field_name','_id',site: :with_nil)"
         eval: ModelName.choices4_site
         html:
           include_blank: true        

data/app/forms/dc_category.yml

@@ -54,3 +54,10 @@ form:
       eval: DcCategory.values_for_parent
       html:
         include_blank: true
+    60:
+      name: dc_site_id
+      type: select
+      eval: DcSite.choices4_site
+      html:
+        include_blank: true
+

data/app/forms/dc_page.yml

@@ -89,10 +89,16 @@ form:
           include_blank: true
       120:
         name: kats
-        type: multitext_autocomplete
-        search: dc_category.name      
+#        type: multitext_autocomplete
+#        search: dc_category.name     
+#        html:
+#          size: 30
+        type: select
+        multiple: true
+        eval: "dc_choices4('DcCategory','name','_id',site: :with_nil)"
         html:
-          size: 30
+          include_blank: true 
+          size: 4
 
     2advanced:
       10:

data/app/helpers/dc_application_helper.rb

@@ -124,17 +124,82 @@ def dc_replace_in_design(opts={})
       design.sub!(opts[:replace], opts[:with])
     end
   end
-  render(inline: design, layout: opts[:layout])
+  render(inline: design, layout: nil)
 end
 
 ########################################################################
-# Old method name. 
+# Used for designs with lots of common code and one (or more) part which differs.
+# It will simply replace anchor code with value of variable.
+# 
+# Example: As used in design. Backslashing < and % is important \<\%
+#    <% part = "<div  class='some-class'>\<\%= dc_render(:my_renderer, method: 'render_method') \%\></div>" %>
+#    <%= dc_replace_in_design(piece: 'piece_name', replace: '[main]', with: part) %>
+# 
+# Want to replace more than one part. Use array.
+#    <%= dc_replace_in_design(replace: ['[part1]','[part2]'], with: [part1, part2]) %>
+# 
+# This helper is replacement for old 'script' method defined in dc_piece_renderer, 
+# but it uses design defined in site document if piece parameter is not set.
 ########################################################################
-def dc_render_design(opts={}) #:nodoc:
-  dc_deprecate "dc_render_design will be deprecated. Use dc_replace_in_design instead."  
-  dc_replace_in_design(opts)
+def dc_render_from_site(opts={})
+  design = opts[:piece] ? DcPiece.find(name: opts[:piece]).script : dc_get_site.design
+  layout = opts[:layout] || (dc_get_site.site_layout.size > 2 ? dc_get_site.site_layout : nil)
+  
+  render(inline: design, layout: opts[:layout], with: opts[:with])
 end
 
+
+
+########################################################################
+# Used for designs with lots of common code and one (or more) part which differs.
+# Point is to define design once and replace some parts of design dinamically.
+# Design may be defined in site and design doc defines only parts that vary
+# from page to page.
+# 
+# Example: As used in design.
+#    <%= dc_render_design_part(@main) %>
+#    
+#    main variable is defined in design body for example:
+#    
+#    @main = Proc.new {render partial: 'parts/home'}
+# 
+# This helper is replacement dc_render_from_site method which will soon be deprecated. 
+########################################################################
+def dc_render_design_part(part) 
+  if part.nil?
+    ''
+  elsif part.class == Proc
+    result = part.call
+    result.class == Array ? result.first : result
+  elsif part.class == String
+    eval part
+  else
+    part.to_s
+  end.html_safe
+end
+
+def dc_render_design(part) 
+  dc_render_design_part(part) 
+end
+
+########################################################################
+# Helper for rendering top CMS menu when in editing mode
+########################################################################
+def dc_page_top()
+  if @design and !@design.rails_view.blank?
+# Evaluate parameters in design body    
+    eval(@design.body)
+  end
+  session[:edit_mode] > 0 ? render(partial: 'cmsedit/edit_stuff') : ''
+end
+
+########################################################################
+# Helper for adding additional css and javascript code added by documents
+# and renderers during page rendering.
+########################################################################
+def dc_page_bottom()
+  %Q[<style type="text/css">#{@css}</style>#{javascript_tag @js}].html_safe
+end
 ############################################################################
 # Creates title div for DRG CMS dialogs. Title may also contain pagination section on right side if 
 # result_set is provided as parameter.
@@ -818,8 +883,9 @@ end
 # [model] String. Collection (table) name in lowercase format.
 # [name] String. Field name containing description text.
 # [id] String. Field name containing id field. Default is '_id'
-# [options] Hash. Various options. Currently site_only is used. Will return only 
-# documents belonging to current site.
+# [options] Hash. Various options. Currently site: (:only, :with_nil, :all) is used.
+# Will return only documents belonging to current site, also with site not defined,
+# or all documents.
 # 
 # Example (as used in forms):
 #    50:
@@ -830,7 +896,11 @@ end
 def dc_choices4(model, name, id='_id', options = {})
   model = model.classify.constantize
   qry   = model.only(id, name)
-  qry   = qry.and(dc_site_id: dc_get_site()) if options[:site_only]
+  if (param = options[:site])
+    sites = [dc_get_site.id] unless param == :all
+    sites << nil if param == :with_nil 
+    qry   = qry.in(dc_site_id: sites) if sites
+  end
   qry   = qry.and(active: true) if model.method_defined?(:active)
 #  qry   = qry.sort(name => 1) 
 #  choices = []
@@ -957,13 +1027,9 @@ end
 def dc_user_has_role( role, user=nil, roles=nil )
   roles = _origin.session[:user_roles] if roles.nil?
   user  = _origin.session[:user_id] if user.nil?
-  return false if user.nil?  
+  return false if user.nil? or roles.nil?
 #  
-  if role.class == String
-    rol = role
-    role = DcPolicyRole.find_by(name: rol)
-    role = DcPolicyRole.find_by(system_name: rol) if role.nil?
-  end
+  role = DcPolicyRole.get_role(role)
   return false if role.nil?
 # role is included in roles array
   roles.include?(role._id)

data/app/helpers/dc_common_renderer.rb

@@ -41,6 +41,7 @@ include DcApplicationHelper
 #  Defines renderer's class method
 ########################################################################
 def layout_4print
+  return '' if @parent.params[:renderer].blank?
   opts = @opts.dup
   opts[:method] = @parent.params[:method]
   klass = (@parent.params[:renderer] + '_renderer').classify

data/app/helpers/dc_simple_menu_renderer.rb

@@ -110,7 +110,7 @@ def link_4menu(item)
     caption << ' '
    end
   # - in first place won't write caption text
-  caption = caption.html_safe + (item.caption[0] == '-' ? '' : item.caption )
+  caption = caption.html_safe + (item.caption[0] == '-' ? '' : item.caption.html_safe )
   
   target = item.target.blank? ? nil : item.target
   @parent.link_to(caption, link, {target: target})

data/app/models/dc_category.rb

@@ -53,16 +53,19 @@ class DcCategory
   field   :order,       type: Integer, default: 0
   field   :created_by,  type: BSON::ObjectId
   field   :updated_by,  type: BSON::ObjectId
+  field   :dc_site_id,     type: BSON::ObjectId
 
   validates :name, :presence => true
   
   index  name: 1
   index  ctype: 1
+  index  site_id: 1
   
 #########################################################################
 # Returns all values where parent value is nil (top level parent).
 #########################################################################
-  def self.values_for_parent #:nodoc:
-    where(parent: nil).sort(name: 1).inject([]) {|r,v| r << [v.name, v._id]} 
-  end
+def self.values_for_parent #:nodoc:
+  where(parent: nil).sort(name: 1).inject([]) {|r,v| r << [v.name, v._id]} 
+end
+
 end

data/app/models/dc_policy_role.rb

@@ -58,4 +58,16 @@ def self.choices4_roles
   where(active: true).order_by(name: 1).inject([]) { |r,role| r << [ role.name, role._id] }
 end
 
+########################################################################
+# Search for role when role parameter is String.
+########################################################################
+def self.get_role(role)
+  if role.class == String
+    rol = role
+    role = find_by(name: rol) || find_by(system_name: rol)
+  end
+  role
+end
+
+
 end

data/app/models/drgcms_form_fields.rb

@@ -468,7 +468,7 @@ def render
         link  = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#',
                 onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
         field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
-        "<div id=\"#{rec.id}\" style=\"padding:2px;\">#{link} #{rec[field_name]}<br>#{field}</div>"
+        "<div id=\"#{rec.id}\" style=\"padding:2px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
       else
         '** error **'
       end
@@ -650,6 +650,19 @@ def render
   self
 end
 
+###########################################################################
+# Return value. 
+###########################################################################
+def self.get_data(params, name)
+  if params['record'][name].class == Array
+    params['record'][name].delete_if {|e| e.blank? }
+    return nil if params['record'][name].size == 0
+# convert to BSON objects    
+    return params['record'][name].map{ |e| BSON::ObjectId.from_string(e) }
+  end
+  params['record'][name]
+end
+
 end
 
 ###########################################################################
@@ -1136,7 +1149,7 @@ def render
 # Found value to be written in field  
   if value
     record = t.find(value)
-    value_displayed = record[ret_name] if record      
+    value_displayed = record.send(ret_name) if record      
   end
 # return if readonly
   return ro_standard(value_displayed) if @readonly

data/config/locales/models_en.yml

@@ -391,6 +391,7 @@ en:
         order: Order
         parent: Parent
         active: Active
+        dc_site_id: Valid for site
         updated_at: Spremenjen
 
       dc_mail:
@@ -777,6 +778,7 @@ en:
         order: Additional order, which can be used for sorting.
         parent: Parent category. Leave blank if this is top level category.
         active: Category is active.
+        dc_site_id: Category is valid only for site
         updated_at: Last update
 
       dc_mail:

data/config/locales/models_sl.yml

@@ -396,6 +396,7 @@ sl:
         order: Zaporedje
         parent: Nadrejeni
         active: Aktiven
+        dc_site_id: Spletišče
         updated_at: Spremenjen
 
       dc_mail:
@@ -790,6 +791,7 @@ sl:
         order: Zaporedje, ki se lahko uporabi pri grupiranju člankov.
         parent: Nadrejena kategorija. Pustite prazno če je to najvišja kategorija.
         active: Aktivna
+        dc_site_id: Kategorija velja za stran
         updated_at: Podatki so bili zadnjič spremenjeni
 
       dc_mail:

data/drg_cms.gemspec

@@ -14,17 +14,18 @@ Gem::Specification.new do |s|
   s.homepage    = "http://www.drgcms.org"
   s.summary     = "DRG CMS: Rapid web application development tool for Ruby, Rails and MongoDB"
   s.description = "DRG CMS can be used for rapid building of complex, data-entry intensive web sites as well as building your in-house private cloud applications."
-  s.license     = "MIT-LICENSE"
+  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.add_dependency 'rails', '~> 4'
   s.add_dependency 'jquery-rails'
-  s.add_dependency 'jquery-ui-rails'
+  s.add_dependency 'jquery-ui-rails', '~> 5'
+  s.add_dependency 'non-stupid-digest-assets'  
 
   s.add_dependency 'bcrypt' #, '~> 3.0.0'
-  s.add_dependency 'bson'
-  s.add_dependency 'mongoid'
+  s.add_dependency 'mongoid', '~> 5'
+  s.add_dependency 'mongo_session_store-rails4'  
   s.add_dependency 'kaminari'
   s.add_dependency 'font-awesome-rails'
   s.add_dependency 'sort_alphabetical'

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.10.7"
+  VERSION = "0.5.10.10"
 end

data/lib/tasks/dc_cleanup.rake

@@ -46,6 +46,22 @@ namespace :drg_cms do
     DcSite.collection.database.command(eval: "db.runCommand ( { 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|
+    n = 0
+    ActionDispatch::Session::MongoidStore::Session.batch_size(1000).all.each do |doc|
+      if (doc.created_at == doc.updated_at)
+        doc.delete 
+        p "Deleted #{n}" if (n+=1)%1000 == 0
+      end
+    end
+    p "Deleted #{n}"
+    DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'sessions' } )" )
+  end
+
 ###########################################################################
   desc 'Removes all statistics from dc_visits up to specified date and save them to visits_date.json.'
   task :clear_visits, [:name] => :environment do |t, args|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.10.7
+  version: 0.5.10.10
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,18 +42,18 @@ dependencies:
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: non-stupid-digest-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bson
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,6 +82,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: mongo_session_store-rails4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -349,7 +363,7 @@ files:
 - test/test_helper.rb
 homepage: http://www.drgcms.org
 licenses:
-- MIT-LICENSE
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []