drg_cms 0.4.39 → 0.4.53

data/app/views/__dc_at_the_beginning/create.html.erb

@@ -0,0 +1,9 @@
+
+<h2>Superadmin account created</h2>
+Please write down username:<%= params[:username] %>
+<br>password:<%= params[:password1]  %>
+<br>
+<!-- <%= link_to('Start editing', controller: 'poll', poll_id: 'login', return_to: '/cmsedit/show') %> -->
+
+<%= link_to('Start editing', controller: 'cmsedit', action: 'show') %>
+

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

@@ -0,0 +1,19 @@
+
+<h2>At the beginning GOD created superadmin</h2>
+<%= "<div style='color: red;'>#{flash[:error]}</div>".html_safe if flash[:error] %>
+<%= form_tag action: 'create', method: :put do %>
+<table>
+  <tr>
+    <td>Superadmin username:</td>
+    <td><%=  text_field(nil, 'username') %>
+  </tr><tr>  
+    <td>Superadmin password:</td>
+    <td><%=  password_field(nil, 'password1') %>
+  </tr><tr>  
+    <td>Repeat password:</td>
+    <td><%=  password_field(nil, 'password2') %>
+  </tr><tr>  
+    <td><%= submit_tag %></td>
+  </tr>
+</table>
+<% end %>

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

@@ -33,6 +33,8 @@
 
           <%= link_to( image_tag('drg_cms/copy.png', class: 'dc-link-img', title: "#{t('drgcms.doc_paste_title')}"),
               {controller: 'dc_common', action: 'paste_clipboard'}, target: 'iframe_cms') %>
+
+          <%= DrgcmsFormField::Elfinder.file_manager_url(self) %>
           
         </td>
       </tr>

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

@@ -7,7 +7,6 @@
   <table class='dc-menu'>
     <%= dc_actions_for_form %>
   </table>
-
   
   <%= dc_fields_for_form %>
   <%= dc_document_statistics %>

data/config/initializers/kaminari_patch.rb

@@ -23,11 +23,12 @@
 #++
 
 ###########################################################################
-# This patch adds page param to url when page one is choosed.
+# This patch adds page param to url when page one is choosed. This is needed
+# for paging to work as expected.
 ###########################################################################
-module Kaminari
-  module Helpers
-    class Tag
+module Kaminari #:nodoc:
+  module Helpers #:nodoc:
+    class Tag #:nodoc:
       def page_url_for(page)
         @template.url_for @params.merge(@param_name => (page < 1 ? 1 : page))
       end

data/config/locales/drgcms_en.yml

@@ -43,6 +43,7 @@ en:
     edit_design: 'Edit: Design'
     edit_site: 'Edit: Site'
     edit_page: 'Edit: Page'
+    file_manager: File manager
     edit_selected: 'Edit: Selected table (collection)'
     invalid_username: Invalid username or password!
     system_menu: CMS system tables
@@ -93,4 +94,7 @@ en:
       message_errors: "%{number} addresses were in error!"
       report: Report
       unsubscription: Unsubscription
+      
+    dc_captcha:
+      simple_message: Please write in the name of month no %{number} in a year.
 

data/config/locales/drgcms_sl.yml

@@ -43,6 +43,7 @@ sl:
     edit_design: 'Uredi: Dizajn'
     edit_site: 'Uredi: Spletišče'
     edit_page: 'Uredi: Stran'
+    file_manager: Organizator datotek
     edit_selected: 'Uredi: Izbrano tabelo'
     invalid_username: Napaka uporabnik ali geslo!
     system_menu: CMS sistemske tabele    

data/config/locales/models_en.yml

@@ -284,7 +284,7 @@ en:
         script: Script
         script_type: Script type
         piece_id: Piece
-        div_id: Div
+        div_id: Position (div)
         order: Order
         updated_by: Updated by
         updated_at: Last updated at
@@ -309,7 +309,7 @@ en:
         script_type: Script type
         piece_id: Piece
         site_id: Site
-        div_id: Div
+        div_id: Position (div)
         order: Order
         updated_by: Updated by
         updated_at: Last updated at
@@ -460,6 +460,12 @@ en:
         ids: Parent ids
         diff: Differences
 
+      dc_ident:
+        tabletitle: Additional identification
+
+        key: Id key
+        value: Value
+
 # help for forms #####################################################
 
     help:
@@ -675,7 +681,7 @@ en:
         script: Script, if script is included in piece
         script_type: Script type 
         site_id: Site name where this piece will belong to
-        div_id: Div (location) id on design where this piece is rendered
+        div_id: Div (position name) id on design where this piece is rendered
         order: Order to be used when pieces are positioned in the same div (location)
         updated_by: Last updated by
         updated_at: Last updated at
@@ -788,3 +794,8 @@ en:
         id: Record id
         ids: Parent ids
         diff: Differences
+        
+      dc_ident:
+        key: Key which defines ident
+        value: Ident value
+        

data/config/locales/models_sl.yml

@@ -313,7 +313,7 @@ sl:
         script: Skripte
         script_type: Vrsta skripte
         piece_id: Sestavni element
-        div_id: Div
+        div_id: Lokacija (div)
         order: Zaporedje
         params: Parametri
         updated_by: Spremenil
@@ -339,7 +339,7 @@ sl:
         script: Skripte
         script_type: Vrsta skripte
         site_id: Spletišče
-        div_id: Div
+        div_id: Lokacija (div)
         order: Zaporedje
         params: Parametri
         updated_by: Spremenil
@@ -466,6 +466,11 @@ sl:
         ids: Nadrejeni id-ji
         diff: Razlike
 
+      dc_ident:
+        tabletitle: Dodatne identifikacije
+
+        key: Ključ
+        value: Vrednost
 
 # help pomoč na obrazcih ####################################################
 
@@ -690,7 +695,7 @@ sl:
         script: Skripta, če element potrebuje tudi skripto
         script_type: Vrsta skripte
         piece_id: Sestavni element, če ga ta element uporablja
-        div_id: Ime DIV razdelka na strani, kjer bo element prikazan
+        div_id: Lokacija ali ime DIV razdelka na strani, kjer bo element prikazan
         order: Zaporedje prikaza posameznih elementov
         updated_by: Zadnjič je element spremenil
         updated_at: Čas, ko je bil element spremenjen
@@ -710,7 +715,7 @@ sl:
         script: Skripta, če element potrebuje tudi skripto
         script_type: Vrsta skripte
         site_id: Spletišče, kateremu pripada element
-        div_id: Ime DIV razdelka na strani, kjer bo element prikazan
+        div_id: Lokacija ali ime DIV razdelka na strani, kjer bo element prikazan
         order: Zaporedje prikaza posameznih elementov
         params: Dodatni parametri za prikaz elementa
         updated_by: Zadnjič je element spremenil
@@ -803,3 +808,7 @@ sl:
         id: ID zapisa
         ids: Nadrejeni id-ji
         diff: Razlike
+
+      dc_ident:
+        key: Ključ identifikacije
+        value: Vrednost

data/drg_cms.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |s|
   s.name        = "drg_cms"
   s.version     = DrgCms::VERSION
   s.authors     = ["Damjan Rems"]
-  s.email       = ["drgcms@gmail.com"]
+  s.email       = ["damjan.rems@gmail.com"]
   s.homepage    = "http://www.drgcms.org"
-  s.summary     = "DRGCMS: CMS for Ruby, Rails and MongoDB "
-  s.description = "DRGCMS: Content management system for Ruby, Rails and MongoDB"
+  s.summary     = "DRG CMS: CMS for Ruby, Rails and MongoDB"
+  s.description = "DRG CMS: Content management system for Ruby, Rails and MongoDB"
   s.license     = "MIT-LICENSE"
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc", "drg_cms.gemspec"]
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "drg_cms.gemspec"]
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency 'rails' #, '~> 3.2.16'

data/lib/drg_cms.rb

@@ -1,7 +1,10 @@
 require 'drg_cms/engine'
 require 'drg_cms/version'
 
-module DrgCms
+################################################################################
+# DRG CMS plugin module.
+################################################################################
+module DrgCms 
   @@paths = {}
 ################################################################################
 # Returns source file name of required model. 
@@ -10,11 +13,12 @@ module DrgCms
 # file is tricky to require since it is included in DrgCms gem and thus a moving 
 # target. Whenever gem version changes file location changes with it. This way 
 # end user doesn't have to care about actual source file location.
-# 
-# @example 
-#   require DrgCms.model 'dc_page'
 #   
-# @param [ model_name ]. Must be passed in lower case, just like the file name is. 
+# Parameters:
+# [ model_name ] String. Must be passed in lower case, just like the file name is. 
+# 
+# Example: 
+#    require DrgCms.model 'dc_page'
 # 
 ###############################################################################
 def self.model(model_name)
@@ -22,9 +26,23 @@ def self.model(model_name)
 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.
 # 
+# Parameters:
+# [path] String. Path to forms directory
+# 
+# Example:
+#    # As used in MyPlugin plugin.
+#    require "my_plugin/engine"
+#    module MyPlugin
+#    end
+#
+#    DrgCms.add_forms_path File.expand_path("../../app/forms", __FILE__)
 ###############################################################################
-def self.add_form_path(path) 
+def self.add_forms_path(path) 
   if @@paths[:forms].nil?
     @@paths[:forms] = []
 # default application forms path
@@ -36,10 +54,21 @@ def self.add_form_path(path)
 end
 
 ###############################################################################
+###############################################################################
+def self.add_form_path(path) #:nodoc:
+  p 'DrgCms.add_form_path will be deprecated. Use add_forms_path instead.'
+  self.add_forms_path(path)
+end
+
+###############################################################################
+# Will return value saved to internal @@paths hash.
 # 
+# Parameters:
+# [key] String. Key  
+# forms_paths = DrgCms.paths(:forms)
 ###############################################################################
-def self.paths what
-  @@paths[what]
+def self.paths(key)
+  @@paths[key]
 end
 
 end

data/lib/drg_cms/engine.rb

@@ -22,9 +22,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-module DrgCms
+module DrgCms #:nodoc:
 
-class Engine < ::Rails::Engine
+class Engine < ::Rails::Engine #:nodoc:
 end
 
 end

data/lib/drg_cms/version.rb

@@ -1,3 +1,4 @@
-module DrgCms
-  VERSION = "0.4.39"
+module DrgCms #:nodoc:
+  # drg_cms gem version
+  VERSION = "0.4.53"
 end

data/lib/tasks/dc_at_the_beginning.rake

@@ -0,0 +1,118 @@
+#########################################################################
+#
+#########################################################################
+def ok_to_start
+  p ''
+  DcPermission.all.delete
+  DcPolicyRole.all.delete
+  DcUser.all.delete
+  if DcPermission.all.size > 0
+    p 'DcPermission (Permissions) collection is not empty!'
+    return false
+  end
+  if DcPolicyRole.all.size > 0
+    p 'DcUserRole (User roles) collection is not empty!'
+    return false
+  end
+  if DcUser.all.size > 0
+    p 'DcUser (Users) collection is not empty!'
+    return false
+  end
+  true
+end
+
+#########################################################################
+#
+#########################################################################
+def read_input(message, default='')
+  print "#{message} "
+  response = STDIN.gets.chomp
+  response.blank? ? default : response
+ end
+
+########################################################################
+#
+########################################################################
+def create_superadmin
+  username = read_input('Enter username for superadmin role:')
+  return p 'Username should be at least 6 character long' unless username.size >=6
+#
+  password1 = read_input("Enter password for #{username} user :")
+  return p 'Password should be at least 8 character long' unless password1.size >=8
+#
+  password2 = read_input("Please repeat password for #{username} user :")
+  return p 'Passwords are not equal' unless password2 == password1
+#  
+# New role
+  role = DcPolicyRole.new
+  role.name = 'superadmin'
+  role.system_name = 'superadmin'
+  role.save
+# User
+  usr = DcUser.new
+  usr.username    = username
+  usr.password    = password1
+  usr.password_confirmation = password2
+  usr.first_name  = 'superadmin'
+  usr.save
+# user role 
+#  r = usr.dc_user_roles.new
+#  r.dc_policy_role_id = role._id
+#  r.save
+  r = DcUserRole.new
+  r.dc_policy_role_id = role._id
+  usr.dc_user_roles << r
+# cmsedit permission
+  permission = DcPermission.new
+  permission.table_name = 'Default permission'
+  permission.is_default = true
+  permission.save
+# 
+  r = DcPolicyRule.new
+  r.dc_policy_role_id = role._id
+  r.permission = DcPermission::SUPERADMIN
+  permission.dc_policy_rules << r
+# create login poll
+  poll = DcPoll.new
+  poll.name = 'login'
+  poll.display = 'td'
+  poll.operation = 'link'
+  poll.parameters = '/dc_common/process_login'
+  poll.title = 'Autocreated login form'
+  poll.save
+#
+  i = poll.dc_poll_items.new
+  i.name = 'username'
+  i.size = 15
+  i.text = 'Username'
+  i.type = 'text_field'
+  i.save
+#  
+  i = poll.dc_poll_items.new
+  i.name = 'password'
+  i.size = 15
+  i.text = 'Password'
+  i.type = 'password_field'
+  i.save
+#
+  i = poll.dc_poll_items.new
+  i.name = 'send'
+  i.text = 'Login'
+  i.type = 'submit_tag'
+  i.save
+#
+  p "Superadmin user created. Please remember login data #{username}/#{password1}"
+end  
+
+
+#########################################################################
+#
+#########################################################################
+namespace :drg_cms do
+  desc "At the beginning god created superadmin"
+  task :at_the_beginning => :environment do
+    if ok_to_start
+      create_superadmin
+    end
+  end
+end

data/lib/tasks/dc_cleanup.rake

@@ -21,10 +21,20 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+########################################################################
+# Task in this file are intend for cleaning up and making archive of statistics collections.
+# 
+# rake drgcms:clear_sessions. This is just an example how to cleanup sessions collection.
+# 
+# rake clear_visits. Will archive and delete dc_visits documents. You will be prompted to enter end_date.
+# 
+# rake drgcms:clear_ad_stats. Will archive and delete dc_ad_stats collection. You will be prompted to enter end_date.
+########################################################################
+
 namespace :drg_cms do
   desc 'Clears mongodb session collection.'
   task :clear_sessions, [:name] => :environment do |t, args|
-    p 'This is just an example how to clear sessions collection.'
+    p 'This is just an example how to clear sessions collection. It wont do anything because of next line.'
     return if true
     ActionDispatch::Session::MongoidStore::Session.where(:updated_at.lt => 1.week.ago).delete
     DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'sessions' } )" )
@@ -33,7 +43,7 @@ namespace :drg_cms do
 ###########################################################################
   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|
-    date = read_input("Enter from date (yyyymmdd): ")
+    date = read_input("Enter end date (yyyymmdd): ")
     return unless date.size == 8
     
     archive_file = "visits_#{date}.json"
@@ -45,7 +55,7 @@ namespace :drg_cms do
     DcVisit.where(:time.lt => date_to).each do |visit|
       save << visit.to_json + "\n"
 #      visit.delete
-      p "Deleted #{n}" if (n+=1)%1000 == 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)}
@@ -55,7 +65,7 @@ namespace :drg_cms do
 ###########################################################################
   desc "Removes all statistics of not active ads and save them to ads_#{Time.now.strftime('%Y%d%m')}.json."
   task :clear_ad_stats, [:name] => :environment do |t, args|
-    input = read_input("Just press Enter to start. If you type in anything process wont start.")
+    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
@@ -65,8 +75,7 @@ namespace :drg_cms do
         save_ads << ad.to_json + "\n"
         DcAdStat.where(:dc_ad_id => ad._id).each do |stat|
           save_stat << stat.to_json + "\n"
-#          stat.delete           
-          p "Deleted #{n}" if (n+=1)%1000 == 0
+          p "Deleted #{n}" if (n+=1)%10000 == 0
         end        
         DcAdStat.where(:dc_ad_id => ad._id).delete
       end
@@ -76,8 +85,9 @@ namespace :drg_cms do
     DcSite.collection.database.command(eval: "db.runCommand ( { compact: 'dc_ad_stats' } )" )
   end
   
+=begin  
 ###########################################################################
-  desc "Popravi napako kjer se hrani dc_ad_id in ne ad_id"
+  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
@@ -91,4 +101,6 @@ namespace :drg_cms do
       p n if (n+=1)%1000 == 0
     end
   end
+=end
+  
 end